From b0094ce0e498b9661de62e472121aaaf5b83c40d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Mon, 9 Nov 2015 02:58:21 +0100
Subject: stockholm: check if default.nix exists before importing

---
 default.nix            | 2 +-
 krebs/4lib/default.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index ac748c28..c001b8c1 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 396307c2..f907fe87 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; };
-- 
cgit v1.2.3