From 6c71792b6d22c7564b187fa6891fb8d36270a9ef Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Oct 2016 21:49:50 +0200
Subject: krebs lib: with lib

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

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

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index 49241cc82..c901a1bde 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -1,9 +1,12 @@
-{ config, lib, ... }:
+_:
+
+let
+  lib = import <stockholm/lib>;
+in
 
-with builtins;
 with lib;
 
-let out = import <stockholm/lib> // rec {
+let out = lib // rec {
 
   eq = x: y: x == y;
   ne = x: y: x != y;
-- 
cgit v1.2.3


From 9cb65273b1e832f1bf7d98e977a0179c81d24b44 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Oct 2016 21:01:22 +0200
Subject: lib: remove addName*

---
 krebs/4lib/default.nix | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index c901a1bde..cf5395039 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -13,11 +13,6 @@ let out = lib // rec {
 
   mod = x: y: x - y * (x / y);
 
-  addName = name: set:
-    set // { inherit name; };
-
-  addNames = mapAttrs addName;
-
   guard = spec@{ type, value, ... }:
     assert isOptionType type;
     if type.check value
-- 
cgit v1.2.3


From b4ec1fba50dc81df89cce88808dab1e232806cf4 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Oct 2016 21:06:43 +0200
Subject: lib: inline has-default-nix

---
 krebs/4lib/default.nix | 2 --
 1 file changed, 2 deletions(-)

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

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index cf5395039..b95564f74 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -28,8 +28,6 @@ let out = lib // rec {
     lib = lib // { inherit genid optionalTrace; };
   };
 
-  dir.has-default-nix = path: pathExists (path + "/default.nix");
-
   genid = import ./genid.nix { lib = lib // out; };
   genid_signed = x: ((genid x) + 16777216) / 2;
   git = import ./git.nix { lib = lib // out; };
-- 
cgit v1.2.3


From 1a5f52234e4a21f21eb198ed0bffeb7dc2168bdf Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Oct 2016 21:18:40 +0200
Subject: krebs lib: move {eq,ne,mod} to lib

---
 krebs/4lib/default.nix | 5 -----
 1 file changed, 5 deletions(-)

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

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index b95564f74..3f224edd1 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -8,11 +8,6 @@ with lib;
 
 let out = lib // rec {
 
-  eq = x: y: x == y;
-  ne = x: y: x != y;
-
-  mod = x: y: x - y * (x / y);
-
   guard = spec@{ type, value, ... }:
     assert isOptionType type;
     if type.check value
-- 
cgit v1.2.3


From b7cba0244358beb61aaab135cbe62c331ab6c900 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 13 Oct 2016 21:49:04 +0200
Subject: lib: don't define defaults that require config

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

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

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index 3f224edd1..c40b9a868 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -19,7 +19,6 @@ let out = lib // rec {
       ]));
 
   types = import ./types.nix {
-    inherit config;
     lib = lib // { inherit genid optionalTrace; };
   };
 
-- 
cgit v1.2.3