From a658645e1e277ecea37ccbdac6c2ce64e55eed13 Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Fri, 18 Mar 2016 22:54:24 +0000
Subject: [PATCH] Remove with helperFunction above the list of all packages.

This modification change the names bound to the `helperFunctions` attribute
set, to be bound to `self` which is constructed by merging the same
`helperFunctions` set with the set of all packages.

This patch works as expected because none of the helperFunction names is
aliased by the name of a package.
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f27f94b44c9..12ebed19f2d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -131,7 +131,7 @@ let
       stdenvAdapters =
         import ../stdenv/adapters.nix pkgs;
 
-      self_ = with self; helperFunctions // (with helperFunctions; {
+      self_ = with self; helperFunctions // {
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;
@@ -16468,7 +16468,7 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-}); # self_ =
+}; # self_ =
 
 
 aliases = import ./aliases.nix self;