about summary refs log tree commit diff
path: root/pkgs/applications/science/math
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2019-08-31 18:07:33 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2019-08-31 18:07:33 +0200
commit98ef78326d4349a14e328b322495e34242d796cc (patch)
tree1582a9a7d560d91b7125a4b5a4c49dab62a0479d /pkgs/applications/science/math
parent92b96ce63fa8752d0487edbe026a37ff765b33b3 (diff)
parent96e5474329a3c2b2309872fb01b007daaf6d7bdc (diff)
downloadnixlib-98ef78326d4349a14e328b322495e34242d796cc.tar
nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.gz
nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.bz2
nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.lz
nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.xz
nixlib-98ef78326d4349a14e328b322495e34242d796cc.tar.zst
nixlib-98ef78326d4349a14e328b322495e34242d796cc.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r--pkgs/applications/science/math/pari/default.nix17
1 files changed, 2 insertions, 15 deletions
diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix
index 72827112c50c..89ae354e7c76 100644
--- a/pkgs/applications/science/math/pari/default.nix
+++ b/pkgs/applications/science/math/pari/default.nix
@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, fetchpatch
 , gmp
 , readline
 , libX11
@@ -13,25 +12,13 @@ assert withThread -> libpthreadstubs != null;
 
 stdenv.mkDerivation rec {
   pname = "pari";
-  version = "2.11.1";
+  version = "2.11.2";
 
   src = fetchurl {
     url = "https://pari.math.u-bordeaux.fr/pub/pari/unix/${pname}-${version}.tar.gz";
-    sha256 = "1jfax92jpydjd02fwl30r6b8kfzqqd6sm4yx94gidyz9lqjb7a94";
+    sha256 = "0fck8ssmirl8fy7s4mspgrxjs5sag76xbshqlqzkcl3kqyrk4raa";
   };
 
-  patches = [
-    # Fix a off-by-one bug that can potentially lead to segfaults (accepted upstream)
-    # https://pari.math.u-bordeaux.fr/cgi-bin/bugreport.cgi?bug=2117
-    # https://trac.sagemath.org/ticket/27335
-    (fetchpatch {
-      name = "fix-off-by-one-error.patch";
-      # only relevant parts of https://pari.math.u-bordeaux.fr/cgi-bin/gitweb.cgi?p=pari.git;a=patch;h=aa1ee6e0898d177e6bcf49237d82c804bc410985
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pari/patches/red_montgomery.patch?id=bbea55c96e1f05302b3c7f593cf64492497047c5";
-      sha256 = "0vqkmhgv9splsdswp6zjnkj50z76rc1m6k9iy3cf9dxwqw3h3nr6";
-    })
-  ];
-
   buildInputs = [
     gmp
     readline