summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Bley <claudio.bley@gmail.com>2023-03-28 08:11:07 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-06-06 13:25:17 +0000
commit3645e65c65a1b240ed04818cf1e9cb4b8f00777a (patch)
treefad84f75b94ae67919881a0ba923d5d6f2345006
parentMerge pull request #236280 from NixOS/backport-236258-to-release-23.05 (diff)
downloadnixpkgs-3645e65c65a1b240ed04818cf1e9cb4b8f00777a.tar.gz
pigz: 2.6 -> 2.7
(cherry picked from commit edcb9dfee6e9282aa3b7c2186e037af2676377ea)
-rw-r--r--pkgs/tools/compression/pigz/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index e7a1df5fd6cd..650db3761246 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,16 +1,24 @@
-{ lib, stdenv, fetchFromGitHub, zlib, util-linux }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, util-linux }:
stdenv.mkDerivation rec {
pname = "pigz";
- version = "2.6";
+ version = "2.7";
src = fetchFromGitHub {
owner = "madler";
repo = "${pname}";
rev = "refs/tags/v${version}";
- sha256 = "146qkmzi199xwmmf6bllanqfyl702fm1rnad8cd5r5yyrp5ks115";
+ sha256 = "sha256-RYp3vRwlI6S/lcib+3t7qLYFWv11GUnj1Cmxm9eaVro=";
};
+ patches = [
+ # needed to build the pigzn test binary
+ (fetchpatch {
+ url = "https://github.com/madler/pigz/commit/67fd6e436f4f479aead529a719e24d6864cf1dfa.patch";
+ sha256 = "sha256-FkzLYob/WIVIB7eh03cdzpLy6SzoHLqEMsWyHdMTjbU=";
+ })
+ ];
+
enableParallelBuilding = true;
buildInputs = [ zlib ] ++ lib.optional stdenv.isLinux util-linux;