diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-02-03 09:26:35 +0100 |
| commit | 899a451e08f7d6d2c8214d119c2a0316849a0ed4 (patch) | |
| tree | 5e72a7288b7d2b33fead36fbfe91a02a48ff7fef /nixpkgs/lib/default.nix | |
| parent | 5962418b6543dfb3ca34965c0fa16dd77543801b (diff) | |
| parent | a21c2fa3ea2b88e698db6fc151d9c7259ae14d96 (diff) | |
Merge commit 'a21c2fa3ea2b88e698db6fc151d9c7259ae14d96'
Diffstat (limited to 'nixpkgs/lib/default.nix')
| -rw-r--r-- | nixpkgs/lib/default.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nixpkgs/lib/default.nix b/nixpkgs/lib/default.nix index 9f7a088d792..d2fe018aa6a 100644 --- a/nixpkgs/lib/default.nix +++ b/nixpkgs/lib/default.nix @@ -37,10 +37,13 @@ let licenses = callLibs ./licenses.nix; systems = callLibs ./systems; + # serialization + cli = callLibs ./cli.nix; + generators = callLibs ./generators.nix; + # misc asserts = callLibs ./asserts.nix; debug = callLibs ./debug.nix; - generators = callLibs ./generators.nix; misc = callLibs ./deprecated.nix; # domain-specific @@ -100,7 +103,7 @@ let inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext - canCleanSource; + canCleanSource pathIsRegularFile pathIsGitRepo; inherit (modules) evalModules unifyModuleSyntax applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions |