diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-07-19 00:35:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-19 00:35:09 -0400 |
commit | fddd90e9eaf7063156721ac7a296b2f219edb92e (patch) | |
tree | 90ca19d034473894187f885647b071ef843ae99f /pkgs/applications/science/math | |
parent | 26cd7bb90bd3691793f32bbbdb6c6127eb1755b4 (diff) | |
parent | 30585139410578e9cbf3091a3f930dcd22de1ebc (diff) | |
download | nixlib-fddd90e9eaf7063156721ac7a296b2f219edb92e.tar nixlib-fddd90e9eaf7063156721ac7a296b2f219edb92e.tar.gz nixlib-fddd90e9eaf7063156721ac7a296b2f219edb92e.tar.bz2 nixlib-fddd90e9eaf7063156721ac7a296b2f219edb92e.tar.lz nixlib-fddd90e9eaf7063156721ac7a296b2f219edb92e.tar.xz nixlib-fddd90e9eaf7063156721ac7a296b2f219edb92e.tar.zst nixlib-fddd90e9eaf7063156721ac7a296b2f219edb92e.zip |
Merge pull request #43538 from timokau/fetchpatch-fix
fetchpatch: quote excludes
Diffstat (limited to 'pkgs/applications/science/math')
-rw-r--r-- | pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch | 14 | ||||
-rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 7 |
2 files changed, 6 insertions, 15 deletions
diff --git a/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch b/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch deleted file mode 100644 index b57e48b86dec..000000000000 --- a/pkgs/applications/science/math/sage/patches/revert-269c1e1551285.patch +++ /dev/null @@ -1,14 +0,0 @@ -reverted: ---- b/src/sage/geometry/polyhedron/backend_cdd.py -+++ a/src/sage/geometry/polyhedron/backend_cdd.py -@@ -154,7 +154,9 @@ - ... [0.62, -1.38, 0.38],[0.144, -1.04, 0.04], - ... [0.1309090909, -1.0290909091, 0.04]] - sage: Polyhedron(point_list) -+ Traceback (most recent call last): -+ ... -+ ValueError: *Error: Numerical inconsistency is found. Use the GMP exact arithmetic. -- A 3-dimensional polyhedron in RDF^3 defined as the convex hull of 14 vertices - sage: Polyhedron(point_list, base_ring=QQ) - A 3-dimensional polyhedron in QQ^3 defined as the convex hull of 14 vertices - """ diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index d342fba21164..c97785c574cb 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -156,7 +156,12 @@ stdenv.mkDerivation rec { sha256 = "0fmw7pzbaxs2dshky6iw9pr8i23p9ih2y2lw661qypdrxh5xw03k"; stripLen = 1; }) - ./patches/revert-269c1e1551285.patch + (fetchpatch { + name = "revert-cddlib-doctest-changes.patch"; + url = "https://git.sagemath.org/sage.git/patch/?id=269c1e1551285566b8ba7a2b890989e5590e9f11"; + sha256 = "12bcjhq7hm2pmmj2bgjvcffjyls2x7q61ivlnaj5v5bsvhc183iy"; + revert = true; + }) # Only formatting changes. |