From 5427db0dc0c625b6fbc33dc78e456b6cdd6e95d2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Thu, 4 Apr 2019 00:29:52 +0200 Subject: gnu: giac-xcas: Update to 1.5.0-49. * gnu/packages/algebra.scm (giac-xcas): Update to 1.5.0-49. --- 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 e272cd990b..205eb29863 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -248,7 +248,7 @@ (define-public cmh (define-public giac-xcas (package (name "giac-xcas") - (version "1.5.0-43") + (version "1.5.0-49") (source (origin (method url-fetch) ;; "~parisse/giac" is not used because the maintainer regularly @@ -260,7 +260,7 @@ (define-public giac-xcas "source/giac_" version ".tar.gz")) (sha256 (base32 - "1j58cvpiddzxswfdh4ixyj1xsva7qwk8xjls29nqvryyykdfm4dp")))) + "0f4pkand9vmqfayw18jm5qxbhcwi1405qfd7ibzh9lwzz6amkm3l")))) (build-system gnu-build-system) (outputs '("out" "doc")) ;77MiB of documentation (arguments -- cgit v1.2.3 From 697eb65da6279601de4c3bd8e3a15c70b1333363 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 7 Apr 2019 09:54:13 +0200 Subject: gnu: Add eigen-for-tensorflow. * gnu/packages/algebra.scm (eigen-for-tensorflow): New variable. --- gnu/packages/algebra.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 205eb29863..9b4c7b8e27 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -56,6 +56,7 @@ (define-module (gnu packages algebra) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix hg-download) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix utils)) @@ -857,6 +858,32 @@ (define-public eigen ;; See 'COPYING.README' for details. (license license:mpl2.0))) +(define-public eigen-for-tensorflow + (let ((changeset "fd6845384b86") + (revision "1")) + (package (inherit eigen) + (name "eigen-for-tensorflow") + (version (string-append "3.3.5-" revision "." changeset)) + (source (origin + (method hg-fetch) + (uri (hg-reference + (url "https://bitbucket.org/eigen/eigen") + (changeset changeset))) + (sha256 + (base32 + "12cwgah63wqwb66xji048hcxc1z5zjg8a7701zlia5zbilnnk1n5")) + (file-name (string-append name "-" version "-checkout")) + (modules '((guix build utils))) + (snippet + ;; There are 3 test failures in the "unsupported" directory, + ;; but maintainers say it's a known issue and it's unsupported + ;; anyway, so just skip them. + '(begin + (substitute* "unsupported/CMakeLists.txt" + (("add_subdirectory\\(test.*") + "# Do not build the tests for unsupported features.\n")) + #t))))))) + (define-public xtensor (package (name "xtensor") -- cgit v1.2.3 From ff6807dc961259e57cb0f8064841c2054a957edb Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 16 Apr 2019 20:51:03 +0200 Subject: gnu: singular: Update to 4.1.2p1. * gnu/packages/algebra.scm (singular): Update to 4.1.2p1. --- gnu/packages/algebra.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 9b4c7b8e27..ba1c12daed 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2014, 2018 Mark H Weaver ;;; Copyright © 2016, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2017 Efraim Flashner -;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice +;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier ;;; @@ -499,7 +499,7 @@ (define-public ntl (define-public singular (package (name "singular") - (version "4.1.1p3") + (version "4.1.2p1") (source (origin (method url-fetch) @@ -513,7 +513,7 @@ (define-public singular #\.) "-") "/singular-" version ".tar.gz")) (sha256 (base32 - "1qqj9bm9pkzm0iyycpvm8x6s79wws3nq60lz25h8x1q61h3426sm")))) + "0kvd55353fiqyq1msmi0kka66n5h0aqs7m3km60r01b1w2f8085m")))) (build-system gnu-build-system) (native-inputs `(("doxygen" ,doxygen) -- cgit v1.2.3 From 9f73ac242c1e6c40498b6778a1c10a10881b93b2 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Apr 2019 21:31:08 +0200 Subject: gnu: giac-xcas: Fix documentation. * gnu/packages/algebra.scm (giac-xcas): Use a single output. Fix licensing issues in documentation. Xcas expects documentation to be located at a fixed location, not compatible with a "doc" output. --- gnu/packages/algebra.scm | 45 +++++++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 24 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index ba1c12daed..93dc756147 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -263,7 +263,6 @@ (define-public giac-xcas (base32 "0f4pkand9vmqfayw18jm5qxbhcwi1405qfd7ibzh9lwzz6amkm3l")))) (build-system gnu-build-system) - (outputs '("out" "doc")) ;77MiB of documentation (arguments `(#:modules ((ice-9 ftw) (guix build utils) @@ -282,28 +281,25 @@ (define-public giac-xcas (substitute* "check/Makefile.in" (("chk_fhan11") "")) #t)) - (add-after 'install 'install-doc - ;; Setting --docdir to "doc" output isn't sufficient as - ;; documentation and examples are scattered throughout the source. + (add-after 'install 'fix-doc (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (docdir (string-append doc - "/share/doc/" - (string-append ,name "-" ,version)))) - ;; For some reason, the install process moves - ;; "share/giac/examples" instead of "share/giac/doc" to - ;; "$(docdir)". Clean up the mess and start over. - (delete-file-recursively (string-append doc "/share")) - (mkdir-p docdir) - (with-directory-excursion out - (for-each (lambda (f) - (unless (member f '("." "..")) - (copy-recursively (string-append "share/giac/" f) - (string-append docdir "/" f)))) - (scandir "share/giac")) - (delete-file-recursively "share/giac"))) - #t))))) + (let ((out (assoc-ref outputs "out"))) + ;; Most French documentation has a non-commercial + ;; license, so we need to remove it. + (with-directory-excursion (string-append out "/share/giac/doc/fr") + (for-each delete-file-recursively + '("cascas" "casexo" "casgeo" "casrouge" "cassim" + "castor"))) + ;; Remove duplicate documentation in + ;; "%out/share/doc/giac/", where Xcas does not expect + ;; to find it. + (delete-file-recursively (string-append out "/share/doc/giac")) + #t))) + (add-after 'install 'remove-unnecessary-executable + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (delete-file (string-append out "/bin/xcasnew")) + #t)))))) (inputs `(("fltk" ,fltk) ("gmp" ,gmp) @@ -322,9 +318,10 @@ (define-public giac-xcas ("ntl" ,ntl) ("perl" ,perl) ("pari-gp" ,pari-gp) - ("tcsh" ,tcsh) + ("tcsh" ,tcsh))) + (native-inputs + `(("readline" ,readline) ("texlive" ,texlive-tiny))) - (native-inputs `(("readline" ,readline))) (home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html") (synopsis "Computer algebra system") (description -- cgit v1.2.3 From 6d3896b9fc115b03046860a9aa12966926bccf53 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Apr 2019 21:35:07 +0200 Subject: gnu: giac-xcas: Add inputs. * gnu/packages/algebra.scm (giac-xcas)[inputs]: Add glpk, libsamplerate, bison and flex. --- gnu/packages/algebra.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 93dc756147..fe039d82a5 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -42,6 +42,7 @@ (define-module (gnu packages algebra) #:use-module (gnu packages mpi) #:use-module (gnu packages multiprecision) #:use-module (gnu packages perl) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz) #:use-module (gnu packages readline) @@ -301,13 +302,16 @@ (define-public giac-xcas (delete-file (string-append out "/bin/xcasnew")) #t)))))) (inputs + ;;; TODO: Add libnauty. `(("fltk" ,fltk) + ("glpk" ,glpk) ("gmp" ,gmp) ("gsl" ,gsl) ("lapack" ,lapack) ("libao" ,ao) ("libjpeg" ,libjpeg) ("libpng" ,libpng) + ("libsamplerate" ,libsamplerate) ("libx11" ,libx11) ("libxinerama" ,libxinerama) ("libxft" ,libxft) @@ -320,7 +324,9 @@ (define-public giac-xcas ("pari-gp" ,pari-gp) ("tcsh" ,tcsh))) (native-inputs - `(("readline" ,readline) + `(("bison" ,bison) + ("flex" ,flex) + ("readline" ,readline) ("texlive" ,texlive-tiny))) (home-page "https://www-fourier.ujf-grenoble.fr/~parisse/giac.html") (synopsis "Computer algebra system") -- cgit v1.2.3 From 7fc0e3dbbbe96fc6ead2edbd98902120b6985000 Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Apr 2019 21:39:34 +0200 Subject: gnu: giac-xcas: Rename to "giac" to match upstream name. * gnu/packages/algebra.scm (giac): New variable. (giac-xcas): Deprecate. --- gnu/packages/algebra.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index fe039d82a5..8a0f0e1a04 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -247,9 +247,9 @@ (define-public cmh (license license:gpl3+) (home-page "http://cmh.gforge.inria.fr/"))) -(define-public giac-xcas +(define-public giac (package - (name "giac-xcas") + (name "giac") (version "1.5.0-49") (source (origin (method url-fetch) @@ -336,6 +336,9 @@ (define-public giac-xcas or text interfaces) or as a C++ library.") (license license:gpl3+))) +(define-public giac-xcas + (deprecate-package "giac-xcas" giac)) + (define-public flint (package (name "flint") -- cgit v1.2.3 From e0f3a4feb55851bd878607883498668f8b8fa10d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 28 Apr 2019 22:16:03 +0200 Subject: gnu: Fix typo. * gnu/packages/algebra.scm (giac-xcas): Fix typo. --- gnu/packages/algebra.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 8a0f0e1a04..387f842599 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -337,7 +337,7 @@ (define-public giac (license license:gpl3+))) (define-public giac-xcas - (deprecate-package "giac-xcas" giac)) + (deprecated-package "giac-xcas" giac)) (define-public flint (package -- cgit v1.2.3 From fdb513a7045f9731ddffff23bc8fb78b012d58ce Mon Sep 17 00:00:00 2001 From: Christopher Baines Date: Sun, 28 Apr 2019 23:57:26 +0100 Subject: gnu: Fix missing bison package in (gnu packages algebra). This fixes a regression introduced in 6d3896b9fc115b03046860a9aa12966926bccf53. * gnu/packages/algebra.scm: Use the (gnu packages bison) module. --- gnu/packages/algebra.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 387f842599..319a049d8a 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -27,6 +27,7 @@ (define-module (gnu packages algebra) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bison) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) -- cgit v1.2.3