From a4e13d2a1a88fc299f98ffa5dde3cf267a183f0d Mon Sep 17 00:00:00 2001 From: msteen Date: Fri, 15 Jan 2021 15:07:23 +0100 Subject: [PATCH] nix-prefetch: 0.3.1 -> 0.4.0 --- .../nix-prefetch/default.nix | 20 +++---------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/package-management/nix-prefetch/default.nix b/pkgs/tools/package-management/nix-prefetch/default.nix index af077e5f939c..320d41068ccb 100644 --- a/pkgs/tools/package-management/nix-prefetch/default.nix +++ b/pkgs/tools/package-management/nix-prefetch/default.nix @@ -1,39 +1,25 @@ { lib, stdenv, fetchFromGitHub, installShellFiles, makeWrapper, asciidoc , docbook_xml_dtd_45, git, docbook_xsl, libxml2, libxslt, coreutils, gawk -, gnugrep, gnused, jq, nix, fetchpatch }: +, gnugrep, gnused, jq, nix }: let binPath = lib.makeBinPath [ coreutils gawk git gnugrep gnused jq nix ]; in stdenv.mkDerivation rec { pname = "nix-prefetch"; - version = "0.3.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "msteen"; repo = "nix-prefetch"; rev = version; - sha256 = "15h6f743nn6sdq8l771sjxh92cyzqznkcs7szrc7nm066xvx8rd4"; + sha256 = "11792677zyi06jw641xi9aywwgh9002b8406w6qids212c14va6n"; # the stat call has to be in a subshell or we get the current date extraPostFetch = '' 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 = '' lib=$out/lib/${pname}