From 9b405aeaa292d7d2171340af6bd5218c72a10f8c Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Fri, 14 Dec 2018 17:13:40 +0100 Subject: gnu: hypre: Replace texlive input with minimal texlive-union. * gnu/packages/maths.scm (hypre)[native-inputs]: Replace texlive with minimal texlive-union. --- gnu/packages/maths.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 96a1ecb043..ad6aacf9c9 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3707,7 +3707,13 @@ set.") `(("doc++" ,doc++) ("netpbm" ,netpbm) ("perl" ,perl) ;needed to run 'ppmquant' during tests - ("texlive" ,texlive) ;full package required for fonts + ("texlive" ,(texlive-union (list texlive-generic-xypic + texlive-fonts-xypic + texlive-latex-hyperref + texlive-latex-oberdiek + texlive-generic-ifxetex + texlive-latex-url + texlive-bibtex))) ("ghostscript" ,ghostscript))) (inputs `(("blas" ,openblas) @@ -3724,6 +3730,12 @@ set.") "--with-blas") #:phases (modify-phases %standard-phases + (add-before 'build 'set-HOME + (lambda _ + ;; FIXME: texlive-union does not find the built + ;; metafonts, so it tries to generate them in HOME. + (setenv "HOME" "/tmp") + #t)) (add-before 'configure 'chdir-src (lambda _ (chdir "src"))) (replace 'configure @@ -3738,7 +3750,7 @@ set.") configure-flags))))))) (add-after 'build 'build-docs (lambda _ - (zero? (system* "make" "-Cdocs" "pdf" "html")))) + (invoke "make" "-Cdocs" "pdf" "html"))) (replace 'check (lambda _ (setenv "LD_LIBRARY_PATH" (string-append (getcwd) "/hypre/lib")) -- cgit 1.4.1 From 2d7b99b3c6848a8e6f994b74eb04bde472dc445b Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Dec 2018 23:17:09 +0200 Subject: gnu: z3: Declare source-file-name. * gnu/packages/maths.scm (z3)[source]: Add missing 'file-name. --- gnu/packages/maths.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ad6aacf9c9..1fd3e4b00e 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3971,6 +3971,7 @@ as equations, scalars, vectors, and matrices.") (method git-fetch) (uri (git-reference (url home-page) (commit (string-append "z3-" version)))) + (file-name (git-file-name name version)) (sha256 (base32 "1vr57bwx40sd5riijyrhy70i2wnv9xrdihf6y5zdz56yq88rl48f")))) -- cgit 1.4.1 From ad6c6a5be5dcc31f592fb664711a96e337df265e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Mon, 17 Dec 2018 10:51:50 +0200 Subject: gnu: z3: Fix building on non-Intel machines. * gnu/packages/maths.scm (z3)[arguments]: Add phase to remove unnecessary include statement. --- gnu/packages/maths.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 1fd3e4b00e..9a5009c78b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -3985,6 +3985,12 @@ as equations, scalars, vectors, and matrices.") "/lib/python2.7/site-packages")) #:phases (modify-phases %standard-phases + (add-after 'unpack 'fix-compatability + ;; Versions after 4.8.3 have immintrin.h IFDEFed for Windows only. + (lambda _ + (substitute* "src/util/mpz.cpp" + (("#include ") "")) + #t)) (add-before 'configure 'bootstrap (lambda _ (zero? -- cgit 1.4.1 From 3b42e2be921062fcc9f76e508e1284b9280c6809 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Dec 2018 23:19:34 +0200 Subject: gnu: elemental: Fix indentation. * gnu/packages/maths.scm (elemental): Fix indentation of the package definition. --- gnu/packages/maths.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 9a5009c78b..2e9472e3e3 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4104,8 +4104,8 @@ exclusion algorithms are typical examples of such systems.") "-DCMAKE_INSTALL_LIBDIR=lib" "-DGFORTRAN_LIB=gfortran") #:phases (modify-phases %standard-phases - (add-before 'check 'mpi-setup - ,%openmpi-setup) + (add-before 'check 'mpi-setup + ,%openmpi-setup) (add-before 'check 'setup-tests (lambda _ ;; Parallelism is done at the MPI layer. @@ -4116,7 +4116,7 @@ exclusion algorithms are typical examples of such systems.") ;; Tests are installed, with no easy configuration ;; switch to prevent this, so delete them. (delete-file-recursively - (string-append (assoc-ref outputs "out") "/bin")) + (string-append (assoc-ref outputs "out") "/bin")) #t))))) (synopsis "Dense and sparse-direct linear algebra and optimization") (description "Elemental is a modern C++ library for distributed-memory -- cgit 1.4.1 From 5c0b6d1b1db37a510367bf1e6441db32fda9568f Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 16 Dec 2018 23:24:53 +0200 Subject: gnu: elemental: Don't use unstable tarball. * gnu/packages/maths.scm (elemental)[source]: Download source using git-fetch. --- gnu/packages/maths.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gnu/packages/maths.scm') diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2e9472e3e3..9fb02b7385 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4074,13 +4074,14 @@ exclusion algorithms are typical examples of such systems.") (name "elemental") (version "0.87.7") (source (origin - (method url-fetch) - (uri (string-append "https://github.com/elemental/Elemental/" - "archive/v" version ".tar.gz")) - (file-name (string-append name "-" version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/elemental/Elemental.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "1nfp82w22pi8x8fg9sc37z8kf84dqi1dhxp8bbk7571y4aygvv3v")))) + "1687xpjjzig27y2pnqv7hv09smpijyfdpz7qjgmcxf4shfajlfkc")))) (build-system cmake-build-system) (home-page "http://libelemental.org") (native-inputs -- cgit 1.4.1