Merge branch 'master' into closure-size

Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.

pkgs/tools/archivers/innoextract/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:
 
 stdenv.mkDerivation rec {
-  name = "innoextract-1.5";
+  name = "innoextract-1.6";
 
   src = fetchurl {
     url = "http://constexpr.org/innoextract/files/${name}.tar.gz";
-    sha256 = "1ks8z8glak63xvqlv7dnmlzkjrwsn81lhybmai2mja6g5jclwngj";
+    sha256 = "0gh3q643l8qlwla030cmf3qdcdr85ixjygkb7j4dbm7zbwa3yik6";
   };
 
   buildInputs = [ python doxygen lzma boost ];

pkgs/tools/archivers/unrar/default.nix

@@ -9,6 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p";
   };
 
+  postPatch = ''
+    sed 's/^CXX=g++/#CXX/' -i makefile
+  '';
+
   buildPhase = ''
     make unrar
     make clean

pkgs/tools/archivers/zpaq/default.nix

@@ -1,23 +1,14 @@
-{ stdenv, fetchurl, unzip }:
+{ stdenv, fetchurl, perl, unzip }:
 let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="705";
+    version="707";
     name="${baseName}-${version}";
-    hash="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
-    url="http://mattmahoney.net/dc/zpaq705.zip";
-    sha256="0d1knq4f6693nvbwjx4wznb45hm4zyn4k88xvhynyk0dcbiy7ayq";
+    hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
+    url="http://mattmahoney.net/dc/zpaq707.zip";
+    sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
   };
-  isUnix = with stdenv; isLinux || isGNU || isDarwin || isFreeBSD || isOpenBSD;
-  isx86 = stdenv.isi686 || stdenv.isx86_64;
-  compileFlags = with stdenv; ""
-    + (lib.optionalString (isUnix) " -Dunix -pthread")
-    + (lib.optionalString (isi686) " -march=i686")
-    + (lib.optionalString (isx86_64) " -march=nocona")
-    + (lib.optionalString (!isx86) " -DNOJIT")
-    + " -O3 -mtune=generic -DNDEBUG"
-    ;
 in
 stdenv.mkDerivation {
   inherit (s) name version;
@@ -28,20 +19,24 @@ stdenv.mkDerivation {
 
   sourceRoot = ".";
 
+  nativeBuildInputs = [ perl /* for pod2man */ ];
   buildInputs = [ unzip ];
 
-  buildPhase = ''
-    g++ ${compileFlags} -fPIC --shared libzpaq.cpp -o libzpaq.so
-    g++ ${compileFlags} -L. -L"$out/lib" -lzpaq zpaq.cpp -o zpaq
+  preBuild = let
+    CPPFLAGS = with stdenv; ""
+      + (lib.optionalString (!isi686 && !isx86_64) "-DNOJIT ")
+      + "-Dunix";
+    CXXFLAGS = with stdenv; ""
+      + (lib.optionalString (isi686) "-march=i686 ")
+      + (lib.optionalString (isx86_64) "-march=nocona ")
+      + "-O3 -mtune=generic -DNDEBUG";
+  in ''
+    buildFlagsArray=( "CPPFLAGS=${CPPFLAGS}" "CXXFLAGS=${CXXFLAGS}" )
   '';
 
-  installPhase = ''
-    mkdir -p "$out"/{bin,include,lib,share/doc/zpaq}
-    cp libzpaq.so "$out/lib"
-    cp zpaq "$out/bin"
-    cp libzpaq.h "$out/include"
-    cp readme.txt "$out/share/doc/zpaq"
-  '';
+  enableParallelBuilding = true;
+
+  installFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
     inherit (s) version;