diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2017-01-26 16:49:41 +0100 |
commit | 6973c7739ea1581595931e8c8b3b76241083b2df (patch) | |
tree | f56826492e0e260f24aeeedd2e47d36785ba3519 /pkgs/top-level/default.nix | |
parent | 5dacc53af3f4537fab693952b5f13b6cafcde6d4 (diff) | |
parent | bca9bcb3c3dd3b2e46f8e07db9a8326de01697c7 (diff) | |
download | nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.gz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.bz2 nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.lz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.xz nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.tar.zst nixlib-6973c7739ea1581595931e8c8b3b76241083b2df.zip |
Merge branch 'master' into staging
There were some larger rebuilds because of security.
Diffstat (limited to 'pkgs/top-level/default.nix')
-rw-r--r-- | pkgs/top-level/default.nix | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index a146dad63bc8..3c67d316f7c8 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -83,7 +83,24 @@ in let boot = import ../stdenv/booter.nix { inherit lib allPackages; }; stages = stdenvStages { - inherit lib system platform crossSystem config overlays; + # One would think that `localSystem` and `crossSystem` overlap horribly with + # the three `*Platforms` (`buildPlatform`, `hostPlatform,` and + # `targetPlatform`; see `stage.nix` or the manual). Actually, those + # identifiers I, @Ericson2314, purposefully not used here to draw a subtle + # but important distinction: + # + # While the granularity of having 3 platforms is necessary to properly + # *build* packages, it is overkill for specifying the user's *intent* when + # making a build plan or package set. A simple "build vs deploy" dichotomy + # is adequate: the "sliding window" principle described in the manual shows + # how to interpolate between the these two "end points" to get the 3 + # platform triple for each bootstrapping stage. + # + # Also, less philosophically but quite practically, `crossSystem` should be + # null when one doesn't want to cross-compile, while the `*Platform`s are + # always non-null. `localSystem` is always non-null. + localSystem = { inherit system platform; }; + inherit lib crossSystem config overlays; }; pkgs = boot stages; |