diff options
| author | makefu <github@syntax-fehler.de> | 2015-07-29 14:56:06 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2015-07-29 14:56:06 +0200 |
| commit | 0bf2b871dda30231443324588ab8142e125e9774 (patch) | |
| tree | 0646d45eab135eb2c7d8665c31d7ac135e29afff /tv | |
| parent | 671710c573980d859cb82993cd0514058a63262f (diff) | |
| parent | 1bf670270c1e87900a908f7e9b949b5502158f4f (diff) | |
merge cloudkrebs, fix path to krebs/4lib
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/4lib/default.nix | 2 | ||||
| -rw-r--r-- | tv/5pkgs/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tv/4lib/default.nix b/tv/4lib/default.nix index e0a295f17..352689af4 100644 --- a/tv/4lib/default.nix +++ b/tv/4lib/default.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: let - krebs = import ../../4lib/krebs { inherit lib; }; + krebs = import ../../krebs/4lib { inherit lib; }; in with krebs; diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 50625f868..7b5d10a60 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -2,10 +2,10 @@ let inherit (pkgs) callPackage; - krebs = import ../../Zpkgs/krebs { inherit pkgs; }; + kpkgs = import ../../krebs/5pkgs { inherit pkgs; }; in -krebs // { +kpkgs // { charybdis = callPackage ./charybdis {}; lentil = callPackage ./lentil {}; much = callPackage ./much.nix {}; |