diff options
| author | Silvan Mosberger <infinisil@icloud.com> | 2019-08-08 23:35:52 +0200 |
|---|---|---|
| committer | Silvan Mosberger <infinisil@icloud.com> | 2019-08-08 23:35:52 +0200 |
| commit | 88bb9fa4037c7cda4cb2fb94792d17e44fd55a18 (patch) | |
| tree | 345ed265f87a0029ebd453bc3551e51ec9ea45f7 /nixos/modules/services/mail | |
| parent | 9a44f44d4c0d33775b63ad9dd387fd77f810074e (diff) | |
| download | nixlib-88bb9fa4037c7cda4cb2fb94792d17e44fd55a18.tar nixlib-88bb9fa4037c7cda4cb2fb94792d17e44fd55a18.tar.gz nixlib-88bb9fa4037c7cda4cb2fb94792d17e44fd55a18.tar.bz2 nixlib-88bb9fa4037c7cda4cb2fb94792d17e44fd55a18.tar.lz nixlib-88bb9fa4037c7cda4cb2fb94792d17e44fd55a18.tar.xz nixlib-88bb9fa4037c7cda4cb2fb94792d17e44fd55a18.tar.zst nixlib-88bb9fa4037c7cda4cb2fb94792d17e44fd55a18.zip | |
nixos/modules: Replace all nested types.either's with types.oneOf's
Diffstat (limited to 'nixos/modules/services/mail')
| -rw-r--r-- | nixos/modules/services/mail/davmail.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/postfix.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/rspamd.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/mail/rss2email.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/nixos/modules/services/mail/davmail.nix b/nixos/modules/services/mail/davmail.nix index 5b5cc294e5c7..374a3dd75c1c 100644 --- a/nixos/modules/services/mail/davmail.nix +++ b/nixos/modules/services/mail/davmail.nix @@ -7,7 +7,7 @@ let cfg = config.services.davmail; configType = with types; - either (either (attrsOf configType) str) (either int bool) // { + oneOf [ (attrsOf configType) str int bool ] // { description = "davmail config type (str, int, bool or attribute set thereof)"; }; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index dab1b29aa4be..2b08ab1e6aa6 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -447,7 +447,7 @@ in }; config = mkOption { - type = with types; attrsOf (either bool (either str (listOf str))); + type = with types; attrsOf (oneOf [ bool str (listOf str) ]); description = '' The main.cf configuration file as key value set. ''; diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 5541b8b79b7e..e59d5715de05 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -331,7 +331,7 @@ in }; config = mkOption { - type = with types; attrsOf (either bool (either str (listOf str))); + type = with types; attrsOf (oneOf [ bool str (listOf str) ]); description = '' Addon to postfix configuration ''; diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index a123736005ab..df454abc8267 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -30,7 +30,7 @@ in { }; config = mkOption { - type = with types; attrsOf (either str (either int bool)); + type = with types; attrsOf (oneOf [ str int bool ]); default = {}; description = '' The configuration to give rss2email. |