Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0a9950af05ef
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f7c1e8f2746b
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 30, 2019

  1. sage: ignore attrs deprecation warning 

    cmp is deprecated since attrs 19.2.0:
http://www.attrs.org/en/19.2.0/changelog.html

The deprecation warning breaks the doctests.  Fortunately they have a
rather long deprecation window, so we can just wait until upstream(s)
fix this.
    @timokau
    timokau committed Oct 30, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    32827e3 View commit details

  2. Merge pull request #72328 from timokau/sage-ignore-cmp-deprecation 

    sage: ignore attrs deprecation warning
    @timokau
    timokau authored Oct 30, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    GPG key ID: 36F7711F3FC0F225
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f7c1e8f View commit details
Showing with 16 additions and 0 deletions.
  1. +13 −0 pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
  2. +3 −0 pkgs/applications/science/math/sage/sage-src.nix
13 changes: 13 additions & 0 deletions pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch
View file
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions pkgs/applications/science/math/sage/sage-src.nix
View file
Original file line number Diff line number Diff line change
@@ -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;