summary refs log tree commit diff
path: root/nixos/modules/services/mail/dovecot.nix
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2016-04-22 17:21:17 +0200
committerPeter Simons <simons@cryp.to>2016-05-06 10:10:06 +0200
commitd270604117d5d80986128059a2f66ebd3ac97159 (patch)
tree7913d77ece823bc3b3b7d15f0a75c0ceb58208d2 /nixos/modules/services/mail/dovecot.nix
parent4e7e1a8fb692db34e83c0b403e3ed0316ef4f602 (diff)
downloadnixpkgs-d270604117d5d80986128059a2f66ebd3ac97159.tar
nixpkgs-d270604117d5d80986128059a2f66ebd3ac97159.tar.gz
nixpkgs-d270604117d5d80986128059a2f66ebd3ac97159.tar.bz2
nixpkgs-d270604117d5d80986128059a2f66ebd3ac97159.tar.lz
nixpkgs-d270604117d5d80986128059a2f66ebd3ac97159.tar.xz
nixpkgs-d270604117d5d80986128059a2f66ebd3ac97159.tar.zst
nixpkgs-d270604117d5d80986128059a2f66ebd3ac97159.zip
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.
Diffstat (limited to 'nixos/modules/services/mail/dovecot.nix')
-rw-r--r--nixos/modules/services/mail/dovecot.nix12
1 files changed, 2 insertions, 10 deletions
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.
       '';
     };