diff options
| author | lassulus <lass@aidsballs.de> | 2015-07-28 22:37:28 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2015-07-28 23:23:26 +0200 |
| commit | 1cbf3f264ad073bee5766627bcb8364c52c22f9c (patch) | |
| tree | a9c221113531020c777a2923255c737073adde2b /tv | |
| parent | a11b113866705316cdc93eddbf170e2c1236bbc0 (diff) | |
| parent | 1922e43bcc16e110c03c638099a9279e1d2c89a1 (diff) | |
Merge remote-tracking branch 'cd/master' into newmaster2
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 e0a295f..352689a 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 50625f8..7b5d10a 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 {}; |