From fb8d1be8e125722226fe3d2ae7dedb6ba7015290 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Wed, 28 Oct 2015 15:56:22 +0100 Subject: gnu: pari-gp: Add X11 input. * gnu/packages/algebra.scm (pari-gp)[inputs]: Add libx11, which enables plotting functions. --- gnu/packages/algebra.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 2f52f5545c..daa5ddd072 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -26,6 +26,7 @@ (define-module (gnu packages algebra) #:use-module (gnu packages perl) #:use-module (gnu packages readline) #:use-module (gnu packages flex) + #:use-module (gnu packages xorg) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) @@ -125,6 +126,7 @@ (define-public pari-gp "0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp) + ("libx11" ,libx11) ("perl" ,perl) ("readline" ,readline))) (arguments -- cgit v1.2.3 From 2abcc935ce87221009acc9f211badbe6cd27191d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 13 Nov 2015 22:46:54 +0100 Subject: gnu: eigen: Update to 3.2.7. * gnu/packages/algebra.scm (eigen): Upgrade to 3.2.7. [source]: Add 'file-name' field. --- gnu/packages/algebra.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index daa5ddd072..2ea6c1f5c8 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -383,14 +383,15 @@ (define-public fftw-openmpi (define-public eigen (package (name "eigen") - (version "3.2.6") + (version "3.2.7") (source (origin (method url-fetch) (uri (string-append "https://bitbucket.org/eigen/eigen/get/" version ".tar.bz2")) (sha256 (base32 - "0gil5ksmgcg6v3nw0v613mvpzz4n33xhawqs8l7fj7rnlpwm4cwa")) + "0gigbjjdlw2q0gvcnyiwc6in314a647rkidk6977bwiwn88im3p5")) + (file-name (string-append name "-" version ".tar.bz2")) (modules '((guix build utils))) (snippet ;; There are 3 test failures in the "unsupported" directory, -- cgit v1.2.3 From 000e36f2eec02b8bf57bd54e857e56628e184b31 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Mon, 16 Nov 2015 03:51:34 +0100 Subject: gnu: pari-gp: Update to 2.7.5. * gnu/packages/algebra.scm (pari-gp): Update to 2.7.5. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 2ea6c1f5c8..07dfaafdc3 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -115,7 +115,7 @@ (define-public fplll (define-public pari-gp (package (name "pari-gp") - (version "2.7.4") + (version "2.7.5") (source (origin (method url-fetch) (uri (string-append @@ -123,7 +123,7 @@ (define-public pari-gp version ".tar.gz")) (sha256 (base32 - "0k1qqagfl6zn7gvwmsqffj6g9yrzqvszwh2mblhmxpjlw1pigfh8")))) + "0c8l83a0gjq73r9hndsrzkypwxvnnm4pxkkzbg6jm95m80nzwh11")))) (build-system gnu-build-system) (inputs `(("gmp" ,gmp) ("libx11" ,libx11) -- cgit v1.2.3 From a4eb83b709349ebbfe72ed473d0f65cdf5c4cbc7 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Nov 2015 15:51:43 +0100 Subject: gnu: eigen: Fix 'Cflags' value in 'eigen3.pc'. * gnu/packages/algebra.scm (eigen)[source]: Augment snippet to address . --- gnu/packages/algebra.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 07dfaafdc3..fb3b3e94b3 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -399,7 +399,11 @@ (define-public eigen ;; anyway, so just skip them. '(substitute* "CMakeLists.txt" (("add_subdirectory\\(unsupported\\)") - "# Do not build the tests for unsupported features.\n"))))) + "# Do not build the tests for unsupported features.\n") + ;; Work around + ;; . + (("\"include/eigen3\"") + "\"${CMAKE_INSTALL_PREFIX}/include/eigen3\""))))) (build-system cmake-build-system) (arguments '(;; Turn off debugging symbols to save space. -- cgit v1.2.3 From 354f4fe2926d52fcd767022cd9b5ded319807e0e Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Nov 2015 15:52:56 +0100 Subject: gnu: eigen: Use 'modify-phases'. * gnu/packages/algebra.scm (eigen)[arguments]: Use 'modify-phases' instead of 'alist-cons-before'. --- gnu/packages/algebra.scm | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index fb3b3e94b3..41464ca882 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -413,19 +413,18 @@ (define-public eigen ;; . #:test-target "check" - #:phases (alist-cons-before - 'check 'build-tests - (lambda _ - ;; First build the tests, in parallel. - ;; See . - (let* ((cores (parallel-job-count)) - (dash-j (format #f "-j~a" cores))) - ;; These variables are supposed to be honored. - (setenv "EIGEN_MAKE_ARGS" dash-j) - (setenv "EIGEN_CTEST_ARGS" dash-j) + #:phases (modify-phases %standard-phases + (add-before 'check 'build-tests + (lambda _ + ;; First build the tests, in parallel. + ;; See . + (let* ((cores (parallel-job-count)) + (dash-j (format #f "-j~a" cores))) + ;; These variables are supposed to be honored. + (setenv "EIGEN_MAKE_ARGS" dash-j) + (setenv "EIGEN_CTEST_ARGS" dash-j) - (zero? (system* "make" "buildtests" dash-j)))) - %standard-phases))) + (zero? (system* "make" "buildtests" dash-j)))))))) (home-page "http://eigen.tuxfamily.org") (synopsis "C++ template library for linear algebra") (description -- cgit v1.2.3 From d3a33fe28d7933afda7bfa2e421bf0000c0c0eac Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 16 Nov 2015 16:01:33 +0100 Subject: gnu: eigen: Run 'ctest' in verbose mode. * gnu/packages/algebra.scm (eigen)[arguments]: Add "-V" in 'EIGEN_CTEST_ARGS'. --- gnu/packages/algebra.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 41464ca882..75eaf26559 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -422,7 +422,11 @@ (define-public eigen (dash-j (format #f "-j~a" cores))) ;; These variables are supposed to be honored. (setenv "EIGEN_MAKE_ARGS" dash-j) - (setenv "EIGEN_CTEST_ARGS" dash-j) + + ;; Use '-V' to get more details in case of test + ;; failures. + (setenv "EIGEN_CTEST_ARGS" + (string-append "-V " dash-j)) (zero? (system* "make" "buildtests" dash-j)))))))) (home-page "http://eigen.tuxfamily.org") -- cgit v1.2.3 From 08c28b6d5a447db6bedc1faa24e98f54c95d9ee8 Mon Sep 17 00:00:00 2001 From: Andreas Enge Date: Fri, 27 Nov 2015 02:44:21 +0100 Subject: gnu: gp2c: Update to 0.0.9pl4. * gnu/packages/algebra.scm (gp2c): Update to 0.0.9pl4. --- gnu/packages/algebra.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 75eaf26559..e9edf36d1e 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -157,7 +157,7 @@ (define-public pari-gp (define-public gp2c (package (name "gp2c") - (version "0.0.9pl3") + (version "0.0.9pl4") (source (origin (method url-fetch) (uri (string-append @@ -165,7 +165,7 @@ (define-public gp2c version ".tar.gz")) (sha256 (base32 - "0wbghihwlcx3w4j1la3bjf5gcrkk6lp9syw6iimqndq1f73ijlq3")))) + "079qq4yyxpc53a2kn08gg9pcfgdyffbl14c2hqsic11q8pnsr08z")))) (build-system gnu-build-system) (native-inputs `(("perl" ,perl))) (inputs `(("pari-gp" ,pari-gp))) -- cgit v1.2.3 From ef8742ea69b8998320d4815e2d9820432852517d Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 27 Nov 2015 10:59:56 +0100 Subject: gnu: eigen: Really run tests in verbose mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Suggested by Gaël Guennebaud . * gnu/packages/algebra.scm (eigen)[arguments]: Remove #:test-target. Rename 'build-tests' phase to 'check', and have it run 'ctest -V'. --- gnu/packages/algebra.scm | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index e9edf36d1e..25e1af1750 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -409,26 +409,18 @@ (define-public eigen '(;; Turn off debugging symbols to save space. #:build-type "Release" - ;; Use 'make check', as per - ;; . - #:test-target "check" - #:phases (modify-phases %standard-phases - (add-before 'check 'build-tests + (replace 'check (lambda _ - ;; First build the tests, in parallel. - ;; See . (let* ((cores (parallel-job-count)) (dash-j (format #f "-j~a" cores))) - ;; These variables are supposed to be honored. - (setenv "EIGEN_MAKE_ARGS" dash-j) - - ;; Use '-V' to get more details in case of test - ;; failures. - (setenv "EIGEN_CTEST_ARGS" - (string-append "-V " dash-j)) + ;; First build the tests, in parallel. See + ;; . + (and (zero? (system* "make" "buildtests" dash-j)) - (zero? (system* "make" "buildtests" dash-j)))))))) + ;; Then run 'CTest' with -V so we get more + ;; details upon failure. + (zero? (system* "ctest" "-V" dash-j))))))))) (home-page "http://eigen.tuxfamily.org") (synopsis "C++ template library for linear algebra") (description -- cgit v1.2.3