summary refs log tree commit diff
path: root/pkgs/stdenv/custom
diff options
context:
space:
mode:
authorJohn Ericson <Ericson2314@Yahoo.com>2016-11-27 12:35:58 -0800
committerJohn Ericson <jericson@galois.com>2016-11-30 19:10:59 -0500
commitd240a0da1ab03ef8838553229b72b9b37a0ef3e7 (patch)
treea1a6eeec3d31abe66228d2c14534d50dfc95e882 /pkgs/stdenv/custom
parent07a2b17cbf541c485e04f1a8ec98ffe8c24ac713 (diff)
downloadnixpkgs-d240a0da1ab03ef8838553229b72b9b37a0ef3e7.tar
nixpkgs-d240a0da1ab03ef8838553229b72b9b37a0ef3e7.tar.gz
nixpkgs-d240a0da1ab03ef8838553229b72b9b37a0ef3e7.tar.bz2
nixpkgs-d240a0da1ab03ef8838553229b72b9b37a0ef3e7.tar.lz
nixpkgs-d240a0da1ab03ef8838553229b72b9b37a0ef3e7.tar.xz
nixpkgs-d240a0da1ab03ef8838553229b72b9b37a0ef3e7.tar.zst
nixpkgs-d240a0da1ab03ef8838553229b72b9b37a0ef3e7.zip
top-level: Remove cycles: stdenv calls in top-level but not vice versa
This commit changes the dependencies of stdenv, and clean-up the stdenv
story by removing the `defaultStdenv` attribute as well as the `bootStdenv`
parameter.

Before, the final bootstrapping stage's stdenv was provided by
all-packages, which was iterating multiple times over the
top-level/default.nix expression, and non-final bootstrapping stages'
stdenvs were explicitly specified with the `bootStdenv` parameter.

Now, all stages' stdenvs are specified with the `stdenv` parameter.
For non-final bootstrapping stages, this is a small change---basically just
rename the parameter.
For the final stage, top-level/default.nix takes the chosen stdenv and
makes the final stage with it.

`allPackages` is used to make all bootstrapping stages, final and
non-final alike. It's basically the expression of `stage.nix` (along with a
few partially-applied default arguments)

Note, the make-bootstrap-tools scripts are temporarily broken
Diffstat (limited to 'pkgs/stdenv/custom')
-rw-r--r--pkgs/stdenv/custom/default.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index 4c14d6411f1..e8f203d69cf 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -10,7 +10,7 @@ rec {
     inherit system platform crossSystem config;
     # It's OK to change the built-time dependencies
     allowCustomOverrides = true;
-    bootStdenv = vanillaStdenv;
+    stdenv = vanillaStdenv;
   };
 
   stdenvCustom = config.replaceStdenv { pkgs = buildPackages; };