Merge branch 'master' into staging

2016-01-18 09:48:49 +01:00
parent 85628148de c23b0856fd
commit 620c147cce
284 changed files with 11434 additions and 1452 deletions
@@ -95,7 +95,7 @@ in rec {
        stdenvSandboxProfile = binShClosure + libSystemProfile;
        extraSandboxProfile  = binShClosure + libSystemProfile;

-        extraAttrs = { inherit platform; };
+        extraAttrs = { inherit platform; parent = last; };
        overrides  = pkgs: (overrides pkgs) // { fetchurl = thisStdenv.fetchurlBoot; };
      };

@@ -290,6 +290,7 @@ in rec {
      inherit platform bootstrapTools;
      libc         = pkgs.darwin.Libsystem;
      shellPackage = pkgs.bash;
+      parent       = stage4;
    };

    allowedRequisites = (with pkgs; [