diff options
| author | Shea Levy <shea@shealevy.com> | 2017-09-29 09:09:53 -0400 |
|---|---|---|
| committer | Shea Levy <shea@shealevy.com> | 2017-09-29 09:09:53 -0400 |
| commit | d96da5af876db7d5839a048980853a0b294b59e7 (patch) | |
| tree | 28a6ca26fdd053d0c84631d86790cdc95808bb7e /lib/default.nix | |
| parent | 4f132afa5bdc390e916bbd3c54d603498b552583 (diff) | |
| download | nixpkgs-d96da5af876db7d5839a048980853a0b294b59e7.tar nixpkgs-d96da5af876db7d5839a048980853a0b294b59e7.tar.gz nixpkgs-d96da5af876db7d5839a048980853a0b294b59e7.tar.bz2 nixpkgs-d96da5af876db7d5839a048980853a0b294b59e7.tar.lz nixpkgs-d96da5af876db7d5839a048980853a0b294b59e7.tar.xz nixpkgs-d96da5af876db7d5839a048980853a0b294b59e7.tar.zst nixpkgs-d96da5af876db7d5839a048980853a0b294b59e7.zip | |
Revert "Avoid polluting lib namespace unncessarily"
Reverting #27319 This reverts commit 01a3f0b8aabdb321b15dc7cc0e2287ce8232f797.
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix index 3e30ec515fc..9da78ff0da7 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -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; |