diff options
| author | lassulus <lass@aidsballs.de> | 2016-10-20 21:19:26 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-10-20 21:19:26 +0200 |
| commit | 5cfe3f414097a16dfa84cd52739689e08b7fa0b3 (patch) | |
| tree | 81ef0820be1d91961f18f2e75e2d9172bf865093 /tv/3modules | |
| parent | 51a9fb2dccf6996e1f4fe6f795076ebc6bc71d25 (diff) | |
| parent | f47bab7f710b7c8a282c3a3c38affc8a0bc30cc9 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'tv/3modules')
| -rw-r--r-- | tv/3modules/charybdis/config.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/charybdis/default.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/ejabberd/config.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/ejabberd/default.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/hosts.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/iptables.nix | 2 |
6 files changed, 6 insertions, 6 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 = { diff --git a/tv/3modules/ejabberd/config.nix b/tv/3modules/ejabberd/config.nix index 49bded855..29c38fbe4 100644 --- a/tv/3modules/ejabberd/config.nix +++ b/tv/3modules/ejabberd/config.nix @@ -1,4 +1,4 @@ -{ config, ... }: with config.krebs.lib; let +{ config, ... }: with import <stockholm/lib>; let cfg = config.tv.ejabberd; # XXX this is a placeholder that happens to work the default strings. diff --git a/tv/3modules/ejabberd/default.nix b/tv/3modules/ejabberd/default.nix index 95ea24be1..4d3493d78 100644 --- a/tv/3modules/ejabberd/default.nix +++ b/tv/3modules/ejabberd/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.ejabberd; in { options.tv.ejabberd = { diff --git a/tv/3modules/hosts.nix b/tv/3modules/hosts.nix index 7bf3267c7..118740510 100644 --- a/tv/3modules/hosts.nix +++ b/tv/3modules/hosts.nix @@ -1,6 +1,6 @@ { config, ... }: -with config.krebs.lib; +with import <stockholm/lib>; { options.tv.hosts = mkOption { diff --git a/tv/3modules/iptables.nix b/tv/3modules/iptables.nix index 4b1d1ef87..7276726ca 100644 --- a/tv/3modules/iptables.nix +++ b/tv/3modules/iptables.nix @@ -1,6 +1,6 @@ { config, lib, pkgs, ... }: -with config.krebs.lib; +with import <stockholm/lib>; let cfg = config.tv.iptables; |