Branch: refs/heads/master
Home: https://github.com/NixOS/nixpkgs
Commit: ddeb0d2d6b2e71cf98ab50ab376f802cf29c7c22
https://github.com/NixOS/nixpkgs/commit/ddeb0d2d6b2e71cf98ab50ab376f802cf29c7c22
Author: John Ericson <[email protected]>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/default.nix
M pkgs/top-level/stdenv.nix
Log Message:
-----------
top-level: Stop exposing all stdenvs
Commit: 2df990967be3c21f074c56682f8fa47bdd7cba7b
https://github.com/NixOS/nixpkgs/commit/2df990967be3c21f074c56682f8fa47bdd7cba7b
Author: John Ericson <[email protected]>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
Log Message:
-----------
Move up `inherit` binding for consistency
Commit: 07a2b17cbf541c485e04f1a8ec98ffe8c24ac713
https://github.com/NixOS/nixpkgs/commit/07a2b17cbf541c485e04f1a8ec98ffe8c24ac713
Author: John Ericson <[email protected]>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M pkgs/top-level/default.nix
A pkgs/top-level/stage.nix
Log Message:
-----------
top-level: Split some of `pkgs/top-level/default.nix` to
`pkgs/top-level/stage.nix`
This is preparation for the latter just building a single stage, and the
former building a package set with the bootstrapped stdenv.
Commit: d240a0da1ab03ef8838553229b72b9b37a0ef3e7
https://github.com/NixOS/nixpkgs/commit/d240a0da1ab03ef8838553229b72b9b37a0ef3e7
Author: John Ericson <[email protected]>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/top-level/default.nix
M pkgs/top-level/stage.nix
R pkgs/top-level/stdenv.nix
Log Message:
-----------
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
Commit: 39753f5360134f1aab1a949260374a876c0983eb
https://github.com/NixOS/nixpkgs/commit/39753f5360134f1aab1a949260374a876c0983eb
Author: John Ericson <[email protected]>
Date: 2016-11-30 (Wed, 30 Nov 2016)
Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/top-level/default.nix
Log Message:
-----------
top-level: Close over fewer arguments for stdenv stages
This makes the flow of data easier to understand. There's little downside
because the args in question are already inspected by the stdenvs.
cross-compiling in particular is simpler because we don't need to worry
about overriding the config closed over by `allPackages`.
Commit: 05c12f147e932c990f4b026b9efe0b7a1985461e
https://github.com/NixOS/nixpkgs/commit/05c12f147e932c990f4b026b9efe0b7a1985461e
Author: John Ericson <[email protected]>
Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths:
M pkgs/top-level/default.nix
M pkgs/top-level/platforms.nix
Log Message:
-----------
top-level: Move default-choosing logic to top-level/platforms.nix
This mirrors stdenv/default.nix
Commit: a55d1ecc9050a50904a13e3a34535990b9e61ae3
https://github.com/NixOS/nixpkgs/commit/a55d1ecc9050a50904a13e3a34535990b9e61ae3
Author: John Ericson <[email protected]>
Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths:
M pkgs/top-level/default.nix
Log Message:
-----------
top-level: Document why `nixpkgsFun` doesn't close over inferred default
arguments
Commit: 4751d9e5ad124284dbd719d3a58f42d56f1b9514
https://github.com/NixOS/nixpkgs/commit/4751d9e5ad124284dbd719d3a58f42d56f1b9514
Author: John Ericson <[email protected]>
Date: 2016-12-01 (Thu, 01 Dec 2016)
Changed paths:
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/native/default.nix
M pkgs/top-level/stage.nix
Log Message:
-----------
top-level: turn the screw
- Non-cross stdenvs are honest and assert that `crossSystem` is null
- `crossSystem` is a mandatory argument to top-level/stage.nix, just like
`system` and `platform`
- Broken default arguments on stdenvs for testing are gone.
- All stdenvs (but little-used stdenvNix) take the same arguments for easy
testing.
Commit: 5c6234a7d3f0b430d7dc941dc1ab059c42729611
https://github.com/NixOS/nixpkgs/commit/5c6234a7d3f0b430d7dc941dc1ab059c42729611
Author: John Ericson <[email protected]>
Date: 2016-12-03 (Sat, 03 Dec 2016)
Changed paths:
M pkgs/stdenv/darwin/make-bootstrap-tools.nix
M pkgs/stdenv/linux/make-bootstrap-tools.nix
M pkgs/top-level/default.nix
Log Message:
-----------
top-level: Allow manually specifying a stdenv, and fix stdenv tests
- The darwin test can now force the use of the freshly-booted darwin stdenv
- The linux test now passes enough dummy arguments
This may make debugging harder, if so, check out #20889
Commit: e2ff3f160d2b308916ec86746675b09fbd445884
https://github.com/NixOS/nixpkgs/commit/e2ff3f160d2b308916ec86746675b09fbd445884
Author: John Ericson <[email protected]>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
M pkgs/stdenv/cross/default.nix
M pkgs/stdenv/custom/default.nix
M pkgs/stdenv/darwin/default.nix
M pkgs/stdenv/darwin/make-bootstrap-tools.nix
M pkgs/stdenv/default.nix
M pkgs/stdenv/freebsd/default.nix
M pkgs/stdenv/linux/default.nix
M pkgs/stdenv/linux/make-bootstrap-tools.nix
M pkgs/stdenv/native/default.nix
M pkgs/top-level/default.nix
M pkgs/top-level/platforms.nix
A pkgs/top-level/stage.nix
R pkgs/top-level/stdenv.nix
Log Message:
-----------
Merge pull request #15043 from Ericson2314/cross
top-level: simplify stdenv calling of top-level: fewer inferred and
re-inferring arguments
Compare: https://github.com/NixOS/nixpkgs/compare/e43a99ec9f71...e2ff3f160d2b_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
