diff options
author | Timo Kaufmann <timokau@zoho.com> | 2019-05-31 15:32:31 +0200 |
---|---|---|
committer | Timo Kaufmann <timokau@zoho.com> | 2019-06-27 22:02:57 +0200 |
commit | c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7 (patch) | |
tree | d81e072524087456a222b4df47e5779fc472be0a /pkgs/applications/science/math | |
parent | 9f434d70803c1cca7c3ef0bedb891cdfe92e7134 (diff) | |
download | nixlib-c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7.tar nixlib-c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7.tar.gz nixlib-c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7.tar.bz2 nixlib-c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7.tar.lz nixlib-c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7.tar.xz nixlib-c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7.tar.zst nixlib-c76e8fa86e3caa81e7a8ac7b477193c025d3b9c7.zip |
sage: 8.8.beta6 -> 8.8.beta7
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/sage/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/applications/science/math/sage/default.nix b/pkgs/applications/science/math/sage/default.nix index 061b3beeb3f2..caf51c3da251 100644 --- a/pkgs/applications/science/math/sage/default.nix +++ b/pkgs/applications/science/math/sage/default.nix @@ -130,7 +130,7 @@ let singular = pkgs.singular.override { inherit flint; }; # https://trac.sagemath.org/ticket/26625 - maxima-ecl = pkgs.maxima-ecl-5_41; + maxima-ecl = pkgs.maxima-ecl; # *not* to confuse with the python package "pynac" pynac = pkgs.pynac.override { inherit singular flint; }; diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 7300e20da5e6..d88f3aa6b05d 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -10,14 +10,14 @@ # all get the same sources with the same patches applied. stdenv.mkDerivation rec { - version = "8.8.beta6"; + version = "8.8.beta7"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "0n0mpsxnl5kg02k0jlpd34vgk5f162pd3hd5jn821rphffsbzk5j"; + sha256 = "08ss24xswnfcyncagqx3g7lvx536nk2qddq7nbpyvbgnc3z3i3r3"; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -61,7 +61,14 @@ stdenv.mkDerivation rec { # Since sage unfortunately does not release bugfix releases, packagers must # fix those bugs themselves. This is for critical bugfixes, where "critical" # == "causes (transient) doctest failures / somebody complained". - bugfixPatches = [ ]; + bugfixPatches = [ + # https://trac.sagemath.org/ticket/28036 + (fetchpatch { + name = "fix-infinite-loop.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=4d1cf508f9fc19f73e2ec3c82258400009e27dcf"; + sha256 = "0pdnzsmr3c38x2i4b2pj81lmqrw5bmd24n2gkmg7bpq5jmf7kpb4"; + }) + ]; # Patches needed because of package updates. We could just pin the versions of # dependencies, but that would lead to rebuilds, confusion and the burdons of |