summaryrefslogtreecommitdiffstats
path: root/tv/4lib
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2015-10-23 15:38:01 +0200
committermakefu <github@syntax-fehler.de>2015-10-23 15:38:01 +0200
commita1d05482e5527d32baef9d9343b900dee8d46694 (patch)
tree2de3ac509481799f6188620987cdf1678ea675a5 /tv/4lib
parent709ebf6bbcc2e0d4644ed35cd42db47c4f2e78c5 (diff)
parent93dcfe5ad61903f90f422d9d6c97e499b240aa86 (diff)
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'tv/4lib')
-rw-r--r--tv/4lib/default.nix14
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;
}