summaryrefslogtreecommitdiff
path: root/lib/default.nix
diff options
context:
space:
mode:
authorSilvan Mosberger <silvan.mosberger@tweag.io>2023-04-05 16:10:09 +0200
committerSilvan Mosberger <silvan.mosberger@tweag.io>2023-04-05 17:18:10 +0200
commitc701a4dd299aaa82589e4e4d4ce49ae330729a25 (patch)
tree79187c5ce01e9ab56881d38b828d5ac6fd27dfa8 /lib/default.nix
parentrl-2305: Mention woodpecker addition (diff)
downloadnixpkgs-c701a4dd299aaa82589e4e4d4ce49ae330729a25.tar.gz
lib.sources.pathType and co.: Move to lib.filesystem
These functions only work with the filesystem, they don't import anything as sources
Diffstat (limited to 'lib/default.nix')
-rw-r--r--lib/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/default.nix b/lib/default.nix
index 0424db36b2e9..8fea4b8ad637 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -117,10 +117,11 @@ let
inherit (self.meta) addMetaAttrs dontDistribute setName updateName
appendToName mapDerivationAttrset setPrio lowPrio lowPrioSet hiPrio
hiPrioSet getLicenseFromSpdxId getExe;
- inherit (self.sources) pathType pathIsDirectory cleanSourceFilter
+ inherit (self.filesystem) pathType pathIsDirectory pathIsRegularFile;
+ inherit (self.sources) cleanSourceFilter
cleanSource sourceByRegex sourceFilesBySuffices
commitIdFromGitRepo cleanSourceWith pathHasContext
- canCleanSource pathIsRegularFile pathIsGitRepo;
+ canCleanSource pathIsGitRepo;
inherit (self.modules) evalModules setDefaultModuleLocation
unifyModuleSyntax applyModuleArgsIfFunction mergeModules
mergeModules' mergeOptionDecls evalOptionValue mergeDefinitions