summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2012-05-11 12:16:09 +0000
committerPeter Simons <simons@cryp.to>2012-05-11 12:16:09 +0000
commit7a4f8c97c55dc41325a854fb86f63fb1ea855644 (patch)
tree0f330424df362c1ce61fb511309225d35fde43f7 /pkgs/tools
parent63a9c0e5a102e1bfb71e822e0d62f1664d5ac7f8 (diff)
downloadnixpkgs-7a4f8c97c55dc41325a854fb86f63fb1ea855644.tar
nixpkgs-7a4f8c97c55dc41325a854fb86f63fb1ea855644.tar.gz
nixpkgs-7a4f8c97c55dc41325a854fb86f63fb1ea855644.tar.bz2
nixpkgs-7a4f8c97c55dc41325a854fb86f63fb1ea855644.tar.lz
nixpkgs-7a4f8c97c55dc41325a854fb86f63fb1ea855644.tar.xz
nixpkgs-7a4f8c97c55dc41325a854fb86f63fb1ea855644.tar.zst
nixpkgs-7a4f8c97c55dc41325a854fb86f63fb1ea855644.zip
pigz: updated to version 2.2.4
svn path=/nixpkgs/trunk/; revision=34058
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/compression/pigz/default.nix16
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index 83393a3fab7..117e110aac3 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -1,18 +1,19 @@
-{stdenv, fetchurl, zlib}:
+{ stdenv, fetchurl, zlib, utillinux }:
 
 let name = "pigz";
-    version = "2.1.6";
+    version = "2.2.4";
 in
 stdenv.mkDerivation {
   name = name + "-" + version;
 
   src = fetchurl {
     url = "http://www.zlib.net/${name}/${name}-${version}.tar.gz";
-    sha256 = "2ff1ba812407848787fe6719fde4436cb7c490e6d8c6e721f4e4309caa5f3640";
+    sha256 = "7e7967c47f66c07be97cbfa25c8816b72f9d35258466ea31eddc7666c914160e";
   };
 
-  buildInputs = [zlib];
-  doCheck = false;  # The makefile is broken in 2.1.5. Should be fixed upstream.
+  buildInputs = [zlib] ++ stdenv.lib.optional stdenv.isLinux utillinux;
+
+  doCheck = stdenv.isLinux;
   checkTarget = "tests";
   installPhase =
   ''
@@ -24,7 +25,10 @@ stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.zlib.net/pigz/;
+    homepage = "http://www.zlib.net/pigz/";
     description = "A parallel implementation of gzip for multi-core machines";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }