From eb3285feea223f3aa2a54beeccbe3a9135067616 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 9 Dec 2022 00:28:58 +0100
Subject: lib.mapNixDir: admit just files with .nix suffix

---
 lib/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/default.nix b/lib/default.nix
index 7c3b0370e..d65c891a3 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -95,9 +95,12 @@ let
             path = dirPath + "/${relPath}";
           in
             nameValuePair (toPackageName name) (f path))
-          (filter
-            (name: name != "default.nix" && !hasPrefix "." name)
-            (attrNames (readDir dirPath))));
+          (attrNames
+            (filterAttrs
+              (name: type:
+                (type == "regular" && hasSuffix ".nix" name && name != "default.nix") ||
+                (type == "directory" && !hasPrefix "." name))
+              (readDir dirPath))));
 
     # https://tools.ietf.org/html/rfc5952
     normalize-ip6-addr =
-- 
cgit v1.2.3


From e6863fe8c68ff3ad704b1eef4b71fb4870b83bdf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 9 Dec 2022 00:30:08 +0100
Subject: lib: add isNixDirEntry

---
 lib/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/default.nix b/lib/default.nix
index d65c891a3..ad3a78a04 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -96,11 +96,11 @@ let
           in
             nameValuePair (toPackageName name) (f path))
           (attrNames
-            (filterAttrs
-              (name: type:
-                (type == "regular" && hasSuffix ".nix" name && name != "default.nix") ||
-                (type == "directory" && !hasPrefix "." name))
-              (readDir dirPath))));
+            (filterAttrs isNixDirEntry (readDir dirPath))));
+
+    isNixDirEntry = name: type:
+      (type == "regular" && hasSuffix ".nix" name && name != "default.nix") ||
+      (type == "directory" && !hasPrefix "." name);
 
     # https://tools.ietf.org/html/rfc5952
     normalize-ip6-addr =
-- 
cgit v1.2.3


From 5b579b8fb96c073ddf55935ee1dbb360a22f18b9 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 9 Dec 2022 01:33:39 +0100
Subject: lib: add lib reference

---
 lib/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib')

diff --git a/lib/default.nix b/lib/default.nix
index ad3a78a04..149b97a72 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -194,3 +194,4 @@ let
 in
 
 lib
+// { inherit lib; }
-- 
cgit v1.2.3