BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #234930 from NickCao/maddy

Browse source 
maddy: 0.6.3 -> 0.7.0
This commit is contained in:
Nick Cao 2023-05-30 05:16:51 -06:00 committed by GitHub
commit 93ebabefb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nixos/modules/services/mail/maddy.nix
View file

@ -335,12 +335,13 @@ in {
}; };
secrets = lib.mkOption { secrets = lib.mkOption {
type = lib.types.path; type = with types; listOf path;
description = lib.mdDoc '' description = lib.mdDoc ''
A file containing the various secrets. Should be in the format A list of files containing the various secrets. Should be in the format
expected by systemd's `EnvironmentFile` directory. Secrets can be expected by systemd's `EnvironmentFile` directory. Secrets can be
referenced in the format `{env:VAR}`. referenced in the format `{env:VAR}`.
''; '';
default = [ ];
}; };
}; };
@ -379,7 +380,7 @@ in {
User = cfg.user; User = cfg.user;
Group = cfg.group; Group = cfg.group;
StateDirectory = [ "maddy" ]; StateDirectory = [ "maddy" ];
EnvironmentFile = lib.mkIf (cfg.secrets != null) "${cfg.secrets}"; EnvironmentFile = cfg.secrets;
}; };
restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ]; restartTriggers = [ config.environment.etc."maddy/maddy.conf".source ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];

6
pkgs/servers/maddy/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "maddy"; pname = "maddy";
version = "0.6.3"; version = "0.7.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "foxcpp"; owner = "foxcpp";
repo = "maddy"; repo = "maddy";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-vf+jkXerdwvQhtyiOObBRxh8sYMEcgXC5vNzm5wquBs="; sha256 = "sha256-EMw07yTFP0aBSuGDWivB8amuxWLFHhYV6J9faTEW5z4=";
}; };
vendorSha256 = "sha256-10cLNl9jWYX8XIKQkCxJ+/ymZC1YJRHUJWZQhq7zeV4="; vendorSha256 = "sha256-LyfkETZPkhJKN8CEivNp7Se4IBpzyAtmCM1xil4n2po=";
tags = [ "libpam" ]; tags = [ "libpam" ];