Merge branch 'master' into closure-size

Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs

pkgs/tools/archivers/p7zip/default.nix

@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 let
-  version = "9.38";
+  version = "15.14.1";
 in
 stdenv.mkDerivation rec {
   name = "p7zip-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/p7zip/p7zip_${version}_src_all.tar.bz2";
-    sha256 = "0mxribb9a3lz3bifz6002hg7vyy8h9piinypian533hw8qvswfx7";
+    sha256 = "1m15iwglyjpiw82m7dbpykz8s55imch34w20w09l34116vdb97b9";
   };
 
   preConfigure = ''

pkgs/tools/archivers/zpaq/default.nix

@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="zpaq";
-    version="707";
+    version="709";
     name="${baseName}-${version}";
-    hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
-    url="http://mattmahoney.net/dc/zpaq707.zip";
-    sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
+    hash="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh";
+    url="http://mattmahoney.net/dc/zpaq709.zip";
+    sha256="105lwd9cckmmhg5v9ddf873wzbkdsl7wfqyd30kn0q78sg3c0avh";
   };
 in
 stdenv.mkDerivation {