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

Avoid polluting lib namespace unncessarily

This commit is contained in:
Shea Levy 2017-09-28 18:51:20 -04:00
parent 9ce7175cfe
commit 01a3f0b8aa
4 changed files with 5 additions and 6 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.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; args = origArgs;
val = f output self.args self.val; val = f output self.args self.val;
}); });

5
lib/default.nix
View File

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

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

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

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

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