Commit Graph

15 Commits

Author SHA1 Message Date
Nicolas B. Pierron
5ae7356d42 Replace the merge operators by the fix' and extends functions. 2016-03-20 19:23:08 +00:00
Nicolas B. Pierron
1bcefcdf5c Under pkgsWithOverrides, replace the last uses of pkgs by the corresponding argument. 2016-03-20 19:18:33 +00:00
Nicolas B. Pierron
800766fb0b Change the customOverrides to use the stdenvOverrides instead of the original package set. 2016-03-20 19:10:48 +00:00
Nicolas B. Pierron
21b8007bcf Move the customOverrides after the stdenvOverrides.
This change is not backward compatible, in the sense that this allow you to
override the packages which used to be overriden by the last stage of
stdenv.  Note, this does not mean that these packages would be used by
stdenv.
2016-03-20 19:04:15 +00:00
Nicolas B. Pierron
9e8c5208a1 Add bootStdenv condition around the overrider.
This condition used to be implicit in the sense that the stdenvOverrides
uses pkgs_6, instead of pkgs_7 as its super set, and also that each stage of
the compiler is build again the bootstrap packages of the previous stage,
thus overriden by the stdenv.override function.
2016-03-20 19:03:37 +00:00
Nicolas B. Pierron
598ed874df Add extra argument to better identity with the extend function later. 2016-03-20 18:23:29 +00:00
Nicolas B. Pierron
a190baa479 In top-level/default.nix, rename self to allPackages. 2016-03-20 18:18:39 +00:00
Nicolas B. Pierron
5783f66bc8 Internalize the recursion over the set of all packages. 2016-03-20 18:17:35 +00:00
Nicolas B. Pierron
f8dedbb101 Build aliases based on the previous set including all-packages, instead of only using all-packages. 2016-03-20 18:02:28 +00:00
Nicolas B. Pierron
01693ac154 Move stdenvAdapaters attribute from all-packages.nix into the stdenvAdapters of the top-level. 2016-03-20 17:50:06 +00:00
Nicolas B. Pierron
ff72cf185e Split helperFunctions to simplify the identification with the extend function. 2016-03-20 17:37:40 +00:00
Nicolas B. Pierron
5cdaa7b907 Remove all-packages.nix helperFunctions dependency. 2016-03-20 16:41:20 +00:00
Nicolas B. Pierron
ae0471b737 Split consecutive merge operators to simplify the identification of extend functions. 2016-03-20 16:40:36 +00:00
Nicolas B. Pierron
335a969d45 Inline pkgsFun in pkgsWithOverrides. 2016-03-20 16:33:46 +00:00
Nicolas B. Pierron
ad31783405 Extract the top-level logic out of all-packages.nix into pkgs/top-level/default.nix 2016-03-20 16:28:18 +00:00