diff options
| author | Nick Cao <nickcao@nichi.co> | 2023-06-07 20:06:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-07 20:06:09 -0600 |
| commit | 5edfd72f971e63867fb3e0093317d6996c6b556b (patch) | |
| tree | b00a73f6a9d8526d8443eca0ac590f15b4b3e485 | |
| parent | Merge pull request #236555 from NixOS/backport-191558-to-release-23.05 (diff) | |
| parent | Update pkgs/tools/compression/pigz/default.nix (diff) | |
| download | nixpkgs-5edfd72f971e63867fb3e0093317d6996c6b556b.tar.gz | |
Merge pull request #236283 from NixOS/backport-223504-to-release-23.05
[Backport release-23.05] pigz: 2.6 -> 2.7
| -rw-r--r-- | pkgs/tools/compression/pigz/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index e7a1df5fd6cd..3faab62a1e8e 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}"; + 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; |