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.
2016-04-01 10:06:01 +02:00
parent c643ccaa8c a26357eefe
commit ab15a62c68
1108 changed files with 76254 additions and 11297 deletions
@@ -116,7 +116,7 @@ let

 in rec {

-  perl = perl520;
+  perl = perl522;

  perl520 = common {
    version = "5.20.3";