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

This commit is contained in:
Robin Gloster
2016-03-28 15:16:29 +00:00
628 changed files with 60034 additions and 8180 deletions

View File

@@ -116,7 +116,7 @@ let
in rec {
perl = perl520;
perl = perl522;
perl520 = common {
version = "5.20.3";