aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/science/math/sage/sage-src.nix')
-rw-r--r--nixpkgs/pkgs/applications/science/math/sage/sage-src.nix23
1 files changed, 9 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
index 57d6c852be8..dc9c9b5c874 100644
--- a/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix
+++ b/nixpkgs/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";
+ version = "8.9";
pname = "sage-src";
src = fetchFromGitHub {
owner = "sagemath";
repo = "sage";
rev = version;
- sha256 = "0jm7zdkz8wfgrmf6620jfr8kgvprrz3qfl8gzx6rl5z5cm734b6x";
+ sha256 = "1bwga58x3s8z42w5h51c232f91ndsc1861dlb1glhax3pn0rhn3a";
};
# Patches needed because of particularities of nix or the way this is packaged.
@@ -49,10 +49,6 @@ stdenv.mkDerivation rec {
# https://trac.sagemath.org/ticket/27660#ticket
./patches/do-not-test-find-library.patch
-
- # https://trac.sagemath.org/ticket/28007
- ./patches/threejs-offline.patch
-
# Parallelize docubuild using subprocesses, fixing an isolation issue. See
# https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE
./patches/sphinx-docbuild-subprocesses.patch
@@ -97,18 +93,17 @@ stdenv.mkDerivation rec {
stripLen = 1;
})
- # https://trac.sagemath.org/ticket/26932
- (fetchSageDiff {
- name = "givaro-4.1.0_fflas-ffpack-2.4.0_linbox-1.6.0.patch";
- base = "8.8.beta4";
- rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
- sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
- })
-
# After updating smypow to (https://trac.sagemath.org/ticket/3360) we can
# now set the cache dir to be withing the .sage directory. This is not
# strictly necessary, but keeps us from littering in the user's HOME.
./patches/sympow-cache.patch
+
+ # https://trac.sagemath.org/ticket/28472
+ (fetchpatch {
+ name = "eclib-20190909.patch";
+ url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d";
+ sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3";
+ })
];
patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;