summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2015-11-09 02:58:21 +0100
committertv <tv@krebsco.de>2015-11-09 02:58:21 +0100
commitb0094ce0e498b9661de62e472121aaaf5b83c40d (patch)
treec0f8ae81d47d31f2adb83dd8edb91e64a6ee06e7
parentfa48986f3f1358fea0af9bbfe908032ae50c0034 (diff)
stockholm: check if default.nix exists before importing
-rw-r--r--default.nix2
-rw-r--r--krebs/4lib/default.nix2
2 files changed, 3 insertions, 1 deletions
diff --git a/default.nix b/default.nix
index ac748c286..c001b8c13 100644
--- a/default.nix
+++ b/default.nix
@@ -32,7 +32,7 @@ let stockholm = {
upath = lib.nspath current-user-name;
base-module = { config, ... }: {
- imports = builtins.filter builtins.pathExists (lib.concatLists [
+ imports = builtins.filter lib.dir.has-default-nix (lib.concatLists [
(map (f: f "2configs") [ upath ])
(map (f: f "3modules") [ kpath upath ])
]);
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index 396307c22..f907fe871 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -14,6 +14,8 @@ rec {
types = import ./types.nix { inherit lib; };
+ dir.has-default-nix = path: pathExists (path + "/default.nix");
+
dns = import ./dns.nix { inherit lib; };
listset = import ./listset.nix { inherit lib; };
shell = import ./shell.nix { inherit lib; };