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

This commit is contained in:
Robin Gloster
2016-04-07 21:52:26 +00:00
198 changed files with 32102 additions and 27617 deletions
+4 -4
View File
@@ -3,11 +3,11 @@ let
s = # Generated upstream information
rec {
baseName="zpaq";
version="707";
version="708";
name="${baseName}-${version}";
hash="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
url="http://mattmahoney.net/dc/zpaq707.zip";
sha256="0xbisphv318a33px47vriirdp2jhf99y6hx6gcbfhbhkaqpggjg3";
hash="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
url="http://mattmahoney.net/dc/zpaq708.zip";
sha256="15qvsr7mmb77n1gfyr2h1mkql6m8a313z2f1j9qv50qiivw2v4i6";
};
in
stdenv.mkDerivation {