diff options
author | Timo Kaufmann <timokau@zoho.com> | 2018-07-15 11:20:19 +0200 |
---|---|---|
committer | Timo Kaufmann <timokau@zoho.com> | 2018-07-15 14:59:28 +0200 |
commit | c77d1e5b318213ec432cda40f3c4c9bbae429281 (patch) | |
tree | 876de533d5e03bef99513a1c4a834ba0e9ece924 /pkgs/applications/science | |
parent | 064bff0ae0bc5b3ddb63e10aea0c883f341fd0b5 (diff) | |
download | nixlib-c77d1e5b318213ec432cda40f3c4c9bbae429281.tar nixlib-c77d1e5b318213ec432cda40f3c4c9bbae429281.tar.gz nixlib-c77d1e5b318213ec432cda40f3c4c9bbae429281.tar.bz2 nixlib-c77d1e5b318213ec432cda40f3c4c9bbae429281.tar.lz nixlib-c77d1e5b318213ec432cda40f3c4c9bbae429281.tar.xz nixlib-c77d1e5b318213ec432cda40f3c4c9bbae429281.tar.zst nixlib-c77d1e5b318213ec432cda40f3c4c9bbae429281.zip |
eclib: 20171219 -> 20180710
Also includes the necessary sage compatibility patch, borrowed from ArchLinux.
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/math/sage/patches/eclib-20180710.patch | 40 | ||||
-rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 3 |
2 files changed, 43 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/sage/patches/eclib-20180710.patch b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch new file mode 100644 index 000000000000..d06e1e6cedf2 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/eclib-20180710.patch @@ -0,0 +1,40 @@ +diff --git a/src/sage/interfaces/mwrank.py b/src/sage/interfaces/mwrank.py +index 4417b59276..ae57ca2991 100644 +--- a/src/sage/interfaces/mwrank.py ++++ b/src/sage/interfaces/mwrank.py +@@ -54,8 +54,9 @@ def Mwrank(options="", server=None, server_tmpdir=None): + sage: M = Mwrank('-v 0 -l') + sage: print(M('0 0 1 -1 0')) + Curve [0,0,1,-1,0] : Rank = 1 +- Generator 1 is [0:-1:1]; height 0.0511114082399688 +- Regulator = 0.0511114082399688 ++ Generator 1 is [0:-1:1]; height 0.051111408239969 ++ Regulator = 0.051111408239969 ++ + """ + global instances + try: +diff --git a/src/sage/libs/eclib/wrap.cpp b/src/sage/libs/eclib/wrap.cpp +index 5fd5693b53..d12468faa8 100644 +--- a/src/sage/libs/eclib/wrap.cpp ++++ b/src/sage/libs/eclib/wrap.cpp +@@ -133,8 +133,8 @@ char* Curvedata_isogeny_class(struct Curvedata* E, int verbose) + + + int mw_process(struct Curvedata* curve, struct mw* m, +- const struct bigint* x, const struct bigint* y, +- const struct bigint* z, int sat) ++ const bigint* x, const bigint* y, ++ const bigint* z, int sat) + { + Point P(*curve, *x, *y, *z); + if (!P.isvalid()) +@@ -188,7 +188,7 @@ int mw_rank(struct mw* m) + } + + /* Returns index and unsat long array, which user must deallocate */ +-int mw_saturate(struct mw* m, struct bigint* index, char** unsat, ++int mw_saturate(struct mw* m, bigint* index, char** unsat, + long sat_bd, int odd_primes_only) + { + vector<long> v; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 348adf5d5095..d342fba21164 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -176,6 +176,9 @@ stdenv.mkDerivation rec { # https://trac.sagemath.org/ticket/24838 rebased ./patches/pynac-0.7.22.patch + + # https://trac.sagemath.org/ticket/25862 + ./patches/eclib-20180710.patch ]; patches = nixPatches ++ packageUpgradePatches; |