BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #109450 from msteen/patch-2

Browse source 
nix-prefetch: 0.3.1 -> 0.4.0
This commit is contained in:
Sandro 2021-01-15 16:55:33 +01:00 committed by GitHub
commit f6a9596c4a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/tools/package-management/nix-prefetch/default.nix
View file

@ -1,39 +1,25 @@
{ lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc { lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc
, docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk
, gnugrep, gnused, jq, nix, fetchpatch }: , gnugrep, gnused, jq, nix }:
let let
binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ];
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "nix-prefetch"; pname = "nix-prefetch";
version = "0.3.1"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msteen"; owner = "msteen";
repo = "nix-prefetch"; repo = "nix-prefetch";
rev = version; rev = version;
sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4"; sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n";
# the stat call has to be in a subshell or we get the current date # the stat call has to be in a subshell or we get the current date
extraPostFetch = '' extraPostFetch = ''
echo $(stat -c %Y $out) > $out/.timestamp echo $(stat -c %Y $out) > $out/.timestamp
''; '';
}; };
patches = [
# Fix compatibility with nixUnstable
# https://github.com/msteen/nix-prefetch/pull/9
(fetchpatch {
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";
})
];
postPatch = '' postPatch = ''
lib=$out/lib/${pname} lib=$out/lib/${pname}