JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Avoid polluting lib namespace unncessarily"

Browse Source 
Reverting #27319

This reverts commit 01a3f0b8aa.
This commit is contained in:
Shea Levy 2017-09-29 09:09:53 -04:00
parent 4f132afa5b
commit d96da5af87
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/customisation.nix
View File

@ -81,7 +81,7 @@ rec {
});
};
in lib.fixedPoints.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: {
in lib.makeExtensibleWithInterface (x: o: interface (addOverrideFuncs x o) o) (output: self: {
args = origArgs;
val = f output self.args self.val;
});

5
lib/default.nix
View File

@ -60,7 +60,7 @@ let
nixpkgsVersion mod;
inherit (fixedPoints) fix fix' extends composeExtensions
makeExtensible makeExtensibleWithCustomName;
makeExtensible makeExtensibleWithCustomName makeExtensibleWithInterface;
inherit (attrsets) attrByPath hasAttrByPath setAttrByPath
getAttrFromPath attrVals attrValues catAttrs filterAttrs
filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs
@ -88,7 +88,8 @@ let
inherit (stringsWithDeps) textClosureList textClosureMap
noDepEntry fullDepEntry packEntry stringAfter;
inherit (customisation) overrideDerivation makeOverridable
callPackageWith callPackagesWith addPassthru hydraJob makeScope;
callPackageWith callPackagesWith addPassthru hydraJob makeScope
callPackageWithOutputWith;
inherit (meta) addMetaAttrs dontDistribute setName updateName
appendToName mapDerivationAttrset lowPrio lowPrioSet hiPrio
hiPrioSet;

2
pkgs/top-level/haskell-packages.nix
View File

@ -24,7 +24,7 @@ let
};
callPackage = lib.callPackageWith (pkgs // { inherit haskellLib; });
callPackageWithOutput = lib.customisation.callPackageWithOutputWith (pkgs // { inherit haskellLib; });
callPackageWithOutput = lib.callPackageWithOutputWith (pkgs // { inherit haskellLib; });
in rec {
lib = haskellLib;

2
pkgs/top-level/splice.nix
View File

@ -86,5 +86,5 @@ in
newScope = extra: lib.callPackageWith (splicedPackages // extra);
newScopeWithOutput = extra: lib.customisation.callPackageWithOutputWith (splicedPackages // extra);
newScopeWithOutput = extra: lib.callPackageWithOutputWith (splicedPackages // extra);
}