From 9b4a518465764a13f827382ca2c7c0e2356541f1 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Mon, 12 Nov 2018 22:59:03 +0100 Subject: [PATCH] sage: drop known-padics-failure patch The failure was not observed for a while and is probably fixed now. --- .../math/sage/patches/known-padics-bug.patch | 15 --------------- pkgs/applications/science/math/sage/sage-src.nix | 4 +--- 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/known-padics-bug.patch 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