From b18b9d204217c5e90afae0a7a71e82a21748f8e1 Mon Sep 17 00:00:00 2001 From: Arun Isaac Date: Thu, 3 Jan 2019 21:56:26 +0530 Subject: gnu: octave: Fix makeinfo path configuration. * gnu/packages/maths.scm (octave-cli)[arguments]: Fix makeinfo path configuration in configure-makeinfo phase. --- gnu/packages/maths.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 448d9e373b..e67bc5e935 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -19,7 +19,7 @@ ;;; Copyright © 2017 Nils Gillmann ;;; Copyright © 2017 Ben Woodcroft ;;; Copyright © 2017 Theodoros Foradis -;;; Copyright © 2017 Arun Isaac +;;; Copyright © 2017, 2019 Arun Isaac ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2017 Dave Love ;;; Copyright © 2018 Jan Nieuwenhuizen @@ -1484,11 +1484,10 @@ can solve two kinds of problems: (modify-phases %standard-phases (add-after 'configure 'configure-makeinfo (lambda* (#:key inputs #:allow-other-keys) - (substitute* "libinterp/corefcn/help.cc" - (("Vmakeinfo_program = \"makeinfo\"") - (string-append "Vmakeinfo_program = \"" - (assoc-ref inputs "texinfo") - "/bin/makeinfo\""))) + (substitute* "libinterp/corefcn/help.h" + (("\"makeinfo\"") + (string-append + "\"" (assoc-ref inputs "texinfo") "/bin/makeinfo\""))) #t))))) (home-page "https://www.gnu.org/software/octave/") (synopsis "High-level language for numerical computation") -- cgit v1.2.3 From 59a075047d7aab07dc0fd3b41584caad2a669a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Mon, 7 Jan 2019 13:56:17 +0100 Subject: gnu: Move OCaml packages away from maths.scm. This removes (gnu packages ocaml) and related build system modules from the closure of (gnu packages maths). * gnu/packages/maths.scm (ocaml-gsl, ocaml4.01-gsl, cubicle): Move to... * gnu/packages/ocaml.scm: ... here. --- gnu/packages/maths.scm | 89 +------------------------------------------------- 1 file changed, 1 insertion(+), 88 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e67bc5e935..4138c7a3bd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -12,7 +12,7 @@ ;;; Copyright © 2015 Fabian Harfert ;;; Copyright © 2016 Roel Janssen ;;; Copyright © 2016, 2018 Kei Kebreau -;;; Copyright © 2016, 2017, 2018 Ludovic Courtès +;;; Copyright © 2016, 2017, 2018, 2019 Ludovic Courtès ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Thomas Danckaert ;;; Copyright © 2017, 2018 Paul Garlick @@ -57,7 +57,6 @@ #:use-module ((guix build utils) #:select (alist-replace)) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) - #:use-module (guix build-system ocaml) #:use-module (guix build-system python) #:use-module (guix build-system r) #:use-module (guix build-system ruby) @@ -99,7 +98,6 @@ #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages netpbm) - #:use-module (gnu packages ocaml) #:use-module (gnu packages pcre) #:use-module (gnu packages popt) #:use-module (gnu packages perl) @@ -398,33 +396,6 @@ differential equations, linear algebra, Fast Fourier Transforms and random numbers.") (license license:gpl3+))) -(define-public ocaml-gsl - (package - (name "ocaml-gsl") - (version "1.22.0") - (source - (origin - (method url-fetch) - (uri - (string-append - "https://github.com/mmottl/gsl-ocaml/releases/download/" - version "/gsl-" version ".tbz")) - (sha256 - (base32 - "17vcswipliq1b2idbzx1z95kskn1a4q4s5v04igilg0f7lnkaarb")))) - (build-system ocaml-build-system) - (inputs - `(("gsl" ,gsl))) - (home-page "https://mmottl.github.io/gsl-ocaml") - (synopsis "Bindings to the GNU Scientific Library") - (description - "GSL-OCaml is an interface to the @dfn{GNU scientific library} (GSL) for -the OCaml language.") - (license license:gpl3+))) - -(define-public ocaml4.01-gsl - (package-with-ocaml4.01 ocaml-gsl)) - (define-public glpk (package (name "glpk") @@ -4018,64 +3989,6 @@ as equations, scalars, vectors, and matrices.") theories} (SMT) solver. It provides a C/C++ API, as well as Python bindings.") (license license:expat))) -(define-public cubicle - (package - (name "cubicle") - (version "1.1.2") - (source (origin - (method url-fetch) - (uri (string-append "http://cubicle.lri.fr/cubicle-" - version ".tar.gz")) - (sha256 - (base32 - "10kk80jdmpdvql88sdjsh7vqzlpaphd8vip2lp47aarxjkwjlz1q")))) - (build-system gnu-build-system) - (native-inputs - `(("automake" ,automake) - ("ocaml" ,ocaml) - ("which" ,(@@ (gnu packages base) which)))) - (propagated-inputs - `(("ocaml-num" ,ocaml-num) - ("z3" ,z3))) - (arguments - `(#:configure-flags (list "--with-z3") - #:make-flags (list "QUIET=") - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-before 'configure 'configure-for-release - (lambda _ - (substitute* "Makefile.in" - (("SVNREV=") "#SVNREV=")) - #t)) - (add-before 'configure 'fix-/bin/sh - (lambda _ - (substitute* "configure" - (("-/bin/sh") (string-append "-" (which "sh")))) - #t)) - (add-before 'configure 'fix-smt-z3wrapper.ml - (lambda _ - (substitute* "Makefile.in" - (("\\\\n") "")) - #t)) - (add-before 'configure 'fix-ocaml-num - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "Makefile.in" - (("= \\$\\(FUNCTORYLIB\\)") - (string-append "= -I " - (assoc-ref inputs "ocaml-num") - "/lib/ocaml/site-lib" - " $(FUNCTORYLIB)"))) - #t))))) - (home-page "http://cubicle.lri.fr/") - (synopsis "Model checker for array-based systems") - (description "Cubicle is a model checker for verifying safety properties -of array-based systems. This is a syntactically restricted class of -parametrized transition systems with states represented as arrays indexed by -an arbitrary number of processes. Cache coherence protocols and mutual -exclusion algorithms are typical examples of such systems.") - (license license:asl2.0))) - (define-public elemental (package (name "elemental") -- cgit v1.2.3