colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #272910 from SuperSandro2000/nullmailer

Browse Source 
nixos/nullmailer: be flexible about time related types
This commit is contained in:
Nick Cao 2024-01-14 14:23:28 -05:00 committed by GitHub
commit 2443ba38b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/modules/services/mail/nullmailer.nix
View File

@ -120,7 +120,7 @@ with lib;
};
maxpause = mkOption {
type = types.nullOr types.str;
type = with types; nullOr (oneOf [ str int ]);
default = null;
description = lib.mdDoc ''
The maximum time to pause between successive queue runs, in seconds.
@ -138,7 +138,7 @@ with lib;
};
pausetime = mkOption {
type = types.nullOr types.str;
type = with types; nullOr (oneOf [ str int ]);
default = null;
description = lib.mdDoc ''
The minimum time to pause between successive queue runs when there
@ -168,7 +168,7 @@ with lib;
};
sendtimeout = mkOption {
type = types.nullOr types.str;
type = with types; nullOr (oneOf [ str int ]);
default = null;
description = lib.mdDoc ''
The time to wait for a remote module listed above to complete sending
@ -194,7 +194,7 @@ with lib;
environment = {
systemPackages = [ pkgs.nullmailer ];
etc = let
validAttrs = filterAttrs (name: value: value != null) cfg.config;
validAttrs = lib.mapAttrs (_: toString) (filterAttrs (_: value: value != null) cfg.config);
in
(foldl' (as: name: as // { "nullmailer/${name}".text = validAttrs.${name}; }) {} (attrNames validAttrs))
// optionalAttrs (cfg.remotesFile != null) { "nullmailer/remotes".source = cfg.remotesFile; };