diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-11-28 18:10:38 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-11-28 18:10:38 +0000 |
commit | 8ddf5c69077a6afda88a3ae72f10fdff031f75b8 (patch) | |
tree | b18dd7d549baa53756eb3c53d0f2932feab52e91 /lib/default.nix | |
parent | c6617d28ef3762bbd5cb11dd3c56afb778ff42cc (diff) | |
parent | 2622548c138fbf151fd3f130fe41864590520121 (diff) |
Merge remote-tracking branch 'upstream/master' into aj-rust-custom-target
Diffstat (limited to 'lib/default.nix')
-rw-r--r-- | lib/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/default.nix b/lib/default.nix index d2239d26eadf..f985266ed938 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -5,7 +5,7 @@ */ let - inherit (import ./fixed-points.nix {}) makeExtensible; + inherit (import ./fixed-points.nix { inherit lib; }) makeExtensible; lib = makeExtensible (self: let callLibs = file: import file { lib = self; }; @@ -69,7 +69,7 @@ let importJSON importTOML warn info showWarnings nixpkgsVersion version mod compare splitByAndCompare functionArgs setFunctionArgs isFunction toHexString toBaseDigits; inherit (self.fixedPoints) fix fix' converge extends composeExtensions - makeExtensible makeExtensibleWithCustomName; + composeManyExtensions makeExtensible makeExtensibleWithCustomName; inherit (self.attrsets) attrByPath hasAttrByPath setAttrByPath getAttrFromPath attrVals attrValues getAttrs catAttrs filterAttrs filterAttrsRecursive foldAttrs collect nameValuePair mapAttrs @@ -101,7 +101,7 @@ let noDepEntry fullDepEntry packEntry stringAfter; inherit (self.customisation) overrideDerivation makeOverridable callPackageWith callPackagesWith extendDerivation hydraJob - makeScope; + makeScope makeScopeWithSplicing; inherit (self.meta) addMetaAttrs dontDistribute setName updateName appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio hiPrioSet; |