From 5f0b1b803500f468a1d60217cc0fc81bb8fd58aa Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Fri, 30 Nov 2018 09:40:53 +0100
Subject: lib: add mapNixDir{,1}

---
 jeschli/5pkgs/simple/default.nix |  8 +-------
 krebs/5pkgs/haskell/default.nix  |  9 +--------
 krebs/5pkgs/simple/default.nix   |  8 +-------
 lib/default.nix                  | 17 +++++++++++++++++
 tv/5pkgs/simple/default.nix      |  8 +-------
 5 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/jeschli/5pkgs/simple/default.nix b/jeschli/5pkgs/simple/default.nix
index 1b9d8c23..6ba4fec8 100644
--- a/jeschli/5pkgs/simple/default.nix
+++ b/jeschli/5pkgs/simple/default.nix
@@ -15,10 +15,4 @@ let
     else override;
 in
 
-  listToAttrs
-    (map
-      (name: nameValuePair (removeSuffix ".nix" name)
-                           (callPackage (./. + "/${name}") {}))
-      (filter
-        (name: name != "default.nix" && !hasPrefix "." name)
-        (attrNames (readDir ./.))))
+  mapNixDir (path: callPackage path {}) ./.
diff --git a/krebs/5pkgs/haskell/default.nix b/krebs/5pkgs/haskell/default.nix
index 7cdf65ea..e824699f 100644
--- a/krebs/5pkgs/haskell/default.nix
+++ b/krebs/5pkgs/haskell/default.nix
@@ -1,13 +1,6 @@
 with import <stockholm/lib>;
 let
-  overrides = self: super:
-    listToAttrs
-      (map
-        (name: nameValuePair (removeSuffix ".nix" name)
-                             (self.callPackage (./. + "/${name}") {}))
-        (filter
-          (name: name != "default.nix" && !hasPrefix "." name)
-          (attrNames (readDir ./.))));
+  overrides = self: super: mapNixDir (path: self.callPackage path {}) ./.;
 in
 self: super:
 {
diff --git a/krebs/5pkgs/simple/default.nix b/krebs/5pkgs/simple/default.nix
index 1b9d8c23..6ba4fec8 100644
--- a/krebs/5pkgs/simple/default.nix
+++ b/krebs/5pkgs/simple/default.nix
@@ -15,10 +15,4 @@ let
     else override;
 in
 
-  listToAttrs
-    (map
-      (name: nameValuePair (removeSuffix ".nix" name)
-                           (callPackage (./. + "/${name}") {}))
-      (filter
-        (name: name != "default.nix" && !hasPrefix "." name)
-        (attrNames (readDir ./.))))
+  mapNixDir (path: callPackage path {}) ./.
diff --git a/lib/default.nix b/lib/default.nix
index a40225c4..7b964b22 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -44,6 +44,23 @@ let
 
     indent = replaceChars ["\n"] ["\n  "];
 
+    mapNixDir = f: x: {
+      list = foldl' mergeAttrs {} (map (mapNixDir1 f) x);
+      path = mapNixDir1 f x;
+    }.${typeOf x};
+
+    mapNixDir1 = f: dirPath:
+      listToAttrs
+        (map
+          (relPath: let
+            name = removeSuffix ".nix" relPath;
+            path = dirPath + "/${relPath}";
+          in
+            nameValuePair name (f path))
+          (filter
+            (name: name != "default.nix" && !hasPrefix "." name)
+            (attrNames (readDir dirPath))));
+
     # https://tools.ietf.org/html/rfc5952
     normalize-ip6-addr =
       let
diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix
index 1b9d8c23..6ba4fec8 100644
--- a/tv/5pkgs/simple/default.nix
+++ b/tv/5pkgs/simple/default.nix
@@ -15,10 +15,4 @@ let
     else override;
 in
 
-  listToAttrs
-    (map
-      (name: nameValuePair (removeSuffix ".nix" name)
-                           (callPackage (./. + "/${name}") {}))
-      (filter
-        (name: name != "default.nix" && !hasPrefix "." name)
-        (attrNames (readDir ./.))))
+  mapNixDir (path: callPackage path {}) ./.
-- 
cgit v1.2.3