diff options
author | Profpatsch <mail@profpatsch.de> | 2020-01-22 23:22:23 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2020-01-23 14:47:38 +0100 |
commit | 88a7f65c834ec09ce9df0c23c9935630e17a0c4a (patch) | |
tree | 2ef561282dff13c5bbf3f1b7af85357985868ca1 /lib | |
parent | 714860dd42dc4b393e34cd064ec433b9a542091c (diff) | |
download | nixpkgs-88a7f65c834ec09ce9df0c23c9935630e17a0c4a.tar nixpkgs-88a7f65c834ec09ce9df0c23c9935630e17a0c4a.tar.gz nixpkgs-88a7f65c834ec09ce9df0c23c9935630e17a0c4a.tar.bz2 nixpkgs-88a7f65c834ec09ce9df0c23c9935630e17a0c4a.tar.lz nixpkgs-88a7f65c834ec09ce9df0c23c9935630e17a0c4a.tar.xz nixpkgs-88a7f65c834ec09ce9df0c23c9935630e17a0c4a.tar.zst nixpkgs-88a7f65c834ec09ce9df0c23c9935630e17a0c4a.zip |
lib/cli: unexport symbols & sort with generators
lib/cli is very similar to generators, so it should follow largely the same interface. Similar to how generators isn’t exported, we should also namespace cli by default (plus “cli” is only three characters to type).
Diffstat (limited to 'lib')
-rw-r--r-- | lib/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/default.nix b/lib/default.nix index 5abafe1b2ac..45530d47a53 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -37,11 +37,13 @@ let licenses = callLibs ./licenses.nix; systems = callLibs ./systems; + # serialization + cli = callLibs ./cli.nix; + generators = callLibs ./generators.nix; + # misc asserts = callLibs ./asserts.nix; - cli = callLibs ./cli.nix; debug = callLibs ./debug.nix; - generators = callLibs ./generators.nix; misc = callLibs ./deprecated.nix; # domain-specific @@ -121,7 +123,6 @@ let isOptionType mkOptionType; inherit (asserts) assertMsg assertOneOf; - inherit (cli) encodeGNUCommandLine toGNUCommandLine; inherit (debug) addErrorContextToAttrs traceIf traceVal traceValFn traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq traceValSeqFn traceValSeqN traceValSeqNFn traceShowVal |