From fcb07bc61aa8ec6ef43dae9bfc5a424310b9bd7c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 2 Sep 2023 08:15:39 +0100 Subject: [PATCH] pigz: 2.7 -> 2.8 Changes: https://github.com/madler/pigz/compare/v2.7...v2.8i Most notable change is glib-1.3 compatibility. --- pkgs/tools/compression/pigz/default.nix | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix index 3faab62a1e8e..79363eecade3 100644 --- a/pkgs/tools/compression/pigz/default.nix +++ b/pkgs/tools/compression/pigz/default.nix @@ -1,24 +1,16 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, zlib, util-linux }: +{ lib, stdenv, fetchFromGitHub, zlib, util-linux }: stdenv.mkDerivation rec { pname = "pigz"; - version = "2.7"; + version = "2.8"; src = fetchFromGitHub { owner = "madler"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-RYp3vRwlI6S/lcib+3t7qLYFWv11GUnj1Cmxm9eaVro="; + sha256 = "sha256-PzdxyO4mCg2jE/oBk1MH+NUdWM95wIIIbncBg71BkmQ="; }; - 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; @@ -28,11 +20,15 @@ stdenv.mkDerivation rec { doCheck = stdenv.isLinux; checkTarget = "tests"; installPhase = '' + runHook preInstall + install -Dm755 pigz "$out/bin/pigz" ln -s pigz "$out/bin/unpigz" install -Dm755 pigz.1 "$out/share/man/man1/pigz.1" ln -s pigz.1 "$out/share/man/man1/unpigz.1" install -Dm755 pigz.pdf "$out/share/doc/pigz/pigz.pdf" + + runHook postInstall ''; meta = with lib; {