From 01a3f0b8aabdb321b15dc7cc0e2287ce8232f797 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 28 Sep 2017 18:51:20 -0400
Subject: [PATCH] Avoid polluting lib namespace unncessarily

---
 lib/customisation.nix               | 2 +-
 lib/default.nix                     | 5 ++---
 pkgs/top-level/haskell-packages.nix | 2 +-
 pkgs/top-level/splice.nix           | 2 +-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 217daada7818..304bb228449f 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -81,7 +81,7 @@ rec {
         });
       };
 
-  in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: {
+  in lib.fixedPoints.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: {
     args = origArgs;
     val = f output self.args self.val;
   });
diff --git a/lib/default.nix b/lib/default.nix
index 9da78ff0da7c..3e30ec515fcb 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -60,7 +60,7 @@ let
       nixpkgsVersion mod;
 
     inherit (fixedPoints) fix fix' extends composeExtensions
-      makeExtensible makeExtensibleWithCustomName makeExtensibleWithInterface;
+      makeExtensible makeExtensibleWithCustomName;
     inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
       getAttrFromPath attrVals attrValues catAttrs filterAttrs
       filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
@@ -88,8 +88,7 @@ let
     inherit (stringsWithDeps) textClosureList textClosureMap
       noDepEntry fullDepEntry packEntry stringAfter;
     inherit (customisation) overrideDerivation makeOverridable
-      callPackageWith callPackagesWith addPassthru hydraJob makeScope
-      callPackageWithOutputWith;
+      callPackageWith callPackagesWith addPassthru hydraJob makeScope;
     inherit (meta) addMetaAttrs dontDistribute setName updateName
       appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
       hiPrioSet;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a1f9b2e81c3c..dce783b3f98a 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -24,7 +24,7 @@ let
   };
 
   callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; });
-  callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; });
+  callPackageWithOutput = lib.customisation.callPackageWithOutputWith (pkgs // { inherit haskellLib; });
 
 in rec {
   lib = haskellLib;
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index d6498be949b3..599c108062c0 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -86,5 +86,5 @@ in
 
   newScope = extra: lib.callPackageWith (splicedPackages // extra);
 
-  newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra);
+  newScopeWithOutput = extra: lib.customisation.callPackageWithOutputWith (splicedPackages // extra);
 }