diff options
author | Nick Cao <nickcao@nichi.co> | 2024-01-14 14:23:28 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-14 14:23:28 -0500 |
commit | 2443ba38b62e68a79152f49054907247c88087fe (patch) | |
tree | 5e39c2d8d3321a040087213ce7b2fb23d396582d /nixos | |
parent | 205ac6d5d843af7ee69019516e06e3fcf074159a (diff) | |
parent | b3b09c5eb29d1f1fcd6899e2d43252dde4e356a0 (diff) |
Merge pull request #272910 from SuperSandro2000/nullmailer
nixos/nullmailer: be flexible about time related types
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/mail/nullmailer.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix index f6befe246b12a..4fd0026dbe4eb 100644 --- a/nixos/modules/services/mail/nullmailer.nix +++ b/nixos/modules/services/mail/nullmailer.nix @@ -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; }; |