diff options
author | makefu <github@syntax-fehler.de> | 2015-07-24 23:57:12 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2015-07-24 23:57:12 +0200 |
commit | f338d3d4d15ff29b3048b4f89716a8aa1a19f21b (patch) | |
tree | bb803bdcc4d93141e16e94e417c69ca8b1b3c9f5 /Zpkgs/tv/default.nix | |
parent | a4d2509918c3ce1400071eb0ef2b5421023976ca (diff) | |
parent | 99527e88aec089b4fea496248cf03f738bfed257 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'Zpkgs/tv/default.nix')
-rw-r--r-- | Zpkgs/tv/default.nix | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index e3e12bd1..50625f86 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -2,13 +2,11 @@ let inherit (pkgs) callPackage; + krebs = import ../../Zpkgs/krebs { inherit pkgs; }; in -pkgs // -{ +krebs // { charybdis = callPackage ./charybdis {}; - dic = callPackage ./dic.nix {}; - genid = callPackage ./genid.nix {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; |