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
@@ -40,7 +40,7 @@ stdenv.mkDerivation {
      for reading from and writing to compressed files in these formats.
    '';
    license = "LGPL+linking exceptions";
-    platforms = ocaml.meta.platforms;
+    platforms = ocaml.meta.platforms or [];
    maintainers = [
      stdenv.lib.maintainers.z77z
    ];