diff options
-rw-r--r-- | krebs/4lib/default.nix | 6 | ||||
-rw-r--r-- | krebs/4lib/git.nix (renamed from tv/4lib/git.nix) | 0 | ||||
-rw-r--r-- | krebs/5pkgs/git-hooks/default.nix (renamed from tv/5pkgs/git-hooks/default.nix) | 0 | ||||
-rw-r--r-- | tv/4lib/default.nix | 2 | ||||
-rw-r--r-- | tv/5pkgs/default.nix | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/krebs/4lib/default.nix b/krebs/4lib/default.nix index 3f27ea891..1cabeae27 100644 --- a/krebs/4lib/default.nix +++ b/krebs/4lib/default.nix @@ -3,7 +3,7 @@ with builtins; with lib; -rec { +let out = rec { eq = x: y: x == y; @@ -17,6 +17,7 @@ rec { dir.has-default-nix = path: pathExists (path + "/default.nix"); dns = import ./dns.nix { inherit lib; }; + git = import ./git.nix { lib = lib // out; }; listset = import ./listset.nix { inherit lib; }; shell = import ./shell.nix { inherit lib; }; tree = import ./tree.nix { inherit lib; }; @@ -33,4 +34,5 @@ rec { mapAttrValues = f: mapAttrs (_: f); setAttr = name: value: set: set // { ${name} = value; }; -} + +}; in out diff --git a/tv/4lib/git.nix b/krebs/4lib/git.nix index d50ba2018..d50ba2018 100644 --- a/tv/4lib/git.nix +++ b/krebs/4lib/git.nix diff --git a/tv/5pkgs/git-hooks/default.nix b/krebs/5pkgs/git-hooks/default.nix index 5697c31be..5697c31be 100644 --- a/tv/5pkgs/git-hooks/default.nix +++ b/krebs/5pkgs/git-hooks/default.nix diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix index ebf2d34a4..86e14dfbc 100644 --- a/tv/4lib/default.nix +++ b/tv/4lib/default.nix @@ -1,8 +1,6 @@ { lib, ... }: { - git = import ./git.nix { inherit lib; }; - # TODO deprecate shell-escape for lass shell-escape = lib.shell.escape; } diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 0f4274025..2108d972c 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -12,7 +12,6 @@ "%@" ''; ff = pkgs.callPackage ./ff {}; - git-hooks = pkgs.callPackage ./git-hooks {}; viljetic-pages = pkgs.callPackage ./viljetic-pages {}; xmonad-tv = let src = pkgs.writeNixFromCabal "xmonad-tv.nix" ./xmonad-tv; in |