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

nixos: correct improper uses of mkEnableOption, clarify service descriptions

Browse Source 
Several service definitions used `mkEnableOption` with text starting
with "Whether to", which produced funny option descriptions like
"Whether to enable Whether to run the rspamd daemon..".

This commit corrects this, and adds short descriptions of services
to affected service definitions.
This commit is contained in:
Pavel Goran 2018-10-05 13:14:45 +07:00
parent 89beaef64d
commit 858b263bf0
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/krb5/default.nix
View File

@ -79,7 +79,7 @@ in {
options = {
krb5 = {
enable = mkEnableOption "Whether to enable Kerberos V.";
enable = mkEnableOption "building krb5.conf, configuration file for Kerberos V";
kerberos = mkOption {
type = types.package;

2
nixos/modules/services/mail/rspamd.nix
View File

@ -159,7 +159,7 @@ in
services.rspamd = {
enable = mkEnableOption "Whether to run the rspamd daemon.";
enable = mkEnableOption "rspamd, the Rapid spam filtering system";
debug = mkOption {
type = types.bool;

2
nixos/modules/services/networking/pptpd.nix
View File

@ -5,7 +5,7 @@ with lib;
{
options = {
services.pptpd = {
enable = mkEnableOption "Whether pptpd should be run on startup.";
enable = mkEnableOption "pptpd, the Point-to-Point Tunneling Protocol daemon";
serverIp = mkOption {
type = types.string;

2
nixos/modules/services/networking/xl2tpd.nix
View File

@ -5,7 +5,7 @@ with lib;
{
options = {
services.xl2tpd = {
enable = mkEnableOption "Whether xl2tpd should be run on startup.";
enable = mkEnableOption "xl2tpd, the Layer 2 Tunnelling Protocol Daemon";
serverIp = mkOption {
type = types.string;

2
nixos/modules/services/networking/xrdp.nix
View File

@ -36,7 +36,7 @@ in
services.xrdp = {
enable = mkEnableOption "Whether xrdp should be run on startup.";
enable = mkEnableOption "xrdp, the Remote Desktop Protocol server";
package = mkOption {
type = types.package;

2
nixos/modules/services/system/saslauthd.nix
View File

@ -16,7 +16,7 @@ in
services.saslauthd = {
enable = mkEnableOption "Whether to enable the Cyrus SASL authentication daemon.";
enable = mkEnableOption "saslauthd, the Cyrus SASL authentication daemon";
package = mkOption {
default = pkgs.cyrus_sasl.bin;

2
nixos/modules/virtualisation/xe-guest-utilities.nix
View File

@ -5,7 +5,7 @@ let
in {
options = {
services.xe-guest-utilities = {
enable = mkEnableOption "Whether to enable the Xen guest utilities daemon.";
enable = mkEnableOption "the Xen guest utilities daemon";
};
};
config = mkIf cfg.enable {