Avoid polluting lib namespace unncessarily

makefu · Sep 28, 2017 · 01a3f0b · 01a3f0b
1 parent 9ce7175
commit 01a3f0b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -86,5 +86,5 @@ in
 
   newScope = extra: lib.callPackageWith (splicedPackages // extra);
 
-  newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra);
+  newScopeWithOutput = extra: lib.customisation.callPackageWithOutputWith (splicedPackages // extra);
 }