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

This commit is contained in:
Robin Gloster
2016-07-31 20:51:34 +00:00
701 changed files with 12952 additions and 15151 deletions

View File

@@ -301,13 +301,13 @@ let
in {
php55 = generic {
version = "5.5.37";
sha256 = "122xj115fjl6rqlxqqjzvh16fbm801yqcmfh9hn7zwfa8sz0wf6j";
version = "5.5.38";
sha256 = "0f1y76whg6yx9a18mh97f8yq8lb64ri1f0zfr9la9374nbmq2g27";
};
php56 = generic {
version = "5.6.23";
sha256 = "1isq6pym20nwsf2j1jdz321vck9xd6g86q2b13vycxyjjq42ikgs";
version = "5.6.24";
sha256 = "1iiqmjgxr10ci69f33fzyhplp06km6ybgqmxr1g142pdqdz628xz";
};
php70 = generic {