diff options
author | tv <tv@shackspace.de> | 2015-10-21 00:08:18 +0200 |
---|---|---|
committer | tv <tv@shackspace.de> | 2015-10-21 00:11:12 +0200 |
commit | 226ea391caec5b3f2f112de263dd2db3a0e012f4 (patch) | |
tree | 4815b67dcf4389d468a931e535164b7b34074f02 /tv | |
parent | fc45cc29265e9b3e51033fddd5d8ea1042c1aa41 (diff) |
stockholm: provide krebs lib
Diffstat (limited to 'tv')
-rw-r--r-- | tv/2configs/test.nix | 2 | ||||
-rw-r--r-- | tv/3modules/consul.nix | 2 | ||||
-rw-r--r-- | tv/4lib/default.nix | 14 |
3 files changed, 6 insertions, 12 deletions
diff --git a/tv/2configs/test.nix b/tv/2configs/test.nix index 409b4e9b4..f5f068d6f 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 e764ab7b2..ccdee07f5 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 106535ba2..7e6b2ab17 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; } |