nixos: remove redundant services.dovecot2.package option

Instead of using this option, please modify the dovecot package by means of an
override. For example:

nixpkgs.config.packageOverrides = super: {
dovecot = super.dovecot.override { withPgSQL = true; };
};

Closes https://github.com/NixOS/nixpkgs/issues/14097.

+3 -10
+1
nixos/modules/rename.nix
··· 124 124 (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ]) 125 125 (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]) 126 126 (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ]) 127 + (mkRemovedOptionModule [ "services" "dovecot2" "package" ]) 127 128 128 129 ]; 129 130 }
+2 -10
nixos/modules/services/mail/dovecot.nix
··· 4 4 5 5 let 6 6 cfg = config.services.dovecot2; 7 - dovecotPkg = cfg.package; 7 + dovecotPkg = pkgs.dovecot; 8 8 9 9 baseDir = "/run/dovecot2"; 10 10 stateDir = "/var/lib/dovecot"; ··· 98 98 description = "Additional listeners to start when Dovecot is enabled."; 99 99 }; 100 100 101 - package = mkOption { 102 - type = types.package; 103 - default = pkgs.dovecot; 104 - defaultText = "pkgs.dovecot"; 105 - description = "Dovecot package to use."; 106 - }; 107 - 108 101 user = mkOption { 109 102 type = types.str; 110 103 default = "dovecot2"; ··· 159 152 description = '' 160 153 Symlinks the contents of lib/dovecot of every given package into 161 154 /etc/dovecot/modules. This will make the given modules available 162 - if a dovecot package with the module_dir patch applied (like 163 - pkgs.dovecot22, the default) is being used. 155 + if a dovecot package with the module_dir patch applied is being used. 164 156 ''; 165 157 }; 166 158