public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14898 from peti/remove-dovecot-package-option

Browse Source 
nixos: remove redundant services.dovecot2.package option
This commit is contained in:
Peter Simons 2016-05-06 10:11:45 +02:00
commit 71c736e34d
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/modules/rename.nix
View File

@ -124,6 +124,7 @@ with lib;
(mkRemovedOptionModule [ "services" "printing" "cupsdConf" ]) (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ])
(mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ]) (mkRemovedOptionModule [ "services" "xserver" "startGnuPGAgent" ])
(mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ]) (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ])
(mkRemovedOptionModule [ "services" "dovecot2" "package" ])
]; ];
} }

12
nixos/modules/services/mail/dovecot.nix
View File

@ -4,7 +4,7 @@ with lib;
let let
cfg = config.services.dovecot2; cfg = config.services.dovecot2;
dovecotPkg = cfg.package; dovecotPkg = pkgs.dovecot;
baseDir = "/run/dovecot2"; baseDir = "/run/dovecot2";
stateDir = "/var/lib/dovecot"; stateDir = "/var/lib/dovecot";
@ -98,13 +98,6 @@ in
description = "Additional listeners to start when Dovecot is enabled."; 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 { user = mkOption {
type = types.str; type = types.str;
default = "dovecot2"; default = "dovecot2";
@ -159,8 +152,7 @@ in
description = '' description = ''
Symlinks the contents of lib/dovecot of every given package into Symlinks the contents of lib/dovecot of every given package into
/etc/dovecot/modules. This will make the given modules available /etc/dovecot/modules. This will make the given modules available
if a dovecot package with the module_dir patch applied (like if a dovecot package with the module_dir patch applied is being used.
pkgs.dovecot22, the default) is being used.
''; '';
}; };