diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-09-21 18:13:34 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-21 18:13:34 +0200 |
| commit | 26e6732724e1017e8f8fa750a52b5903486f7c2c (patch) | |
| tree | 1c6f66a3241d42e5e813fdda6d420ad099331179 | |
| parent | a2228f4c18bdb95c8697b8c43ef99107e2c7af41 (diff) | |
| parent | 7bd19e7a258912e1bdd243556e9b7536e4c1d25d (diff) | |
Merge pull request #98387 from oxalica/fix/nix-prefetch
nix-prefetch: fix compatibility with nixUnstable again
| -rw-r--r-- | pkgs/tools/package-management/nix-prefetch/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index edc8e8bf1a197..f1f575a81b941 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -21,10 +21,16 @@ in stdenv.mkDerivation rec { }; patches = [ - # Fix compatibility with nixUnstable: https://github.com/msteen/nix-prefetch/pull/8 + # Fix compatibility with nixUnstable + # https://github.com/msteen/nix-prefetch/pull/9 (fetchpatch { - url = "https://github.com/msteen/nix-prefetch/commit/817a7695d98663386fa27a6c04d1617e0a83e1ab.patch"; - sha256 = "1zfgvafg30frwrh56k2wj4g76cljyjylm47ll60ms0yfx55spa7x"; + url = "https://github.com/msteen/nix-prefetch/commit/2722cda48ab3f4795105578599b29fc99518eff4.patch"; + sha256 = "037m388sbl72kyqnk86mw7lhjhj9gzfglw3ri398ncfmmkq8b7r4"; + }) + # https://github.com/msteen/nix-prefetch/pull/12 + (fetchpatch { + url = "https://github.com/msteen/nix-prefetch/commit/de96564e9f28df82bccd0584953094e7dbe87e20.patch"; + sha256 = "0mxai6w8cfs7k8wfbsrpg5hwkyb0fj143nm0v142am0ky8ahn0d9"; }) ]; |