Merge commit staging+systemd into closure-size

Many non-conflict problems weren't (fully) resolved in this commit yet.

7 files changed, 56 insertions, 20 deletions

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index 2f3799622525..aad4eb481c93 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -12,6 +12,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ xz.bin ];
 
+  preConfigure = if stdenv.isCygwin then ''
+    sed -i lib/fpending.h -e 's,include <stdio_ext.h>,,'
+  '' else null;
+
   # In stdenv-linux, prevent a dependency on bootstrap-tools.
   makeFlags = "SHELL=/bin/sh GREP=grep";
 
diff --git a/pkgs/tools/compression/lbzip2/default.nix b/pkgs/tools/compression/lbzip2/default.nix
index e1adefd2167d..44f6a0bb7a45 100644
--- a/pkgs/tools/compression/lbzip2/default.nix
+++ b/pkgs/tools/compression/lbzip2/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     homepage = http://lbzip2.org/;
     description = "parallel bzip2 compression utility";
     license = licenses.gpl3;
-    maintainers = maintainers.abbradar;
+    maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index d27ada615c71..1fefc1dcc83a 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, valgrind }:
 
-let version = "128"; in
+let version = "131"; in
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "00jrnic2jddj81av8jjipf4rdkx6x6cdf8zpsz3mp5kbmqzd0h9a";
+    sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
     rev = "r${version}";
     repo = "lz4";
     owner = "Cyan4973";
@@ -17,9 +17,8 @@ stdenv.mkDerivation rec {
 
   makeFlags = "PREFIX=$(out)";
 
-  doCheck = true;
+  doCheck = false; # tests take a very long time
   checkTarget = "test";
-  checkFlags = "-j1"; # required since version 128
 
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";
diff --git a/pkgs/tools/compression/lzop/default.nix b/pkgs/tools/compression/lzop/default.nix
index 383b7a0e079c..7d49bde68c11 100644
--- a/pkgs/tools/compression/lzop/default.nix
+++ b/pkgs/tools/compression/lzop/default.nix
@@ -9,9 +9,9 @@ stdenv.mkDerivation {
 
   buildInputs = [ lzo ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.lzop.org;
     description = "Fast file compressor";
-    license = "GPL";
+    license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index fcc3b373fd10..407b14a60999 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -1,30 +1,30 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
-let version = "3.0.9"; in
-stdenv.mkDerivation rec {
+let version = "3.0.10"; in
+stdenv.mkDerivation {
   name = "xdelta-${version}";
   
   src = fetchFromGitHub {
-    sha256 = "1pd7dyq44dbggmwkrr8251anqsf2an67zbvrk4vfnc92jkmjp17i";
+    sha256 = "0wwxdr01var3f90iwi1lgjpsa4y549g850hyyix5cm0qk67ck4rg";
     rev = "v${version}";
     repo = "xdelta-devel";
     owner = "jmacd";
   };
 
-  buildInputs = [ autoreconfHook ];
+  nativeBuildInputs = [ autoreconfHook ];
 
   postPatch = ''
     cd xdelta3
-  '' + stdenv.lib.optionalString doCheck ''
-    mkdir tmp
-    substituteInPlace testing/file.h --replace /tmp tmp
-    substituteInPlace xdelta3-test.h --replace /tmp $PWD/tmp
   '';
 
   enableParallelBuilding = true;
 
   doCheck = true;
   checkPhase = ''
+    mkdir $PWD/tmp
+    for i in testing/file.h xdelta3-test.h; do
+      substituteInPlace $i --replace /tmp $PWD/tmp
+    done
     ./xdelta3regtest
   '';
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     inherit version;
     description = "Binary differential compression in VCDIFF (RFC 3284) format";
     homepage = http://xdelta.org/;
-    license = with licenses; gpl2Plus;
+    license = licenses.gpl2Plus;
     platforms = with platforms; linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/tools/compression/xz/default.nix b/pkgs/tools/compression/xz/default.nix
index 2219417ea4af..44b0bbb2d82b 100644
--- a/pkgs/tools/compression/xz/default.nix
+++ b/pkgs/tools/compression/xz/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   postInstall = "rm -rf $out/share/doc";
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tukaani.org/xz/;
     description = "XZ, general-purpose data compression software, successor of LZMA";
 
@@ -35,8 +35,8 @@ stdenv.mkDerivation rec {
          bzip2.
       '';
 
-    license = [ "GPLv2+" "LGPLv2.1+" ];
-    maintainers = with stdenv.lib.maintainers; [ sander ];
-    platforms = stdenv.lib.platforms.all;
+    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ sander ];
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
new file mode 100644
index 000000000000..354afb8d1787
--- /dev/null
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "zopfli-${version}";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "zopfli";
+    rev = name;
+    name = "${name}-src";
+    sha256 = "0r2k3md24y5laslzsph7kh4synm5az4ppv64idrvjk5yh2qwwb62";
+  };
+
+  installPhase = ''
+    install -D zopfli $out/bin/zopfli
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/google/zopfli;
+    description = "A compression tool to perform very good, but slow, deflate or zlib compression";
+    longDescription =
+      ''Zopfli Compression Algorithm is a compression library programmed
+        in C to perform very good, but slow, deflate or zlib compression.
+
+        This library can only compress, not decompress. Existing zlib or
+        deflate libraries can decompress the data.
+      '';
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.asl20;
+    maintainers = with maintainers; [ bobvanderlinden ];
+  };
+}