From 3ce57c3de3f3dc95669d3a0564f6f7d0ff425321 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Wed, 21 Oct 2015 00:08:18 +0200
Subject: stockholm: provide krebs lib

---
 tv/2configs/test.nix   |  2 +-
 tv/3modules/consul.nix |  2 +-
 tv/4lib/default.nix    | 14 ++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'tv')

diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix
index 409b4e9b..f5f068d6 100644
--- a/tv/2configs/test.nix
+++ b/tv/2configs/test.nix
@@ -1,6 +1,6 @@
 { config, lib, pkgs, ... }:
 
-with import ../4lib { inherit lib pkgs; };
+with lib;
 
 let
   out = {
diff --git a/tv/3modules/consul.nix b/tv/3modules/consul.nix
index e764ab7b..ccdee07f 100644
--- a/tv/3modules/consul.nix
+++ b/tv/3modules/consul.nix
@@ -5,7 +5,7 @@
 # TODO consul-bootstrap HOST  that actually does is
 # TODO tools to inspect state of a cluster in outage state
 
-with import ../4lib { inherit lib pkgs; };
+with lib;
 let
   cfg = config.tv.consul;
 
diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix
index 106535ba..7e6b2ab1 100644
--- a/tv/4lib/default.nix
+++ b/tv/4lib/default.nix
@@ -1,20 +1,14 @@
 { lib, pkgs, ... }:
 
-let
-  krebs = import ../../krebs/4lib { inherit lib; };
-in
-
-with krebs;
-
-krebs // rec {
+lib // rec {
 
   git = import ./git.nix {
-    lib = krebs;
-    inherit pkgs;
+    inherit lib pkgs;
   };
 
   # "7.4.335" -> "74"
   majmin = with lib; x : concatStrings (take 2 (splitString "." x));
 
-  shell-escape = krebs.shell.escape;
+  # TODO deprecate shell-escape for lass
+  shell-escape = lib.shell.escape;
 }
-- 
cgit v1.2.3