lol

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.

+24 -36
+24 -36
lib/generators.nix
··· 16 16 { lib }: 17 17 18 18 let 19 - inherit (builtins) 19 + inherit (lib) 20 20 addErrorContext 21 + assertMsg 21 22 attrNames 22 23 concatLists 24 + concatMapStringsSep 25 + concatStrings 23 26 concatStringsSep 27 + const 24 28 elem 29 + escape 25 30 filter 31 + flatten 32 + foldl 33 + functionArgs # Note: not the builtin; considers `__functor` in attrsets. 34 + gvariant 35 + hasInfix 26 36 head 37 + id 38 + init 27 39 isAttrs 28 40 isBool 41 + isDerivation 29 42 isFloat 43 + isFunction # Note: not the builtin; considers `__functor` in attrsets. 30 44 isInt 31 45 isList 32 46 isPath 33 47 isString 48 + last 34 49 length 35 50 mapAttrs 36 - match 37 - replaceStrings 38 - split 39 - tail 40 - toJSON 41 - typeOf 42 - ; 43 - 44 - inherit (lib.attrsets) 45 - isDerivation 46 51 mapAttrsToList 47 - recursiveUpdate 48 - ; 49 - 50 - inherit (lib.lists) 51 - init 52 - flatten 53 - foldl 54 - last 55 52 optionals 53 + recursiveUpdate 54 + replaceStrings 56 55 reverseList 56 + splitString 57 + tail 57 58 toList 58 59 ; 59 60 60 61 inherit (lib.strings) 61 - concatMapStringsSep 62 - concatStrings 63 - escape 64 62 escapeNixIdentifier 65 63 floatToString 66 - hasInfix 67 - splitString 68 - ; 69 - 70 - inherit (lib.trivial) 71 - const 72 - id 73 - isFunction # Note: not the builtin, considers `__functor` in attrsets. 74 - functionArgs # Note: not the builtin; considers `__functor` in attrsets. 75 - ; 76 - 77 - inherit (lib) 78 - assertMsg 79 - gvariant 64 + match 65 + split 66 + toJSON 67 + typeOf 80 68 ; 81 69 82 70 ## -- HELPER FUNCTIONS & DEFAULTS --