diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2019-10-30 23:14:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 23:14:07 +0100 |
| commit | f7c1e8f2746b1320342965b27d8c2d82fa0a507a (patch) | |
| tree | 563998239737af8c3c3b9f9bb380267672064f3c /pkgs/applications/science/math | |
| parent | 0a9950af05ef4643ca669b19cecbe045d59a81e3 (diff) | |
| parent | 32827e35d8198fa76117866191af310cf48308ed (diff) | |
| download | nixlib-f7c1e8f2746b1320342965b27d8c2d82fa0a507a.tar nixlib-f7c1e8f2746b1320342965b27d8c2d82fa0a507a.tar.gz nixlib-f7c1e8f2746b1320342965b27d8c2d82fa0a507a.tar.bz2 nixlib-f7c1e8f2746b1320342965b27d8c2d82fa0a507a.tar.lz nixlib-f7c1e8f2746b1320342965b27d8c2d82fa0a507a.tar.xz nixlib-f7c1e8f2746b1320342965b27d8c2d82fa0a507a.tar.zst nixlib-f7c1e8f2746b1320342965b27d8c2d82fa0a507a.zip | |
Merge pull request #72328 from timokau/sage-ignore-cmp-deprecation
sage: ignore attrs deprecation warning
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch | 13 | ||||
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 3 |
2 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch new file mode 100644 index 000000000000..5c1073e13e96 --- /dev/null +++ b/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch @@ -0,0 +1,13 @@ +diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py +index bd6b76ab82..f8340a8c66 100644 +--- a/src/sage/tests/cmdline.py ++++ b/src/sage/tests/cmdline.py +@@ -872,7 +872,7 @@ def test_executable(args, input="", timeout=100.0, **kwds): + sage: with open(input, 'w') as F: + ....: _ = F.write(s) + sage: test_executable(["sage", "--rst2sws", input, output]) # py2 +- ('', '', 0) ++ ('', '...', 0) + sage: import tarfile # py2 + sage: f = tarfile.open(output, 'r') # py2 + sage: print(f.extractfile('sage_worksheet/worksheet.html').read()) # py2 diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index dc9c9b5c874f..c7a3da68b15e 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -104,6 +104,9 @@ stdenv.mkDerivation rec { url = "https://git.sagemath.org/sage.git/patch?id=d27dc479a5772d59e4bc85d805b6ffd595284f1d"; sha256 = "1nf1s9y7n30lhlbdnam7sghgaq9nasmv96415gl5jlcf7a3hlxk3"; }) + + # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests + ./patches/ignore-cmp-deprecation.patch ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; |