diff options
author | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
---|---|---|
committer | makefu <github@syntax-fehler.de> | 2016-10-24 14:14:58 +0200 |
commit | 36cbb3d300eb18330a62ba20e35f80d515f5bc5f (patch) | |
tree | dedf23acdc5763b59b5853b07dd297b88fb15636 /tv/3modules/charybdis | |
parent | 3fa63a4f312a885d353177db911f8a52ce7a1e1c (diff) | |
parent | 08c7671fc51270e582e16cbe49aa896f8bff7685 (diff) |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/3modules/charybdis')
-rw-r--r-- | tv/3modules/charybdis/config.nix | 2 | ||||
-rw-r--r-- | tv/3modules/charybdis/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tv/3modules/charybdis/config.nix b/tv/3modules/charybdis/config.nix index 1b160926c..5812516f1 100644 --- a/tv/3modules/charybdis/config.nix +++ b/tv/3modules/charybdis/config.nix @@ -1,4 +1,4 @@ -{ config, ... }: with config.krebs.lib; let +{ config, ... }: with import <stockholm/lib>; let cfg = config.tv.charybdis; in toFile "charybdis.conf" '' /* doc/example.conf - brief example configuration file diff --git a/tv/3modules/charybdis/default.nix b/tv/3modules/charybdis/default.nix index 3af971cd4..859dc122c 100644 --- a/tv/3modules/charybdis/default.nix +++ b/tv/3modules/charybdis/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }@args: with config.krebs.lib; let +{ config, lib, pkgs, ... }@args: with import <stockholm/lib>; let cfg = config.tv.charybdis; in { options.tv.charybdis = { |