Commit 6f9f9833 authored by Izorkin's avatar Izorkin
Browse files

dovecot: remove option modules

parent a6a9bb97

nixos/doc/manual/release-notes/rl-2505.section.md

+2 −0
Original line number Diff line number Diff line
@@ -561,6 +561,8 @@ 


- In `dovecot` package removed hard coding path to module directory.



- `services.dovecot2.modules` have been removed, now need to use `environment.systemPackages` to load additional Dovecot modules.



- `services.kmonad` now creates a determinate symlink (in `/dev/input/by-id/`) to each of KMonad virtual devices.



- `services.gitea` now supports CAPTCHA usage through the `services.gitea.captcha` variable.

nixos/modules/services/mail/dovecot.nix

+6 −10
Original line number Diff line number Diff line
@@ -274,6 +274,11 @@ in 
{

  imports = [

    (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")

    (mkRemovedOptionModule [

      "services"

      "dovecot2"

      "modules"

    ] "Now need to use `environment.systemPackages` to load additional Dovecot modules")

    (mkRenamedOptionModule

      [ "services" "dovecot2" "sieveScripts" ]

      [ "services" "dovecot2" "sieve" "scripts" ]
@@ -403,15 +408,6 @@ in 
        default = true;

      };



    modules = mkOption {

      type = types.listOf types.package;

      default = [ ];

      example = literalExpression "[ pkgs.dovecot_pigeonhole ]";

      description = ''

        Load extended modules.

      '';

    };



    sslCACert = mkOption {

      type = types.nullOr types.str;

      default = null;
@@ -758,7 +754,7 @@ in 
        '';

    };



    environment.systemPackages = [ dovecotPkg ] ++ cfg.modules;

    environment.systemPackages = [ dovecotPkg ];



    warnings = warnAboutExtraConfigCollisions;