From a190baa4791d4b29bfe51f2e21894454940d480c Mon Sep 17 00:00:00 2001 From: "Nicolas B. Pierron" Date: Sun, 20 Mar 2016 18:18:39 +0000 Subject: In top-level/default.nix, rename self to allPackages. --- pkgs/top-level/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/top-level/default.nix') diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix index 6370bf57e13..36f0ce0ab3b 100644 --- a/pkgs/top-level/default.nix +++ b/pkgs/top-level/default.nix @@ -123,9 +123,9 @@ let stdenvDefault = (import ./stdenv.nix topLevelArguments) {} pkgs; - selfArgs = topLevelArguments // { inherit pkgsWithOverrides; }; - self = - let res = import ./all-packages.nix selfArgs res pkgs; + allPackagesArgs = topLevelArguments // { inherit pkgsWithOverrides; }; + allPackages = + let res = import ./all-packages.nix allPackagesArgs res pkgs; in res; aliases = super: import ./aliases.nix super; @@ -133,7 +133,7 @@ let pkgs_2 = stdenvAdapters; pkgs_3 = pkgs_2 // trivialBuilders; pkgs_4 = pkgs_3 // stdenvDefault; - pkgs_5 = pkgs_4 // self; + pkgs_5 = pkgs_4 // allPackages; pkgs_6 = pkgs_5 // aliases pkgs_5; pkgs_7 = pkgs_6 // overrider pkgs pkgs_6; -- cgit 1.4.1