Merge master into staging

pkgs/tools/compression/bzip2/default.nix

@@ -35,11 +35,10 @@ stdenv.mkDerivation rec {
   configureFlags =
     stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
 
-  meta = {
-    homepage = http://www.bzip.org;
+  meta = with stdenv.lib; {
     description = "High-quality data compression program";
-
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.bsdOriginal;
+    platforms = platforms.all;
     maintainers = [];
   };
 }

pkgs/tools/compression/zopfli/default.nix

@@ -2,27 +2,17 @@
 
 stdenv.mkDerivation rec {
   name = "zopfli-${version}";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "zopfli";
     rev = name;
     name = "${name}-src";
-    sha256 = "1dclll3b5azy79jfb8vhb21drivi7vaay5iw0lzs4lrh6dgyvg6y";
+    sha256 = "1l551hx2p4qi0w9lk96qklbv6ll68gxbah07fhqx1ly28rv5wy9y";
   };
 
   patches = [
-    (fetchpatch {
-      sha256 = "07z6df1ahx40hnsrcs5mx3fc58rqv8fm0pvyc7gb7kc5mwwghvvp";
-      name = "Fix-invalid-read-outside-allocated-memory.patch";
-      url = "https://github.com/google/zopfli/commit/9429e20de3885c0e0d9beac23f703fce58461021.patch";
-    })
-    (fetchpatch {
-      sha256 = "07m8q5kipr84cg8i1l4zd22ai9bmdrblpdrsc96llg7cm51vqdqy";
-      name = "zopfli-bug-and-typo-fixes.patch";
-      url = "https://github.com/google/zopfli/commit/7190e08ecac2446c7c9157cfbdb7157b18912a92.patch";
-    })
     (fetchpatch {
       name = "zopfli-cmake.patch";
       url = "https://github.com/google/zopfli/commit/7554e4d34e7000b0595aa606e7d72357cf46ba86.patch";

pkgs/tools/compression/zstdmt/default.nix

@@ -1,36 +0,0 @@
-{ stdenv, fetchFromGitHub, zstd, lz4 }:
-
-stdenv.mkDerivation rec {
-  name = "zstdmt-${version}";
-  version = "0.3";
-
-  src = fetchFromGitHub {
-    sha256 = "17i44kjc612sbs7diim9ih007zp7z9zs3q3yacd6dzlqya5vsp0w";
-    rev = "v${version}";
-    repo = "zstdmt";
-    owner = "mcmilk";
-  };
-
-  setSourceRoot = ''
-    sourceRoot=$(echo */unix)
-  '';
-
-  buildInputs = [
-    zstd lz4
-  ];
-
-  makeFlags = [ "CC=cc" "zstdmt" "lz4mt" ];
-
-  installPhase = ''
-    mkdir -p $out/bin/
-    mv zstdmt lz4mt $out/bin/
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Multithreading Library for LZ4, LZ5 and ZStandard";
-    homepage = https://github.com/mcmilk/zstdmt;
-    license = with licenses; [ bsd2 ];
-
-    platforms = platforms.unix;
-  };
-}