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 | 54a01c0c74bdd4233962d62c4e6631f7f8b50f77 (patch) | |
| tree | 705a3f8307b49e52bd95ecac8cd6d6ca828921a4 /Zpkgs/tv/default.nix | |
| parent | 6476abd6ac7e000d0759569a1e2754acb2f518ca (diff) | |
| parent | 3197897292f0fc8f38d30ad6ddc9742be4a7cc1d (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 fa9fff84c..50625f868 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 {}; |