From 1ff38bf6c69fd68cbf4e158a96cd8c97d6cf305d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 16 Mar 2016 01:17:07 +0100
Subject: krebs lib += optionalTrace

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

(limited to 'krebs/4lib/default.nix')

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index deac02bb7..e984614a0 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -17,7 +17,7 @@ let out = rec {
 
   types = import ./types.nix {
     inherit config;
-    lib = lib // { inherit genid; };
+    lib = lib // { inherit genid optionalTrace; };
   };
 
   dir.has-default-nix = path: pathExists (path + "/default.nix");
@@ -44,4 +44,6 @@ let out = rec {
   mapAttrValues = f: mapAttrs (_: f);
   setAttr = name: value: set: set // { ${name} = value; };
 
+  optionalTrace = c: msg: x: if c then trace msg x else x;
+
 }; in out
-- 
cgit v1.2.3


From e6657cd46a6b97153f80006144fe6293f715bb7d Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Wed, 16 Mar 2016 01:52:34 +0100
Subject: krebs lib += getAttrDef

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

(limited to 'krebs/4lib/default.nix')

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index e984614a0..585bd313f 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -41,6 +41,7 @@ let out = rec {
     mapAttrs (name: _: path + "/${name}")
              (filterAttrs (_: eq "directory") (readDir path));
 
+  getAttrDef = name: set: set.${name} or set.default or null;
   mapAttrValues = f: mapAttrs (_: f);
   setAttr = name: value: set: set // { ${name} = value; };
 
-- 
cgit v1.2.3

[cgit] Unable to lock slot /tmp/cgit/0e300000.lock: No such file or directory (2)