diff options
author | makefu <github@syntax-fehler.de> | 2015-10-27 18:12:29 +0100 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-10-27 18:12:29 +0100 |
commit | a85114c59c5102b839584f72454bca2c8abbb887 (patch) | |
tree | 18fc24394171f4afae3dee0e68e3781df75723ea /tv/4lib | |
parent | fe4f5b98b91f6bacb036d57b5322fb4e09c22f14 (diff) | |
parent | 20ad77468131b7c69c5b3a26ea149ae7fdc0173b (diff) |
Merge branch 'master' of pnp:stockholm
Diffstat (limited to 'tv/4lib')
-rw-r--r-- | tv/4lib/default.nix | 14 |
1 files changed, 4 insertions, 10 deletions
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; } |