From f2b8637f7917f8f85f3981c241b6c2a3c2cf61be Mon Sep 17 00:00:00 2001 From: Eman Resu <78693624+quatquatt@users.noreply.github.com> Date: Sat, 27 Jun 2026 16:58:41 -0400 Subject: [PATCH] lib.sources.cleanSourceFilter: partially apply checks --- lib/sources.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index e05ba2f5546d..fe2d06bd7318 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -50,6 +50,12 @@ let : 2\. Function argument */ cleanSourceFilter = + let + hasEmacsBackupFileSuffix = hasSuffix "~"; + hasObjectSuffix = hasSuffix ".o"; + hasSharedObjectSuffix = hasSuffix ".so"; + hasResultPrefix = hasPrefix "result"; + in name: type: let baseName = baseNameOf name; @@ -71,17 +77,15 @@ let ) || # Filter out editor backup / swap files. - hasSuffix "~" baseName + hasEmacsBackupFileSuffix baseName || match "^\\.sw[a-z]$" baseName != null || match "^\\..*\\.sw[a-z]$" baseName != null - || - - # Filter out generates files. - hasSuffix ".o" baseName - || hasSuffix ".so" baseName + # Filter out generated files. + || hasObjectSuffix baseName + || hasSharedObjectSuffix baseName || # Filter out nix-build result symlinks - (type == "symlink" && hasPrefix "result" baseName) + (type == "symlink" && hasResultPrefix baseName) || # Filter out sockets and other types of files we can't have in the store. (type == "unknown")