Merge remote-tracking branch 'origin/master' into hardened-stdenv

5 files changed, 26 insertions, 93 deletions

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index a165ab2b157b..f46ddd1c5369 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,96 +1,33 @@
-{ stdenv, fetchurl, libtool, autoconf, automake, gnum4, linkStatic ? false }:
+{ stdenv, fetchurl
+, linkStatic ? (stdenv.system == "i686-cygwin")
+}:
 
-let
-  version = "1.0.6";
-
-  sharedLibrary = !(stdenv ? isStatic)
-               && stdenv.system != "i686-cygwin" && !linkStatic;
-
-  darwinMakefile = fetchurl {
-    url    = "https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib";
-    sha256 = "1lq6g98kfpwv2f7wn4sk8hzcf87dwf92gviq0b4691f5bvc9mawz";
-  };
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bzip2-${version}";
+  version = "1.0.6.0.1";
 
+  /* We use versions patched to use autotools style properly,
+      saving lots of trouble. */
   src = fetchurl {
-    url = "http://www.bzip.org/${version}/bzip2-${version}.tar.gz";
-    sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152";
-  };
-
-  crossAttrs = {
-    buildInputs = [ libtool autoconf automake gnum4 ];
-    patches = [
-      # original upstream for the autoconf patch is here:
-      # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch
-      # but we get the mingw-builds version of the patch, which fixes
-      # a few more issues
-      (fetchurl {
-        url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch";
-        sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp";
-      })
-    ];
-    patchFlags = "-p0";
-    postPatch = ''
-      sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
-    '';
-    preConfigure = "sh ./autogen.sh";
-    # clear native hooks that are not needed with autoconf
-    preBuild = "";
-    preInstall = "";
-    postInstall = "";
+    urls = map
+      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz")
+      [
+        "http://ftp.uni-kl.de/pub/linux/suse"
+        "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse"
+        "ftp://ftp.mplayerhq.hu/pub/linux/suse"
+        "http://ftp.suse.com/pub" # the original patched version but slow
+      ];
+    sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
   };
 
-  outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out";
-
-  preBuild = stdenv.lib.optionalString sharedLibrary ''
-    make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"}
-  '';
-
-  preInstall = stdenv.lib.optionalString sharedLibrary (if !stdenv.isDarwin then ''
-    mkdir -p $out/lib
-    mv libbz2.so* $out/lib
-    ( cd $out/lib &&
-      ln -s libbz2.so.1.0.? libbz2.so &&
-      ln -s libbz2.so.1.0.? libbz2.so.1
-    )
-  '' else ''
-    mkdir -p $out/lib
-    mv libbz2.*.dylib $out/lib
-    ( cd $out/lib &&
-      ln -s libbz2.1.0.?.dylib libbz2.dylib &&
-      ln -s libbz2.1.0.?.dylib libbz2.1.dylib
-    )
-  '');
-
-  installFlags = [ "PREFIX=$(bin)" ];
-
-  postInstall = ''
-    rm $bin/bin/bunzip2* $bin/bin/bzcat*
-    ln -s bzip2 $bin/bin/bunzip2
-    ln -s bzip2 $bin/bin/bzcat
-
-    mkdir "$static"
-    mv "$bin/lib" "$static/"
-  '';
-
   postPatch = ''
-    substituteInPlace Makefile --replace CC=gcc CC=cc
-    substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    cp ${darwinMakefile} Makefile-libbz2_dylib
-    substituteInPlace Makefile-libbz2_dylib \
-      --replace "CC=gcc" "CC=cc" \
-      --replace "PREFIX=/usr" "PREFIX=$out"
-  '';
-
-  preConfigure = ''
-    substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'
+    sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
   '';
 
-  makeFlags = stdenv.lib.optional linkStatic "LDFLAGS=-static";
+  outputs = [ "dev" "bin" "out" "man" ];
 
-  inherit linkStatic;
+  configureFlags =
+    stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
 
   meta = {
     homepage = "http://www.bzip.org";
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index cf09ec8bf739..31a67b1baf94 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gzip-${version}";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchurl {
     url = "mirror://gnu/gzip/${name}.tar.xz";
-    sha256 = "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv";
+    sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz";
   };
 
   outputs = [ "out" "man" "info" ];
diff --git a/pkgs/tools/compression/lzip/default.nix b/pkgs/tools/compression/lzip/default.nix
index b3d407c98ef1..b0dfd79b9bac 100644
--- a/pkgs/tools/compression/lzip/default.nix
+++ b/pkgs/tools/compression/lzip/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, texinfo }:
 
 stdenv.mkDerivation rec {
-  name = "lzip-1.16";
+  name = "lzip-1.17";
 
   buildInputs = [ texinfo ];
 
   src = fetchurl {
     url = "mirror://savannah/lzip/${name}.tar.gz";
-    sha256 = "0l9724rw1l3hg2ldr3n7ihqich4m9nc6y7l302bvdj4jmxdw530j";
+    sha256 = "0lh3x964jjldx3piax6c2qzlhfiir5i6rnrcn8ri44rk19g8ahwl";
   };
 
   configureFlags = "CPPFLAGS=-DNDEBUG CFLAGS=-O3 CXXFLAGS=-O3";
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.nongnu.org/lzip/lzip.html";
     description = "a lossless data compressor based on the LZMA algorithm";
     license = stdenv.lib.licenses.gpl3Plus;
-
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/compression/pigz/default.nix b/pkgs/tools/compression/pigz/default.nix
index df6b21956d91..38e032494fbe 100644
--- a/pkgs/tools/compression/pigz/default.nix
+++ b/pkgs/tools/compression/pigz/default.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://www.zlib.net/pigz/";
     description = "A parallel implementation of gzip for multi-core machines";
-
     hydraPlatforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 45c91d46a2e8..382ded98e537 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "zstd-${version}";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
-    sha256 = "1r1l4pak289bjnkak2yrw65yhxfvqcmdsh10c1k0hi0wm7k3qcbw";
+    sha256 = "19pp2sjrv8qwzfc9c1mf0idhkicjhr41fsc9d1fyncc34f9riavl";
     rev = "v${version}";
     repo = "zstd";
     owner = "Cyan4973";