diff options
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/rename.nix | 1 | ||||
| -rw-r--r-- | nixos/modules/services/mail/dovecot.nix | 12 |
2 files changed, 3 insertions, 10 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 5c4793624e0..2f37f180c7e 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -124,6 +124,7 @@ with lib; (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ]) (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]) (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ]) + (mkRemovedOptionModule [ "services" "dovecot2" "package" ]) ]; } diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 47e374d8edc..f239dda564a 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -4,7 +4,7 @@ with lib; let cfg = config.services.dovecot2; - dovecotPkg = cfg.package; + dovecotPkg = pkgs.dovecot; baseDir = "/run/dovecot2"; stateDir = "/var/lib/dovecot"; @@ -98,13 +98,6 @@ in description = "Additional listeners to start when Dovecot is enabled."; }; - package = mkOption { - type = types.package; - default = pkgs.dovecot; - defaultText = "pkgs.dovecot"; - description = "Dovecot package to use."; - }; - user = mkOption { type = types.str; default = "dovecot2"; @@ -159,8 +152,7 @@ in description = '' Symlinks the contents of lib/dovecot of every given package into /etc/dovecot/modules. This will make the given modules available - if a dovecot package with the module_dir patch applied (like - pkgs.dovecot22, the default) is being used. + if a dovecot package with the module_dir patch applied is being used. ''; }; |