public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sage: fix fetchSageDiff (#55783) 

For some reason I changed it to use `cgit`s `rawdiff` instead of `patch`
in the update to sage 8.6. Probably commited that by accident, at least
I can't remember the reason. Also changed the excludes filter, the
leading slash prevented it from working.

As a result, the cypari2 patch changed. Only didn't notice because it
was cached.

Fixes #55780
This commit is contained in:
Timo Kaufmann 2019-02-14 21:48:03 +01:00 committed by GitHub
parent b2e2fe8219
commit 9243e85fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/science/math/sage/sage-src.nix
View File

@ -64,10 +64,10 @@ stdenv.mkDerivation rec {
fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: ( fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: (
fetchpatch ({ fetchpatch ({
inherit name; inherit name;
url = "https://git.sagemath.org/sage.git/rawdiff?id2=${base}&id=${rev}"; url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}";
# We don't care about sage's own build system (which builds all its dependencies). # We don't care about sage's own build system (which builds all its dependencies).
# Exclude build system changes to avoid conflicts. # Exclude build system changes to avoid conflicts.
excludes = [ "/build/*" ]; excludes = [ "build/*" ];
} // builtins.removeAttrs args [ "rev" "base" ]) } // builtins.removeAttrs args [ "rev" "base" ])
); );
in [ in [