From 86fe7a40acc0e68e60905798b2d692c2e9a6c33e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 31 Jan 2017 15:20:28 +0100
Subject: Only read overlays ending in .nix

For example, this prevents Nix from barfing on editor backup files in
~/.nixpkgs/overlays.
---
 pkgs/top-level/impure.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/impure.nix b/pkgs/top-level/impure.nix
index 60a55c657c0..d8201a3569f 100644
--- a/pkgs/top-level/impure.nix
+++ b/pkgs/top-level/impure.nix
@@ -29,7 +29,9 @@
       dirCheck = dir: dir != "" && pathExists (dir + "/.");
       overlays = dir:
         let content = readDir dir; in
-        map (n: import "${dir}/${n}") (sort lessThan (attrNames content));
+        map (n: import "${dir}/${n}")
+          (builtins.filter (n: builtins.match ".*\.nix" n != null)
+            (sort lessThan (attrNames content)));
     in
       if dirEnv != "" then
         if dirCheck dirEnv then overlays dirEnv
-- 
cgit 1.4.1