about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorTimo Kaufmann <timokau@zoho.com>2018-11-12 22:59:03 +0100
committerTimo Kaufmann <timokau@zoho.com>2018-11-24 19:01:57 +0100
commit9b4a518465764a13f827382ca2c7c0e2356541f1 (patch)
tree5423bc8a0e5cc7e8c9fe5e9dc2e47c01fa0cca6b /pkgs/applications
parentca6475b5e8550951e97dde72ce5b64cd9bb152c3 (diff)
downloadnixlib-9b4a518465764a13f827382ca2c7c0e2356541f1.tar
nixlib-9b4a518465764a13f827382ca2c7c0e2356541f1.tar.gz
nixlib-9b4a518465764a13f827382ca2c7c0e2356541f1.tar.bz2
nixlib-9b4a518465764a13f827382ca2c7c0e2356541f1.tar.lz
nixlib-9b4a518465764a13f827382ca2c7c0e2356541f1.tar.xz
nixlib-9b4a518465764a13f827382ca2c7c0e2356541f1.tar.zst
nixlib-9b4a518465764a13f827382ca2c7c0e2356541f1.zip
sage: drop known-padics-failure patch
The failure was not observed for a while and is probably fixed now.
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/science/math/sage/patches/known-padics-bug.patch15
-rw-r--r--pkgs/applications/science/math/sage/sage-src.nix4
2 files changed, 1 insertions, 18 deletions
diff --git a/pkgs/applications/science/math/sage/patches/known-padics-bug.patch b/pkgs/applications/science/math/sage/patches/known-padics-bug.patch
deleted file mode 100644
index bdccd73e0ce1..000000000000
--- a/pkgs/applications/science/math/sage/patches/known-padics-bug.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/build/pkgs/openblas/package-version.txt b/build/pkgs/openblas/package-version.txt
-index 3bc45c25d4..7c7c224887 100644
---- a/src/sage/schemes/elliptic_curves/padics.py
-+++ b/src/sage/schemes/elliptic_curves/padics.py
-@@ -292,8 +292,8 @@ def padic_regulator(self, p, prec=20, height=None, check_hypotheses=True):
- 
-         sage: max_prec = 30    # make sure we get past p^2    # long time
-         sage: full = E.padic_regulator(5, max_prec)           # long time
--        sage: for prec in range(1, max_prec):                 # long time
--        ....:     assert E.padic_regulator(5, prec) == full   # long time
-+        sage: for prec in range(1, max_prec):                 # known bug (#25969) # long time
-+        ....:     assert E.padic_regulator(5, prec) == full   # known bug (#25969) # long time
- 
-     A case where the generator belongs to the formal group already
-     (:trac:`3632`)::
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix
index 26259d6b4d79..7ec58fdb1db3 100644
--- a/pkgs/applications/science/math/sage/sage-src.nix
+++ b/pkgs/applications/science/math/sage/sage-src.nix
@@ -101,9 +101,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  patches = nixPatches ++ packageUpgradePatches ++ [
-    ./patches/known-padics-bug.patch
-  ];
+  patches = nixPatches ++ packageUpgradePatches;
 
   postPatch = ''
     # make sure shebangs etc are fixed, but sage-python23 still works