diff options
| author | makefu <github@syntax-fehler.de> | 2019-06-28 22:02:41 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2019-06-28 22:02:41 +0200 |
| commit | 1ba49c0ffe299bc1f6ba56e1449e0c8e65cd8923 (patch) | |
| tree | 7b8f5dc21a76bc80043febe5251f6a1a0e35d4be /tv | |
| parent | 4ecfee1606645c14dc258c34e087342306f698b5 (diff) | |
| parent | 1d23dceb5d2c536790a00fcde30743b958f1018f (diff) | |
Merge remote-tracking branch 'lass/master'
Diffstat (limited to 'tv')
| -rw-r--r-- | tv/2configs/exim-retiolum.nix | 1 | ||||
| -rw-r--r-- | tv/5pkgs/vim/nix.nix | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/tv/2configs/exim-retiolum.nix b/tv/2configs/exim-retiolum.nix index 8b34b16cf..3d4ada46b 100644 --- a/tv/2configs/exim-retiolum.nix +++ b/tv/2configs/exim-retiolum.nix @@ -7,5 +7,6 @@ with import <stockholm/lib>; pkgs.eximlog ]; krebs.exim-retiolum.enable = true; + krebs.exim-retiolum.rspamd.enable = config.krebs.build.host.name == "nomic"; tv.iptables.input-retiolum-accept-tcp = singleton "smtp"; } diff --git a/tv/5pkgs/vim/nix.nix b/tv/5pkgs/vim/nix.nix index a58a45b2d..747ab0bc0 100644 --- a/tv/5pkgs/vim/nix.nix +++ b/tv/5pkgs/vim/nix.nix @@ -130,6 +130,7 @@ with import <stockholm/lib>; c = {}; cabal = {}; diff = {}; + exim = {}; haskell = {}; jq.extraStart = alts [ (writer "Jq") |