diff options
| author | Silvan Mosberger <contact@infinisil.com> | 2023-11-15 01:19:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-15 01:19:36 +0100 |
| commit | 7e533bab6df5dc1d065adafceda44a106e3796a4 (patch) | |
| tree | ec580f2bbfbeca182f93ccb7521f7676da74303e /lib/fileset/default.nix | |
| parent | Merge pull request #267372 from cu1ch3n/update-abella (diff) | |
| parent | lib.fileset.fileFilter: Don't run predicate unnecessarily (diff) | |
| download | nixpkgs-7e533bab6df5dc1d065adafceda44a106e3796a4.tar.gz | |
Merge pull request #267381 from tweag/fileset.fileFilter-path
`fileset.fileFilter`: Don't run predicate unnecessarily
Diffstat (limited to 'lib/fileset/default.nix')
| -rw-r--r-- | lib/fileset/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/fileset/default.nix b/lib/fileset/default.nix index 7d5bbeee3bae..d90c770633d8 100644 --- a/lib/fileset/default.nix +++ b/lib/fileset/default.nix @@ -380,7 +380,7 @@ in { fileFilter (file: hasPrefix "." file.name) ./. # Include all regular files (not symlinks or others) in the current directory - fileFilter (file: file.type == "regular") + fileFilter (file: file.type == "regular") ./. */ fileFilter = /* @@ -401,7 +401,7 @@ in { fileset: if ! isFunction predicate then throw '' - lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function.'' + lib.fileset.fileFilter: First argument is of type ${typeOf predicate}, but it should be a function instead.'' else _fileFilter predicate (_coerce "lib.fileset.fileFilter: Second argument" fileset); |