diff options
| author | tv <tv@krebsco.de> | 2018-11-30 09:40:53 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-11-30 09:47:26 +0100 |
| commit | 498668488f801d6accb7d7937f958eecc3135ac3 (patch) | |
| tree | 6626c9abb3b336eb4f6161d22d516080ec4eb6a9 | |
| parent | 8d87e4b8909adff80f9b9dd83fe177a3dff8918d (diff) | |
lib: add mapNixDir{,1}
| -rw-r--r-- | jeschli/5pkgs/simple/default.nix | 8 | ||||
| -rw-r--r-- | lib/default.nix | 17 | ||||
| -rw-r--r-- | tv/5pkgs/simple/default.nix | 8 |
3 files changed, 19 insertions, 14 deletions
diff --git a/jeschli/5pkgs/simple/default.nix b/jeschli/5pkgs/simple/default.nix index 1b9d8c2..6ba4fec 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/lib/default.nix b/lib/default.nix index a40225c..7b964b2 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 1b9d8c2..6ba4fec 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 {}) ./. |