diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-13 16:08:59 +0100 |
| commit | ed1b0d0bac6438fbfcb2dca77493edcbe3384114 (patch) | |
| tree | d9ddecb505723c8c45ca2837e08e121f41b49fd2 /lib/default.nix | |
| parent | 960f062825d22e328828766f4910b702f81ddade (diff) | |
| parent | de66fc6a2a2483f4bbbb759c55176643df6e38ba (diff) | |
Merge master into staging-next
Diffstat (limited to 'lib/default.nix')
| -rw-r--r-- | lib/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/default.nix b/lib/default.nix index 9f7a088d792d..77dda17f3b4f 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -100,7 +100,7 @@ let inherit (sources) pathType pathIsDirectory cleanSourceFilter cleanSource sourceByRegex sourceFilesBySuffices commitIdFromGitRepo cleanSourceWith pathHasContext - canCleanSource; + canCleanSource pathIsRegularFile; inherit (modules) evalModules unifyModuleSyntax applyIfFunction mergeModules mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions |