diff options
| author | Timo Kaufmann <timokau@zoho.com> | 2019-02-14 21:48:03 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-14 21:48:03 +0100 |
| commit | 9243e85fbc5d526390bf70260f9e266fa6e91ad8 (patch) | |
| tree | 44a9e33e58625e471903db01dfeac13cefb1719e /pkgs/applications/science/math | |
| parent | b2e2fe821918a664b13774171deb767635a2b9f2 (diff) | |
| download | nixpkgs-9243e85fbc5d526390bf70260f9e266fa6e91ad8.tar nixpkgs-9243e85fbc5d526390bf70260f9e266fa6e91ad8.tar.gz nixpkgs-9243e85fbc5d526390bf70260f9e266fa6e91ad8.tar.bz2 nixpkgs-9243e85fbc5d526390bf70260f9e266fa6e91ad8.tar.lz nixpkgs-9243e85fbc5d526390bf70260f9e266fa6e91ad8.tar.xz nixpkgs-9243e85fbc5d526390bf70260f9e266fa6e91ad8.tar.zst nixpkgs-9243e85fbc5d526390bf70260f9e266fa6e91ad8.zip | |
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
Diffstat (limited to 'pkgs/applications/science/math')
| -rw-r--r-- | pkgs/applications/science/math/sage/sage-src.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index 4ef88e34f03..b9d0a9ef448 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -64,10 +64,10 @@ stdenv.mkDerivation rec { fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: ( fetchpatch ({ 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). # Exclude build system changes to avoid conflicts. - excludes = [ "/build/*" ]; + excludes = [ "build/*" ]; } // builtins.removeAttrs args [ "rev" "base" ]) ); in [ |