chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-11 18:32:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #267381 from tweag/fileset.fileFilter-path

Browse Source 
`fileset.fileFilter`: Don't run predicate unnecessarily
This commit is contained in:
Silvan Mosberger
2023-11-15 01:19:36 +01:00
committed by GitHub
parent 5268a6e24b 2035f8a324
commit 7e533bab6d
3 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/fileset/default.nix
View File

@@ -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);