diff options
| author | Silvan Mosberger <silvan.mosberger@tweag.io> | 2023-11-12 19:16:37 +0100 |
|---|---|---|
| committer | Silvan Mosberger <silvan.mosberger@tweag.io> | 2023-11-19 16:06:14 +0100 |
| commit | b514f0433cdbafbe05899f4dbd420bbdf1c5c7b9 (patch) | |
| tree | 2148ae3d80c96d8a892e30a8f6e606c5c56f879d /lib/fileset/internal.nix | |
| parent | Merge pull request #263550 from anthonyroussel/updates/axis2 (diff) | |
| download | nixpkgs-b514f0433cdbafbe05899f4dbd420bbdf1c5c7b9.tar.gz | |
lib.fileset: Minor changes
- Make fromSource's missing file error message more consistent with others,
and add a test for it
- Indent some function arguments
- Fix an internal type
Diffstat (limited to 'lib/fileset/internal.nix')
| -rw-r--r-- | lib/fileset/internal.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/fileset/internal.nix b/lib/fileset/internal.nix index 0769e654c8fb..23d7b847204c 100644 --- a/lib/fileset/internal.nix +++ b/lib/fileset/internal.nix @@ -381,7 +381,7 @@ rec { # Turn a fileset into a source filter function suitable for `builtins.path` # Only directories recursively containing at least one files are recursed into - # Type: Path -> fileset -> (String -> String -> Bool) + # Type: fileset -> (String -> String -> Bool) _toSourceFilter = fileset: let # Simplify the tree, necessary to make sure all empty directories are null @@ -753,9 +753,9 @@ rec { resultingTree = _differenceTree - positive._internalBase - positive._internalTree - negativeTreeWithPositiveBase; + positive._internalBase + positive._internalTree + negativeTreeWithPositiveBase; in # If the first file set is empty, we can never have any files in the result if positive._internalIsEmptyWithoutBase then |