bzip2: 1.0.6 -> 1.0.8

pkgs/tools/compression/bzip2/1.0.6.nix

@@ -0,0 +1,53 @@
+{ stdenv, fetchurl
+, linkStatic ? (stdenv.hostPlatform.system == "i686-cygwin")
+, autoreconfHook
+}:
+
+# Note: this package is used for bootstrapping fetchurl, and thus
+# cannot use fetchpatch! All mutable patches (generated by GitHub or
+# cgit) that are needed here should be included directly in Nixpkgs as
+# files.
+
+stdenv.mkDerivation rec {
+  pname = "bzip2";
+  version = "1.0.6.0.1";
+
+  /* We use versions patched to use autotools style properly,
+      saving lots of trouble. */
+  src = fetchurl {
+    urls = map
+      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.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";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  patches = [
+    ./CVE-2016-3189.patch
+    ./cve-2019-12900.patch
+  ];
+
+  postPatch = ''
+    sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
+  '';
+
+  outputs = [ "bin" "dev" "out" "man" ];
+
+  configureFlags =
+    stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "High-quality data compression program";
+    license = licenses.bsdOriginal;
+    platforms = platforms.all;
+    maintainers = [];
+  };
+}

pkgs/tools/compression/bzip2/default.nix

@@ -1,6 +1,5 @@
-{ stdenv, fetchurl
+{ stdenv, lib, fetchurl
 , linkStatic ? (stdenv.hostPlatform.system == "i686-cygwin")
-, autoreconfHook
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -10,37 +9,34 @@
 
 stdenv.mkDerivation rec {
   pname = "bzip2";
-  version = "1.0.6.0.1";
+  version = "1.0.8";
 
-  /* We use versions patched to use autotools style properly,
-      saving lots of trouble. */
   src = fetchurl {
-    urls = map
-      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${pname}-${version}.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";
+    url = "https://sourceware.org/pub/bzip2/${pname}-${version}.tar.gz";
+    sha256 = "0s92986cv0p692icqlw1j42y9nld8zd83qwhzbqd61p1dqbh6nmb";
   };
 
-  nativeBuildInputs = [ autoreconfHook ];
+  outputs = [ "bin" "dev" "out" "man" ] ++ lib.optionals linkStatic [ "static" ];
 
-  patches = [
-    ./CVE-2016-3189.patch
-    ./cve-2019-12900.patch
-  ];
-
-  postPatch = ''
-    sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
+  buildPhase = ''
+    cc=${cc:-$CC}
+    make CC=cc
+    make CC=cc -f Makefile-libbz2_so
   '';
 
-  outputs = [ "bin" "dev" "out" "man" ];
-
-  configureFlags =
-    stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    moveToOutput bin $bin
+    ln -s libbz2.so.1.0 libbz2.so.1
+    ln -s libbz2.so.1   libbz2.so
+    mv libbz2.so* $out/lib
+  '' + (if linkStatic  then ''
+    mkdir -p $static/lib
+    mv $out/lib/libz2.a $static/lib/libz2.a
+  '' else ''
+    rm $out/lib/libbz2.a
+  '');
 
   enableParallelBuilding = true;
 

pkgs/top-level/all-packages.nix

@@ -2571,7 +2571,10 @@ in
     inherit (llvmPackages) openmp;
   };
 
-  bzip2 = callPackage ../tools/compression/bzip2 { };
+  bzip2 = if stdenv.isDarwin then
+      callPackage ../tools/compression/bzip2/1.0.6.nix { }
+    else
+      callPackage ../tools/compression/bzip2 { };
 
   cabextract = callPackage ../tools/archivers/cabextract { };