diff options
| author | lassulus <lassulus@lassul.us> | 2017-10-01 17:54:06 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2017-10-01 17:54:06 +0200 |
| commit | d7f65ea679866f24e4ca52b51bd6f068a6b38195 (patch) | |
| tree | 6a09e7cc2a4c9af0507bdc189652c78832a2f952 /tv/3modules/default.nix | |
| parent | d973c779eb71749af464edb1ed0216b0d5317eb2 (diff) | |
| parent | e62f376e6177f3efb0e0bcd3aad97a991c3b6d60 (diff) | |
Merge branch 'master' into staging/17.09
Diffstat (limited to 'tv/3modules/default.nix')
| -rw-r--r-- | tv/3modules/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tv/3modules/default.nix b/tv/3modules/default.nix index 83dc212a6..493cc8b72 100644 --- a/tv/3modules/default.nix +++ b/tv/3modules/default.nix @@ -1,11 +1,10 @@ -_: - { imports = [ ./charybdis ./ejabberd ./hosts.nix ./iptables.nix + ./nixpkgs-overlays.nix ./x0vncserver.nix ]; } |