From d8006740b9c2dc0a0bd977844054dddb102ec9fe Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 Mar 2020 00:54:24 +0100 Subject: gnu: Remove packages deprecated for over a year. * gnu/packages/admin.scm (intel-gpu-tools): Remove variable. * gnu/packages/algebra.scm (giac-xcas): Likewise. --- gnu/packages/algebra.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 8682ecd8d0..0bec53743d 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -432,9 +432,6 @@ maple, mupad and the TI89. It is available as a standalone program (graphic or text interfaces) or as a C++ library.") (license license:gpl3+))) -(define-public giac-xcas - (deprecated-package "giac-xcas" giac)) - (define-public flint (package (name "flint") -- cgit v1.2.3 From d96ad7fa1dcb12082db1acc07876f1ff219489df Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 17:38:12 +0200 Subject: gnu: ntl: Update to 11.4.3. * gnu/packages/algebra.scm (ntl): Update to 11.4.3. [source], [home-page]: Use https URL. [source](snippet): Remove bundled libtool. [inputs]: Add gf2x. [arguments](configure): Use invoke insteam of system*. Remove the no longer supported WIZARD argument. Add a LIBTOOL parameter, since it's now required. Enable building with gf2x. Pass the paths to dependencies explicitly. (eclib)[inputs]: Remove the transitive dependency on gmp, which is now handled automatically by libtool. --- gnu/packages/algebra.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) (limited to 'gnu/packages/algebra.scm') diff --git a/gnu/packages/algebra.scm b/gnu/packages/algebra.scm index 0bec53743d..af50c2d775 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -558,42 +558,50 @@ these types and other mathematical functions.") (define-public ntl (package (name "ntl") - (version "9.7.0") + (version "11.4.3") (source (origin (method url-fetch) - (uri (string-append "http://shoup.net/ntl/ntl-" + (uri (string-append "https://shoup.net/ntl/ntl-" version ".tar.gz")) - (sha256 (base32 - "115frp5flyvw9wghz4zph1b3llmr5nbxk1skgsggckr81fh3gmxq")))) + (sha256 + (base32 + "1lisp3064rch3jaa2wrhy1s9kll7i3ka3d0y6lj6l3l4ckfcrhdp")) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "src/libtool-origin") + #t)))) (build-system gnu-build-system) (native-inputs `(("libtool" ,libtool) ("perl" ,perl))) ; for configuration - ;; FIXME: Add optional input gf2x once available; then also add - ;; configure flag "NTL_GF2X_LIB=on". (inputs - `(("gmp" ,gmp))) + `(("gmp" ,gmp) + ("gf2x" ,gf2x))) (arguments `(#:phases (modify-phases %standard-phases (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) (chdir "src") - (system* "./configure" + (invoke "./configure" (string-append "PREFIX=" (assoc-ref outputs "out")) + (string-append "LIBTOOL=" (assoc-ref inputs "libtool") "/bin/libtool") + ;; set the library prefixes explicitly so that they get + ;; embedded in the .la file + (string-append "GMP_PREFIX=" (assoc-ref inputs "gmp")) + (string-append "GF2X_PREFIX=" (assoc-ref inputs "gf2x")) ;; Do not build especially for the build machine. "NATIVE=off" - ;; Also do not tune to the build machine. - "WIZARD=off" - "SHARED=on") - #t))))) + "NTL_GF2X_LIB=on" + "SHARED=on")))))) (synopsis "C++ library for number theory") (description "NTL is a C++ library providing data structures and algorithms for manipulating signed, arbitrary length integers, and for vectors, matrices, and polynomials over the integers and over finite fields.") (license license:gpl2+) - (home-page "http://shoup.net/ntl/"))) + (home-page "https://shoup.net/ntl/"))) (define-public singular (package @@ -1451,8 +1459,7 @@ of M4RI from F_2 to F_{2^e}.") ("automake" ,automake) ("libtool" ,libtool))) (inputs - `(("gmp" ,gmp) - ("ntl" ,ntl) + `(("ntl" ,ntl) ("pari-gp" ,pari-gp))) (synopsis "Ranks of elliptic curves and modular symbols") (description "The eclib package includes mwrank (for 2-descent on -- cgit v1.2.3 From 7cc9e1dc5a474f12ca826f0bab7b5c3ac4c0d8ab Mon Sep 17 00:00:00 2001 From: Jakub Kądziołka Date: Sun, 29 Mar 2020 18:01:07 +0200 Subject: algebra.scm: Add a copyright line This is a follow-up to commit d96ad7fa1dcb12082db1acc07876f1ff219489df. --- 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 af50c2d775..081666c38f 100644 --- a/gnu/packages/algebra.scm +++ b/gnu/packages/algebra.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2017, 2019 Eric Bavier ;;; Copyright © 2020 Björn Höfling +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; -- cgit v1.2.3