diff options
| author | lassulus <lass@aidsballs.de> | 2015-07-27 10:09:13 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-07-27 10:09:13 +0200 |
| commit | bfc33453e972d643a5f78187812add30550c8f3f (patch) | |
| tree | f2c86d609106856ef92c605dc11da222132d1aaa /Zpkgs/tv/default.nix | |
| parent | 09031485dcea56d5207f7c668c5cec6830a588d5 (diff) | |
| parent | dc9b0d7ce100c1286353e1ce3a8b11c42e48738d (diff) | |
Merge branch 'tv' into master
Diffstat (limited to 'Zpkgs/tv/default.nix')
| -rw-r--r-- | Zpkgs/tv/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/Zpkgs/tv/default.nix b/Zpkgs/tv/default.nix index fa9fff8..50625f8 100644 --- a/Zpkgs/tv/default.nix +++ b/Zpkgs/tv/default.nix @@ -2,15 +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 {}; - github-hosts-sync = callPackage ./github-hosts-sync.nix {}; - github-known_hosts = callPackage ./github-known_hosts.nix {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; viljetic-pages = callPackage ./viljetic-pages {}; |