summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvan Mosberger <silvan.mosberger@tweag.io>2024-06-20 18:37:38 +0200
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2024-06-22 08:56:50 +0000
commit1050b8d55520f0da86a413c9749422bbabea8583 (patch)
tree739f800eb6f367611b4b70d17a252794794b7624
parentlib.add: inherit from lib.trivial (diff)
downloadnixpkgs-1050b8d55520f0da86a413c9749422bbabea8583.tar.gz
lib.sub: inherit from lib.trivial
(cherry picked from commit 8a6941dbef24b2172e52f291045c22e175e7a9d7)
-rw-r--r--lib/default.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix
index c172f24c36e6..a322f9cd1434 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -68,12 +68,12 @@ let
deepSeq elem elemAt genericClosure getAttr
hasAttr isAttrs isBool isInt isList isPath isString
pathExists readFile replaceStrings
- sub trace;
+ trace;
inherit (self.trivial) id const pipe concat or and xor bitAnd bitOr bitXor
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 add
+ mod compare splitByAndCompare seq lessThan add sub
functionArgs setFunctionArgs isFunction toFunction mirrorFunctionArgs
toHexString toBaseDigits inPureEvalMode;
inherit (self.fixedPoints) fix fix' converge extends composeExtensions