lib: use names from lib in lib/generators.nix, rather than builtins or submodules of lib

There's not a lot of rhyme to which names are exported from which module,
as I see it, but everything is found somewhere.
This commit is contained in:
Philip Taron 2024-03-14 13:14:26 -07:00
parent 8422fe83b9
commit a7b4ee2dbe
No known key found for this signature in database

View File

@ -16,67 +16,55 @@
{ lib }: { lib }:
let let
inherit (builtins) inherit (lib)
addErrorContext addErrorContext
assertMsg
attrNames attrNames
concatLists concatLists
concatMapStringsSep
concatStrings
concatStringsSep concatStringsSep
const
elem elem
escape
filter filter
flatten
foldl
functionArgs # Note: not the builtin; considers `__functor` in attrsets.
gvariant
hasInfix
head head
id
init
isAttrs isAttrs
isBool isBool
isDerivation
isFloat isFloat
isFunction # Note: not the builtin; considers `__functor` in attrsets.
isInt isInt
isList isList
isPath isPath
isString isString
last
length length
mapAttrs mapAttrs
match
replaceStrings
split
tail
toJSON
typeOf
;
inherit (lib.attrsets)
isDerivation
mapAttrsToList mapAttrsToList
recursiveUpdate
;
inherit (lib.lists)
init
flatten
foldl
last
optionals optionals
recursiveUpdate
replaceStrings
reverseList reverseList
splitString
tail
toList toList
; ;
inherit (lib.strings) inherit (lib.strings)
concatMapStringsSep
concatStrings
escape
escapeNixIdentifier escapeNixIdentifier
floatToString floatToString
hasInfix match
splitString split
; toJSON
typeOf
inherit (lib.trivial)
const
id
isFunction # Note: not the builtin, considers `__functor` in attrsets.
functionArgs # Note: not the builtin; considers `__functor` in attrsets.
;
inherit (lib)
assertMsg
gvariant
; ;
## -- HELPER FUNCTIONS & DEFAULTS -- ## -- HELPER FUNCTIONS & DEFAULTS --