Merge branch 'master' of https://github.com/nixos/nixpkgs into tarball-closureinfo

2018-11-14 12:32:28 +08:00
parent 4259f7575e 4b5ffcb964
commit ceececbd04
1221 changed files with 32193 additions and 19482 deletions
@@ -63,7 +63,7 @@ with lib;
    # Tell the Nix evaluator to garbage collect more aggressively.
    # This is desirable in memory-constrained environments that don't
    # (yet) have swap set up.
-    environment.variables.GC_INITIAL_HEAP_SIZE = "100000";
+    environment.variables.GC_INITIAL_HEAP_SIZE = "1M";

    # Make the installer more likely to succeed in low memory
    # environments.  The kernel's overcommit heustistics bite us