diff options
| author | Shea Levy <shea@shealevy.com> | 2017-09-28 18:51:20 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-09-28 18:51:20 -0400 |
| commit | 01a3f0b8aabdb321b15dc7cc0e2287ce8232f797 (patch) | |
| tree | 37562d65b0fc2fdc0f81da3ac22cb8637ea61ad8 /lib | |
| parent | 9ce7175cfe9edf5f7eb9a9f299807047a4feeaf1 (diff) | |
| download | nixpkgs-01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.tar nixpkgs-01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.tar.gz nixpkgs-01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.tar.bz2 nixpkgs-01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.tar.lz nixpkgs-01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.tar.xz nixpkgs-01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.tar.zst nixpkgs-01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.zip | |
Avoid polluting lib namespace unncessarily
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/customisation.nix | 2 | ||||
| -rw-r--r-- | lib/default.nix | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/customisation.nix b/lib/customisation.nix index 217daada781..304bb228449 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 9da78ff0da7..3e30ec515fc 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; |