From 402c07c5636c426d7a257e0f71e6794246ee24e0 Mon Sep 17 00:00:00 2001 From: Elliot Cameron <3noch@users.noreply.github.com> Date: Thu, 17 Nov 2016 22:21:18 -0500 Subject: Expose guts of `cleanSource` Ref #20511 --- lib/sources.nix | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'lib/sources.nix') diff --git a/lib/sources.nix b/lib/sources.nix index 156afaae5c98..f41abe1e1eae 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -12,19 +12,19 @@ rec { # Bring in a path as a source, filtering out all Subversion and CVS # directories, as well as backup files (*~). - cleanSource = - let filter = name: type: let baseName = baseNameOf (toString name); in ! ( - # Filter out Subversion and CVS directories. - (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || - # Filter out backup files. - lib.hasSuffix "~" baseName || - # Filter out generates files. - lib.hasSuffix ".o" baseName || - lib.hasSuffix ".so" baseName || - # Filter out nix-build result symlinks - (type == "symlink" && lib.hasPrefix "result" baseName) - ); - in src: builtins.filterSource filter src; + cleanSourceFilter = name: type: let baseName = baseNameOf (toString name); in ! ( + # Filter out Subversion and CVS directories. + (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || + # Filter out backup files. + lib.hasSuffix "~" baseName || + # Filter out generates files. + lib.hasSuffix ".o" baseName || + lib.hasSuffix ".so" baseName || + # Filter out nix-build result symlinks + (type == "symlink" && lib.hasPrefix "result" baseName) + ); + + cleanSource = builtins.filterSource cleanSourceFilter; # Get all files ending with the specified suffices from the given -- cgit v1.2.3