diff options
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 409b4e9..f5f068d 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 e764ab7..ccdee07 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 106535b..7e6b2ab 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;  }  | 
