Merge remote-tracking branch 'tv/master'

This commit is contained in:
makefu 2017-11-26 12:53:30 +01:00
commit 65825bd5ce
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 6 additions and 0 deletions

View File

@ -42,6 +42,10 @@ in {
exim_group = ${cfg.group.name} exim_group = ${cfg.group.name}
exim_path = /run/wrappers/bin/exim exim_path = /run/wrappers/bin/exim
spool_directory = ${cfg.user.home} spool_directory = ${cfg.user.home}
# https://lists.exim.org/lurker/message/20171125.034842.d1d75cac.en.html
chunking_advertise_hosts =
${cfg.config} ${cfg.config}
''; '';
systemPackages = [ pkgs.exim ]; systemPackages = [ pkgs.exim ];

View File

@ -52,6 +52,8 @@ with import <stockholm/lib>;
# <stockholm/tv/2configs/xserver/xserver.conf.nix> # <stockholm/tv/2configs/xserver/xserver.conf.nix>
# is derived from `configFile` in: # is derived from `configFile` in:
https://raw.githubusercontent.com/NixOS/nixpkgs/master/nixos/modules/services/x11/xserver.nix https://raw.githubusercontent.com/NixOS/nixpkgs/master/nixos/modules/services/x11/xserver.nix
https://www.rabbitmq.com/changelog.html
]; ];
hooksFile = toFile "hooks.py" '' hooksFile = toFile "hooks.py" ''
import subprocess import subprocess