diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2022-11-09 22:39:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-09 22:39:07 +0100 |
| commit | ed58d6c28fe9c3fff06fbddb5bd119e118803425 (patch) | |
| tree | ed4bde0b03951775eec1380f4bd17ed14af567ec | |
| parent | ee0b051f22ffc9e2cf6bce0b5497c83ddfd1f8db (diff) | |
| parent | 786216dfcb12fa850a8d79b18a44f0c03fe23df1 (diff) | |
Merge pull request #177200 from andersk/overlays-emacs-locks
| -rw-r--r-- | pkgs/top-level/impure.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix index 242596d28c6b0..4d847e280f4b9 100644 --- a/pkgs/top-level/impure.nix +++ b/pkgs/top-level/impure.nix @@ -47,7 +47,12 @@ in # it's a directory, so the set of overlays from the directory, ordered lexicographically let content = builtins.readDir path; in map (n: import (path + ("/" + n))) - (builtins.filter (n: builtins.match ".*\\.nix" n != null || builtins.pathExists (path + ("/" + n + "/default.nix"))) + (builtins.filter + (n: + (builtins.match ".*\\.nix" n != null && + # ignore Emacs lock files (.#foo.nix) + builtins.match "\\.#.*" n == null) || + builtins.pathExists (path + ("/" + n + "/default.nix"))) (builtins.attrNames content)) else # it's a file, so the result is the contents of the file itself |