From 2c81bc115cde311de88af3164043995d14ceb72b Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Fri, 9 Mar 2018 08:48:08 -0800
Subject: [PATCH 1/2] pigz: 2.3.4 -> 2.4

Semi-automatic update. These checks were done:

- built on NixOS
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -h` got 0 exit code
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --help` got 0 exit code
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz -V` and found version 2.4
- ran `/nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4/bin/pigz --version` and found version 2.4
- found 2.4 with grep in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4
- found 2.4 in filename of file in /nix/store/j8izqqx03n8aqqab57sybxkv483xfz05-pigz-2.4
---
 pkgs/tools/compression/pigz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 76704c254bd..3c2f7f81c1c 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, zlib, utillinux }:
 
 let name = "pigz";
-    version = "2.3.4";
+    version = "2.4";
 in
 stdenv.mkDerivation {
   name = name + "-" + version;
 
   src = fetchurl {
     url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
-    sha256 = "16lgbjzzfx0k4a1znsw8kq3lnkx17gw93zq2sn01sny11fj1y0vg";
+    sha256 = "0wsgw5vwl23jrnpsvd8v3xcp5k4waw5mk0164fynjhkv58i1dy54";
   };
 
   enableParallelBuilding = true;

From 11db1186234578b094abfc936d15b8edc889988f Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Wed, 11 Apr 2018 00:16:17 -0500
Subject: [PATCH 2/2] pigz: fix on darwin

---
 pkgs/tools/compression/pigz/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 3c2f7f81c1c..732aa691d4a 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation {
 
   buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
 
+  makeFlags = [ "CC=cc" ];
+
   doCheck = stdenv.isLinux;
   checkTarget = "tests";
   installPhase =