diff options
Diffstat (limited to 'pkgs/applications/science/math/sage/sage-src.nix')
-rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 95b01d9f3f583..019694fd265ef 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -114,18 +114,26 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch + # Upstream will wait until Sage 9.7 to upgrade to linbox 1.7 because it + # does not support gcc 6. We can upgrade earlier. + # https://trac.sagemath.org/ticket/32959 + ./patches/linbox-1.7-upgrade.patch + # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { - base = "9.5.beta8"; + base = "9.5"; name = "sphinx-4.3-update.patch"; rev = "fc84f82f52b6f05f512cb359ec7c100f93cf8841"; sha256 = "sha256-bBbfdcnw/9LUOlY8rHJRbFJEdMXK4shosqTNaobTS1Q="; }) - # Upstream has not upgraded to linbox 1.7 yet because it conflicts with - # pre-4.2.1p3 versions of Singular, but we don't have this problem. - # https://trac.sagemath.org/ticket/32959 - ./patches/linbox-1.7-upgrade.patch + # https://trac.sagemath.org/ticket/33189 + (fetchSageDiff { + base = "9.5"; + name = "arb-2.22-update.patch"; + rev = "53532ddd4e2dc92469c1590ebf0c40f8f69bf579"; + sha256 = "sha256-6SoSBvIlqvNwZV3jTB6uPdUtaWIOeNmddi2poK/WvGs="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; |