summaryrefslogtreecommitdiff
path: root/lib/default.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <silvan.mosberger@tweag.io>2024-06-20 18:37:10 +0200
committerSilvan Mosberger <silvan.mosberger@tweag.io>2024-06-20 22:47:01 +0200
commita32d38d38063b8f50895a26f25d713a84fa58004 (patch)
treef5525afef2d130fe5d53f0d43a251053fdbb979b /lib/default.nix
parentlib.lessThan: inherit from lib.trivial (diff)
downloadnixpkgs-a32d38d38063b8f50895a26f25d713a84fa58004.tar.gz
lib.add: inherit from lib.trivial
Diffstat (limited to 'lib/default.nix')
-rw-r--r--lib/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix
index f7a42f8a0c29..c172f24c36e6 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -64,7 +64,7 @@ let
# linux kernel configuration
kernel = callLibs ./kernel.nix;
- inherit (builtins) add addErrorContext
+ inherit (builtins) addErrorContext
deepSeq elem elemAt genericClosure getAttr
hasAttr isAttrs isBool isInt isList isPath isString
pathExists readFile replaceStrings
@@ -73,7 +73,7 @@ let
bitNot boolToString mergeAttrs flip mapNullable inNixShell isFloat min max
importJSON importTOML warn warnIf warnIfNot throwIf throwIfNot checkListOfEnum
info showWarnings nixpkgsVersion version isInOldestRelease
- mod compare splitByAndCompare seq lessThan
+ mod compare splitByAndCompare seq lessThan add
functionArgs setFunctionArgs isFunction toFunction mirrorFunctionArgs
toHexString toBaseDigits inPureEvalMode;
inherit (self.fixedPoints) fix fix' converge extends composeExtensions