@@ -9,14 +9,14 @@
99# all get the same sources with the same patches applied.
1010
1111stdenv.mkDerivation rec {
12− version = "8.5";
12+ version = "8.6";
1313 name = "sage-src-${version}";
1414
1515 src = fetchFromGitHub {
1616 owner = "sagemath";
1717 repo = "sage";
1818 rev = version;
19− sha256 = "08mb9626phsls2phdzqxsnp2df5pn5qr72m0mm4nncby26pwn19c";
19+ sha256 = "1vs3pbgbqpg0qnwr018bqsdmm7crgjp310cx8zwh7za3mv1cw5j3";
2020 };
2121
2222 # Patches needed because of particularities of nix or the way this is packaged.
@@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
4646 # tests) are also run. That is necessary to test dochtml individually. See
4747 # https://trac.sagemath.org/ticket/26110 for an upstream discussion.
4848 ./patches/Only-test-py2-py3-optional-tests-when-all-of-sage-is.patch
49−
50− ./patches/dont-test-guess-gaproot.patch
5149 ];
5250
5351 # Patches needed because of package updates. We could just pin the versions of
@@ -60,12 +58,13 @@ stdenv.mkDerivation rec {
6058 # Fetch a diff between `base` and `rev` on sage's git server.
6159 # Used to fetch trac tickets by setting the `base` to the last release and the
6260 # `rev` to the last commit of the ticket.
63− fetchSageDiff = { base, rev, ...}@args: (
61+ fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: (
6462 fetchpatch ({
65− url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
63+ inherit name;
64+ url = "https://git.sagemath.org/sage.git/rawdiff?id2=${base}&id=${rev}";
6665 # We don't care about sage's own build system (which builds all its dependencies).
6766 # Exclude build system changes to avoid conflicts.
68− excludes = [ "build/*" ];
67+ excludes = [ "/build/*" ];
6968 } // builtins.removeAttrs args [ "rev" "base" ])
7069 );
7170 in [
@@ -82,21 +81,6 @@ stdenv.mkDerivation rec {
8281 # https://trac.sagemath.org/ticket/26315
8382 ./patches/giac-1.5.0.patch
8483
85− # https://trac.sagemath.org/ticket/26326
86− # needs to be split because there is a merge commit in between
87− (fetchSageDiff {
88− name = "networkx-2.2-1.patch";
89− base = "8.4";
90− rev = "68f5ad068184745b38ba6716bf967c8c956c52c5";
91− sha256 = "112b5ywdqgyzgvql2jj5ss8la9i8rgnrzs8vigsfzg4shrcgh9p6";
92− })
93− (fetchSageDiff {
94− name = "networkx-2.2-2.patch";
95− base = "626485bbe5f33bf143d6dfba4de9c242f757f59b~1";
96− rev = "db10d327ade93711da735a599a67580524e6f7b4";
97− sha256 = "09v87id25fa5r9snfn4mv79syhc77jxfawj5aizmdpwdmpgxjk1f";
98− })
99−
10084 # https://trac.sagemath.org/ticket/26442
10185 (fetchSageDiff {
10286 name = "cypari2-2.0.3.patch";