diff options
| author | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
|---|---|---|
| committer | Maxim Cournoyer <[email protected]> | 2022-01-25 22:07:13 -0500 |
| commit | 1a5302435ff0d2822b823f5a6fe01faa7a85c629 (patch) | |
| tree | ac7810c88b560532f22d2bab2e59609cd7305c21 /gnu/services/mail.scm | |
| parent | 3ff2ac4980dacf10087e4b42bd9fbc490591900c (diff) | |
| parent | 070b8a893febd6e7d8b2b7c8c4dcebacf7845aa9 (diff) | |
Merge branch 'master' into staging.
With "conflicts" solved (all in favor of master except git) in:
gnu/local.mk
gnu/packages/databases.scm
gnu/packages/glib.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/gnuzilla.scm
gnu/packages/graphics.scm
gnu/packages/gstreamer.scm
gnu/packages/gtk.scm
gnu/packages/linux.scm
gnu/packages/machine-learning.scm
gnu/packages/networking.scm
gnu/packages/polkit.scm
gnu/packages/pulseaudio.scm
gnu/packages/rpc.scm
gnu/packages/rust.scm
gnu/packages/version-control.scm
gnu/packages/w3m.scm
Diffstat (limited to 'gnu/services/mail.scm')
| -rw-r--r-- | gnu/services/mail.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index 72dc123f41..4ad6ddb534 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -498,7 +498,7 @@ as @code{#t}.)") (define-configuration dovecot-configuration (dovecot - (package dovecot) + (file-like dovecot) "The dovecot package.") (listen @@ -1472,7 +1472,7 @@ greyed out, instead of only later giving \"not selectable\" popup error. (define-configuration opaque-dovecot-configuration (dovecot - (package dovecot) + (file-like dovecot) "The dovecot package.") (string @@ -1764,7 +1764,7 @@ match from local for any action outbound (define-record-type* <exim-configuration> exim-configuration make-exim-configuration exim-configuration? - (package exim-configuration-package ;<package> + (package exim-configuration-package ;file-like (default exim)) (config-file exim-configuration-config-file ;file-like (default #f))) |