Merge remote-tracking branch 'cd/master'

1 files changed, 6 insertions, 16 deletions

diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix
index 49241cc82..c40b9a868 100644
--- a/krebs/4lib/default.nix
+++ b/krebs/4lib/default.nix
@@ -1,19 +1,12 @@
-{ config, lib, ... }:
+_:
 
-with builtins;
-with lib;
-
-let out = import <stockholm/lib> // rec {
-
-  eq = x: y: x == y;
-  ne = x: y: x != y;
+let
+  lib = import <stockholm/lib>;
+in
 
-  mod = x: y: x - y * (x / y);
-
-  addName = name: set:
-    set // { inherit name; };
+with lib;
 
-  addNames = mapAttrs addName;
+let out = lib // rec {
 
   guard = spec@{ type, value, ... }:
     assert isOptionType type;
@@ -26,12 +19,9 @@ let out = import <stockholm/lib> // rec {
       ]));
 
   types = import ./types.nix {
-    inherit config;
     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; };