From 8d355b8d85b7ce454bca1473bf8cc5aebf8f0c48 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sat, 19 Mar 2016 14:39:48 +0000
Subject: [PATCH] Under pkgsFun, expand self attribute, and rename self_ to
 self.

Note, the aliases are now computed against the set of packages defined in
the set of all packages, and no longer apply to any overriden package.

I think this is better as this reduces the amount of surprizes.
---
 pkgs/top-level/all-packages.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d21f1fd9e5..fb39447c999 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -121,7 +121,6 @@ let
   pkgsFun = pkgs: overrides:
     let
       defaultScope = pkgs // pkgs.xorg;
-      self = helperFunctions // self_ // overrides;
 
       # Helper functions that are exported through `pkgs'.
       helperFunctions =
@@ -131,7 +130,7 @@ let
       stdenvAdapters =
         import ../stdenv/adapters.nix pkgs;
 
-      self_ = with self; {
+      self = with helperFunctions; with self; with overrides; {
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;
@@ -16468,7 +16467,7 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-}; # self_ =
+}; # self =
 
 
 aliases = import ./aliases.nix self;
@@ -16479,7 +16478,7 @@ tweakAlias = _n: alias: with lib;
   else alias;
 
 in
-  lib.mapAttrs tweakAlias aliases // self;
+  lib.mapAttrs tweakAlias aliases // helperFunctions // self // overrides;
 
 in
   pkgs