diff options
author | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 19:23:08 +0000 |
---|---|---|
committer | Nicolas B. Pierron <nicolas.b.pierron@gmail.com> | 2016-03-20 19:23:08 +0000 |
commit | 5ae7356d4292ba48ca0e3945a829adda93f64b8b (patch) | |
tree | be9c088dd71336556347d7489f0a51a306e3186a /pkgs/top-level/default.nix | |
parent | 1bcefcdf5caf5f238abd9cc74f4d9738ad505f29 (diff) | |
download | nixpkgs-5ae7356d4292ba48ca0e3945a829adda93f64b8b.tar nixpkgs-5ae7356d4292ba48ca0e3945a829adda93f64b8b.tar.gz nixpkgs-5ae7356d4292ba48ca0e3945a829adda93f64b8b.tar.bz2 nixpkgs-5ae7356d4292ba48ca0e3945a829adda93f64b8b.tar.lz nixpkgs-5ae7356d4292ba48ca0e3945a829adda93f64b8b.tar.xz nixpkgs-5ae7356d4292ba48ca0e3945a829adda93f64b8b.tar.zst nixpkgs-5ae7356d4292ba48ca0e3945a829adda93f64b8b.zip |
Replace the merge operators by the fix' and extends functions.
Diffstat (limited to 'pkgs/top-level/default.nix')
-rw-r--r-- | pkgs/top-level/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index d335ffb8a37..2d091571973 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -134,19 +134,15 @@ let customOverrides = self: super: lib.optionalAttrs (bootStdenv == null) (overrider self super); - - pkgs_1 = {}; - pkgs_2 = pkgs_1 // stdenvAdapters pkgs pkgs_1; - pkgs_3 = pkgs_2 // trivialBuilders pkgs pkgs_2; - pkgs_4 = pkgs_3 // stdenvDefault pkgs pkgs_3; - pkgs_5 = pkgs_4 // allPackages pkgs pkgs_4; - pkgs_6 = pkgs_5 // aliases pkgs pkgs_5; - - pkgs_7 = pkgs_6 // stdenvOverrides pkgs pkgs_6; - - # The overriden, final packages. - pkgs = pkgs_7 // customOverrides pkgs pkgs_7; - in pkgs; - + in + lib.fix' ( + lib.extends customOverrides ( + lib.extends stdenvOverrides ( + lib.extends aliases ( + lib.extends allPackages ( + lib.extends stdenvDefault ( + lib.extends trivialBuilders ( + lib.extends stdenvAdapters ( + self: {})))))))); in pkgs |