diff options
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/local.mk | 4 | ||||
-rw-r--r-- | gnu/packages/patches/lcalc-default-parameters-1.patch | 26 | ||||
-rw-r--r-- | gnu/packages/patches/lcalc-default-parameters-2.patch | 58 | ||||
-rw-r--r-- | gnu/packages/patches/lcalc-lcommon-h.patch | 13 | ||||
-rw-r--r-- | gnu/packages/patches/lcalc-using-namespace-std.patch | 43 | ||||
-rw-r--r-- | gnu/packages/sagemath.scm | 72 |
6 files changed, 21 insertions, 195 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index 1bd791fb0c..bbc06326b8 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1381,10 +1381,6 @@ dist_patch_DATA = \ %D%/packages/patches/kodi-set-libcurl-ssl-parameters.patch \ %D%/packages/patches/kodi-skip-test-449.patch \ %D%/packages/patches/laby-make-install.patch \ - %D%/packages/patches/lcalc-default-parameters-1.patch \ - %D%/packages/patches/lcalc-default-parameters-2.patch \ - %D%/packages/patches/lcalc-lcommon-h.patch \ - %D%/packages/patches/lcalc-using-namespace-std.patch \ %D%/packages/patches/ldns-drill-examples.patch \ %D%/packages/patches/leela-zero-gtest.patch \ %D%/packages/patches/less-hurd-path-max.patch \ diff --git a/gnu/packages/patches/lcalc-default-parameters-1.patch b/gnu/packages/patches/lcalc-default-parameters-1.patch deleted file mode 100644 index 19b0776320..0000000000 --- a/gnu/packages/patches/lcalc-default-parameters-1.patch +++ /dev/null @@ -1,26 +0,0 @@ -Patch taken from the Sage packaging system. - -diff -Naur lcalc-1.23-vanilla/include/Ldirichlet_series.h lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h ---- lcalc-1.23-vanilla/include/Ldirichlet_series.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23-fixed-gcc.4.9/include/Ldirichlet_series.h 2014-04-21 14:37:59.027464849 +0200 -@@ -43,7 +43,7 @@ - //XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX - template <class ttype> - Complex L_function <ttype>:: --dirichlet_series(Complex s, long long N=-1) -+dirichlet_series(Complex s, long long N) - { - Complex z=0.; - long long m,n; -diff -Naur lcalc-1.23-vanilla/include/L.h lcalc-1.23-fixed-gcc.4.9/include/L.h ---- lcalc-1.23-vanilla/include/L.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23-fixed-gcc.4.9/include/L.h 2014-04-21 14:32:04.003467348 +0200 -@@ -491,7 +491,7 @@ - - //#include "Ldirichlet_series.h" //for computing Dirichlet series - Complex partial_dirichlet_series(Complex s, long long N1, long long N2); -- Complex dirichlet_series(Complex s, long long N); -+ Complex dirichlet_series(Complex s, long long N=-1LL); - - //#include "Ltaylor_series.h" //for computing taylor series for Dirichlet series - //void compute_taylor_series(int N, int K, Complex s_0, Complex *series); diff --git a/gnu/packages/patches/lcalc-default-parameters-2.patch b/gnu/packages/patches/lcalc-default-parameters-2.patch deleted file mode 100644 index 1d881ee0c4..0000000000 --- a/gnu/packages/patches/lcalc-default-parameters-2.patch +++ /dev/null @@ -1,58 +0,0 @@ -Patch taken from the Sage packaging system. - ---- lcalc-1.23/include/Lgamma.h 2012-08-08 23:21:55.000000000 +0200 -+++ lcalc-1.23/include/Lgamma.h 2014-05-18 21:15:27.786889718 +0200 -@@ -77,7 +77,7 @@ - //n=0 should just give log_GAMMA(z)... thus making log_GAMMA - //code obsolete. But leave log_GAMMA intact anyways. - template <class ttype> --precise(ttype) log_GAMMA (ttype z,int n=0) -+precise(ttype) log_GAMMA (ttype z,int n) - { - int M; - precise(ttype) log_G,r,r2,y; -@@ -230,7 +230,7 @@ - //value exp_w which holds exp(-w) - //computes G(z,w), so there's an extra w^(-z) factor. - template <class ttype> --Complex inc_GAMMA (ttype z,ttype w, const char *method="temme", ttype exp_w = 0, bool recycle=false) -+Complex inc_GAMMA (ttype z,ttype w, const char *method, ttype exp_w, bool recycle) - { - - Complex G; -@@ -334,7 +334,7 @@ - - - template <class ttype> --ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w=0, bool recycle=false) //computes G(z,w) via continued fraction -+ttype cfrac_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via continued fraction - { - - ttype G; -@@ -424,7 +424,7 @@ - } - - template <class ttype> --ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w = 0, bool recycle=false) //computes G(z,w) via asymptotic series -+ttype asympt_GAMMA (ttype z,ttype w, ttype exp_w, bool recycle) //computes G(z,w) via asymptotic series - { - - if(my_verbose>3) cout << "called asympt_GAMMA("<<z<<","<<w<<")"<< endl; -@@ -446,7 +446,7 @@ - - - template <class ttype> --ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w = 0, bool recycle=false) //computes g(z,w) -+ttype comp_inc_GAMMA (ttype z,ttype w,ttype exp_w, bool recycle) //computes g(z,w) - { - - ttype g; -@@ -604,7 +604,7 @@ - } - - template <class ttype> --Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta=1, const char *method="temme") -+Complex gamma_sum(Complex s, int what_type, ttype *coeff, int N, Double g, Complex l, Double Q, Long Period, Complex delta, const char *method) - { - Complex SUM=0; - diff --git a/gnu/packages/patches/lcalc-lcommon-h.patch b/gnu/packages/patches/lcalc-lcommon-h.patch deleted file mode 100644 index 897956de64..0000000000 --- a/gnu/packages/patches/lcalc-lcommon-h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Patch taken from the Sage packaging system. - ---- src/include/Lcommon.h 2010-01-31 15:16:45.000000000 +0000 -+++ src/include/Lcommon.h 2011-03-08 21:19:11.849443238 +0000 -@@ -25,7 +25,7 @@ - #ifdef USE_MPFR - inline double lcalc_to_double(const double& x) { return x; } - #endif --//inline double lcalc_to_double(const long double& x) { return x; } -+inline double lcalc_to_double(const long double& x) { return x; } - inline double lcalc_to_double(const int& x) { return x; } - inline double lcalc_to_double(const long long& x) { return x; } - inline double lcalc_to_double(const short& x) { return x; } diff --git a/gnu/packages/patches/lcalc-using-namespace-std.patch b/gnu/packages/patches/lcalc-using-namespace-std.patch deleted file mode 100644 index 6e0075fdc8..0000000000 --- a/gnu/packages/patches/lcalc-using-namespace-std.patch +++ /dev/null @@ -1,43 +0,0 @@ -Patch taken from the Sage packaging system. - -diff --git a/include/Lcommon.h b/include/Lcommon.h -index 1b3be43..bf40532 100644 ---- a/include/Lcommon.h -+++ b/include/Lcommon.h -@@ -48,7 +48,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th - - // Loop i from m to n - // Useful in tidying up most for loops --#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++) -+#define loop(i,m,n) for(auto i=(m); i!=(n); i++) - - // A class for calculations involving polynomials of small degree - // Not efficient enough for huge polynomials -diff --git a/include/Lcommon_ld.h b/include/Lcommon_ld.h -index 86ae4df..33c560c 100644 ---- a/include/Lcommon_ld.h -+++ b/include/Lcommon_ld.h -@@ -53,7 +53,7 @@ const bool outputSeries=true; // Whether to output the coefficients or just th - - // Loop i from m to n - // Useful in tidying up most for loops --#define loop(i,m,n) for(typeof(m) i=(m); i!=(n); i++) -+#define loop(i,m,n) for(auto i=(m); i!=(n); i++) - - // A class for calculations involving polynomials of small degree - // Not efficient enough for huge polynomials -diff --git a/include/Lglobals.h b/include/Lglobals.h -index 60002e4..ca2606c 100644 ---- a/include/Lglobals.h -+++ b/include/Lglobals.h -@@ -24,9 +24,9 @@ - #ifndef Lglobals_H - #define Lglobals_H - -+#include <valarray> - using namespace std; - --#include <valarray> - #ifdef USE_MPFR - #include "Lgmpfrxx.h" - typedef mpfr_class Double; diff --git a/gnu/packages/sagemath.scm b/gnu/packages/sagemath.scm index bb80ff4db5..4542bc1c88 100644 --- a/gnu/packages/sagemath.scm +++ b/gnu/packages/sagemath.scm @@ -38,6 +38,7 @@ #:use-module (gnu packages lisp) #:use-module (gnu packages multiprecision) #:use-module (gnu packages pkg-config) + #:use-module (gnu packages popt) #:use-module (gnu packages python) #:use-module (gnu packages python-xyz)) @@ -309,59 +310,28 @@ used as internal storage type for polynomial structures.") (define-public lcalc (package (name "lcalc") - (version "1.23") - ;; The original home page of the project has disappeared, as well as - ;; code hosted by the original author on Google Code. The latter has - ;; been copied to gitlab.com/sagemath and purportedly contains patches - ;; for a never released version 1.3, that supposedly follows 1.23. - ;; We use the tarball as well as the patches hosted inside the sage - ;; package system distributed with the sage tarball. - (source - (origin - (method url-fetch) - (uri (string-append "ftp://ftp.fu-berlin.de/unix/misc/sage/spkg/" - "upstream/lcalc/lcalc-1.23.tar.bz2")) - (sha256 - (base32 - "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43")) - (patches (search-patches "lcalc-lcommon-h.patch" - "lcalc-default-parameters-1.patch" - "lcalc-default-parameters-2.patch" - "lcalc-using-namespace-std.patch")))) + (version "2.0.5") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/sagemath/lcalc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1rwyx292y3jbsp88wagn9nhl9z7wsnl2yrs5imxkbxq87pnrj5a7")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ;no tests - #:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'prepare-build - (lambda* (#:key outputs #:allow-other-keys) - (chdir "src") - (let ((out (assoc-ref outputs "out"))) - (substitute* "Makefile" - (("^INSTALL_DIR= /usr/local") - (string-append "INSTALL_DIR=" out)))) - #t)) - (add-before 'install 'make-output-dirs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (lib (string-append out "/lib")) - (include (string-append out "/include"))) - (mkdir-p bin) - (mkdir-p lib) - (mkdir-p include)) - #t))))) - ;; FIXME: - ;; We need to add pari-gp and probably pari related patches from the - ;; sage project, as well as uncomment the line setting PARI_DEFINE in - ;; the Makefile to get the full functionality of this package. - ;; For the time being, we hope that sage can be compiled without. - (synopsis "C++ library for L-functions") - (description "Lcalc computes L-functions, in particular the Riemann -zeta function and its twists by quadratic characters.") - (license license:gpl2+) - (home-page "https://gitlab.com/sagemath/sage"))) + (list #:configure-flags '(list "--with-pari"))) + (inputs (list pari-gp)) + (native-inputs (list autoconf automake libtool pkg-config gengetopt)) + (home-page "https://gitlab.com/sagemath/lcalc") + (synopsis "C++ library for computing with L-functions") + (description + "Lcalc computes L-functions, in particular the Riemann zeta function, +Dirichlet L-functions and L-functions attached to elliptic curves and +modular forms.") + (license license:gpl2+))) (define-public ratpoints (package |