about summary refs log tree commit diff
path: root/pkgs/applications/science/math
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2019-05-11 17:36:52 +0200
committerTimo Kaufmann <timokau@zoho.com>2019-06-27 22:01:37 +0200
commit325a5037bf16de81266c4f0e0b9673eeba8622dc (patch)
treede4b8f4487eaafdfef348741bc59053a1fa44d3a /pkgs/applications/science/math
parent240d4c31d25237db1f78036f41953d435dea97e1 (diff)
downloadnixlib-325a5037bf16de81266c4f0e0b9673eeba8622dc.tar
nixlib-325a5037bf16de81266c4f0e0b9673eeba8622dc.tar.gz
nixlib-325a5037bf16de81266c4f0e0b9673eeba8622dc.tar.bz2
nixlib-325a5037bf16de81266c4f0e0b9673eeba8622dc.tar.lz
nixlib-325a5037bf16de81266c4f0e0b9673eeba8622dc.tar.xz
nixlib-325a5037bf16de81266c4f0e0b9673eeba8622dc.tar.zst
nixlib-325a5037bf16de81266c4f0e0b9673eeba8622dc.zip
sage: 8.8.beta4 -> 8.8.beta5
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r--pkgs/applications/science/math/sage/sage-src.nix24
1 files changed, 2 insertions, 22 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index df4db0e6b54e..c8d817564f93 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.beta4";
+  version = "8.8.beta5";
   pname = "sage-src";
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "sage";
     rev = version;
-    sha256 = "01c1aj70kp4m20ga80mp09lks7p2pgp0g6ggs9nin0zvq5nhcpsx";
+    sha256 = "1c1ckabvi1mi0vaj9iahlgi1d5ss5ld442pzbg2n2vqbv7bfjfqd";
   };
 
   # Patches needed because of particularities of nix or the way this is packaged.
@@ -49,12 +49,6 @@ stdenv.mkDerivation rec {
     # https://trac.sagemath.org/ticket/27660#ticket
     ./patches/do-not-test-find-library.patch
 
-    # https://trac.sagemath.org/ticket/27766
-    (fetchpatch {
-      name = "more-optional-build-tags.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?id=a6deff761da469fad57eae498e639d6166fd78ed";
-      sha256 = "02qb9r3p0vgb9q5hhrp41mcgrk1gxrl02fmp486gnrym3cqnw5n1";
-    })
 
     # https://trac.sagemath.org/ticket/28007
     ./patches/threejs-offline.patch
@@ -99,13 +93,6 @@ stdenv.mkDerivation rec {
       stripLen = 1;
     })
 
-    # https://trac.sagemath.org/ticket/27653
-    (fetchpatch {
-      name = "sympy-1.4.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?h=3277ba76d0ba7174608a31a0c6623e9210c63e3d";
-      sha256 = "09avaanwmdgqv14mmllbgw9z2scf4lc0y0kzdhlriiq8ss9j8iir";
-    })
-
     # https://trac.sagemath.org/ticket/27738
     (fetchpatch {
       name = "R-3.6.0.patch";
@@ -120,13 +107,6 @@ stdenv.mkDerivation rec {
       rev = "c11d9cfa23ff9f77681a8f12742f68143eed4504";
       sha256 = "0xzra7mbgqvahk9v45bjwir2mqz73hrhhy314jq5nxrb35ysdxyi";
     })
-
-    # https://trac.sagemath.org/ticket/26718
-    (fetchpatch {
-      name = "threejs-r100.patch";
-      url = "https://git.sagemath.org/sage.git/patch/?h=86c5bb000259e6de5d7c60afc608a4b0d010b690";
-      sha256 = "0sgqqd4df2bxsq19b6kfy7dvgyxprlpg7f3xx7g3fs8ij937m352";
-    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;