diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-08-29 20:27:04 -0400 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-08-29 20:27:04 -0400 |
| commit | e2589b3ca22c93029051efcde62aa773fe3085b4 (patch) | |
| tree | 4a386d62a275513fbcc2806b96fc0789231f8d6c /lib/sources.nix | |
| parent | ac388e9f87adfc6c6c7b2624c8d3048e0bc3bfd3 (diff) | |
| download | nixpkgs-e2589b3ca22c93029051efcde62aa773fe3085b4.tar nixpkgs-e2589b3ca22c93029051efcde62aa773fe3085b4.tar.gz nixpkgs-e2589b3ca22c93029051efcde62aa773fe3085b4.tar.bz2 nixpkgs-e2589b3ca22c93029051efcde62aa773fe3085b4.tar.lz nixpkgs-e2589b3ca22c93029051efcde62aa773fe3085b4.tar.xz nixpkgs-e2589b3ca22c93029051efcde62aa773fe3085b4.tar.zst nixpkgs-e2589b3ca22c93029051efcde62aa773fe3085b4.zip | |
Deduplicate some filterSource invocations
This version should have more conventional regexes that work across many platforms and regex engines. This is an issue because up until Nix 1.11, Nix called out to the libc regex matcher, which behaved differently on Darwin and Linux. And in Nix 1.12, we're moving to std::regex which will also behave differently here. And yes, I do actually evaluate make-disk-image.nix on Darwin ;)
Diffstat (limited to 'lib/sources.nix')
| -rw-r--r-- | lib/sources.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sources.nix b/lib/sources.nix index 8f312a9db5c..0ec4c020e54 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -17,6 +17,8 @@ rec { (type == "directory" && (baseName == ".git" || baseName == ".svn" || baseName == "CVS" || baseName == ".hg")) || # Filter out backup files. lib.hasSuffix "~" baseName || + builtins.match "^.*\.sw[a-z]$" baseName != null || + # Filter out generates files. lib.hasSuffix ".o" baseName || lib.hasSuffix ".so" baseName || |