git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #109450 from msteen/patch-2

nix-prefetch: 0.3.1 -> 0.4.0

commitf6a9596c4ac3249a4126ff05c95ff2a036510194 authorSandro <sandro.jaeckel@gmail.com> dateFri 15 Jan 2021, 16:55 (6 years ago) parent9faf158a4e13d2
1 file changed+3−17
pkgs/tools/package-management/nix-prefetch/default.nix+3−17
pkgs/tools/package-management/nix-prefetch/default.nix+3−17
@@ -1,39 +1,25 @@
11{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc
22, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
3−, gnugrep, gnused, jq, nix, fetchpatch }:
3+, gnugrep, gnused, jq, nix }:
44
55let
66 binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
77
88in stdenv.mkDerivation rec {
99 pname = "nix-prefetch";
10− version = "0.3.1";
10+ version = "0.4.0";
1111
1212 src = fetchFromGitHub {
1313 owner = "msteen";
1414 repo = "nix-prefetch";
1515 rev = version;
16− sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4";
16+ sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n";
1717 # the stat call has to be in a subshell or we get the current date
1818 extraPostFetch = ''
1919 echo $(stat -c %Y $out) > $out/.timestamp
2020 '';
2121 };
2222
23− patches = [
24− # Fix compatibility with nixUnstable
25− # https://github.com/msteen/nix-prefetch/pull/9
26− (fetchpatch {
27− url = "https://github.com/msteen/nix-prefetch/commit/2722cda48ab3f4795105578599b29fc99518eff4.patch";
28− sha256 = "037m388sbl72kyqnk86mw7lhjhj9gzfglw3ri398ncfmmkq8b7r4";
29− })
30− # https://github.com/msteen/nix-prefetch/pull/12
31− (fetchpatch {
32− url = "https://github.com/msteen/nix-prefetch/commit/de96564e9f28df82bccd0584953094e7dbe87e20.patch";
33− sha256 = "0mxai6w8cfs7k8wfbsrpg5hwkyb0fj143nm0v142am0ky8ahn0d9";
34− })
35− ];
36−
3723 postPatch = ''
3824 lib=$out/lib/${pname}
3925