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

cleanup redundant text in modules utilizing mkEnableOption

Browse Source 
Closes #59911
This commit is contained in:
Aaron Andersen 2019-04-19 21:41:48 -04:00 committed by Robert Helgesson
parent 297f8c55e5
commit 4a11ce7f26
No known key found for this signature in database
GPG Key ID: 36BDAA14C2797E89
26 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/admin/oxidized.nix
View File

@ -7,7 +7,7 @@ let
in in
{ {
options.services.oxidized = { options.services.oxidized = {
enable = mkEnableOption "the oxidized configuation backup service."; enable = mkEnableOption "the oxidized configuration backup service";
user = mkOption { user = mkOption {
type = types.str; type = types.str;

2
nixos/modules/services/cluster/kubernetes/addon-manager.nix
View File

@ -62,7 +62,7 @@ in
''; '';
}; };
enable = mkEnableOption "Whether to enable Kubernetes addon manager."; enable = mkEnableOption "Kubernetes addon manager";
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager"; kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager";
bootstrapAddonsKubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager bootstrap"; bootstrapAddonsKubeconfig = top.lib.mkKubeConfigOptions "Kubernetes addon manager bootstrap";

2
nixos/modules/services/cluster/kubernetes/controller-manager.nix
View File

@ -28,7 +28,7 @@ in
type = str; type = str;
}; };
enable = mkEnableOption "Kubernetes controller manager."; enable = mkEnableOption "Kubernetes controller manager";
extraOpts = mkOption { extraOpts = mkOption {
description = "Kubernetes controller manager extra command line options."; description = "Kubernetes controller manager extra command line options.";

2
nixos/modules/services/cluster/kubernetes/flannel.nix
View File

@ -23,7 +23,7 @@ in
{ {
###### interface ###### interface
options.services.kubernetes.flannel = { options.services.kubernetes.flannel = {
enable = mkEnableOption "enable flannel networking"; enable = mkEnableOption "flannel networking";
kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes flannel"; kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes flannel";
}; };

2
nixos/modules/services/cluster/kubernetes/pki.nix
View File

@ -39,7 +39,7 @@ in
###### interface ###### interface
options.services.kubernetes.pki = with lib.types; { options.services.kubernetes.pki = with lib.types; {
enable = mkEnableOption "Whether to enable easyCert issuer service."; enable = mkEnableOption "easyCert issuer service";
certs = mkOption { certs = mkOption {
description = "List of certificate specs to feed to cert generator."; description = "List of certificate specs to feed to cert generator.";

2
nixos/modules/services/cluster/kubernetes/proxy.nix
View File

@ -17,7 +17,7 @@ in
type = str; type = str;
}; };
enable = mkEnableOption "Whether to enable Kubernetes proxy."; enable = mkEnableOption "Kubernetes proxy";
extraOpts = mkOption { extraOpts = mkOption {
description = "Kubernetes proxy extra command line options."; description = "Kubernetes proxy extra command line options.";

2
nixos/modules/services/cluster/kubernetes/scheduler.nix
View File

@ -16,7 +16,7 @@ in
type = str; type = str;
}; };
enable = mkEnableOption "Whether to enable Kubernetes scheduler."; enable = mkEnableOption "Kubernetes scheduler";
extraOpts = mkOption { extraOpts = mkOption {
description = "Kubernetes scheduler extra command line options."; description = "Kubernetes scheduler extra command line options.";

2
nixos/modules/services/desktops/gnome3/gnome-settings-daemon.nix
View File

@ -18,7 +18,7 @@ in
services.gnome3.gnome-settings-daemon = { services.gnome3.gnome-settings-daemon = {
enable = mkEnableOption "GNOME Settings Daemon."; enable = mkEnableOption "GNOME Settings Daemon";
# There are many forks of gnome-settings-daemon # There are many forks of gnome-settings-daemon
package = mkOption { package = mkOption {

2
nixos/modules/services/hardware/bluetooth.nix
View File

@ -13,7 +13,7 @@ in {
options = { options = {
hardware.bluetooth = { hardware.bluetooth = {
enable = mkEnableOption "support for Bluetooth."; enable = mkEnableOption "support for Bluetooth";
powerOnBoot = mkOption { powerOnBoot = mkOption {
type = types.bool; type = types.bool;

4
nixos/modules/services/hardware/vdr.nix
View File

@ -12,7 +12,7 @@ in {
options = { options = {
services.vdr = { services.vdr = {
enable = mkEnableOption "enable VDR. Please put config into ${libDir}."; enable = mkEnableOption "VDR. Please put config into ${libDir}";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
@ -34,7 +34,7 @@ in {
description = "Additional command line arguments to pass to VDR."; description = "Additional command line arguments to pass to VDR.";
}; };
enableLirc = mkEnableOption "enable LIRC"; enableLirc = mkEnableOption "LIRC";
}; };
}; };

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

@ -11,7 +11,7 @@ in
options = { options = {
services.mailcatcher = { services.mailcatcher = {
enable = mkEnableOption "Enable MailCatcher."; enable = mkEnableOption "MailCatcher";
http.ip = mkOption { http.ip = mkOption {
type = types.str; type = types.str;

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

@ -7,7 +7,7 @@ let
in { in {
options.services.offlineimap = { options.services.offlineimap = {
enable = mkEnableOption "Offlineimap, a software to dispose your mailbox(es) as a local Maildir(s)."; enable = mkEnableOption "OfflineIMAP, a software to dispose your mailbox(es) as a local Maildir(s)";
install = mkOption { install = mkOption {
type = types.bool; type = types.bool;

2
nixos/modules/services/misc/beanstalkd.nix
View File

@ -12,7 +12,7 @@ in
options = { options = {
services.beanstalkd = { services.beanstalkd = {
enable = mkEnableOption "Enable the Beanstalk work queue."; enable = mkEnableOption "the Beanstalk work queue";
listen = { listen = {
port = mkOption { port = mkOption {

2
nixos/modules/services/misc/sssd.nix
View File

@ -6,7 +6,7 @@ let
in { in {
options = { options = {
services.sssd = { services.sssd = {
enable = mkEnableOption "the System Security Services Daemon."; enable = mkEnableOption "the System Security Services Daemon";
config = mkOption { config = mkOption {
type = types.lines; type = types.lines;

4
nixos/modules/services/networking/i2pd.nix
View File

@ -470,7 +470,7 @@ in
''; '';
}; };
trust.hidden = mkEnableOption "Router concealment."; trust.hidden = mkEnableOption "Router concealment";
websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666; websocket = mkEndpointOpt "websockets" "127.0.0.1" 7666;
@ -478,7 +478,7 @@ in
exploratory.outbound = i2cpOpts "exploratory"; exploratory.outbound = i2cpOpts "exploratory";
ntcp2.enable = mkEnableTrueOption "NTCP2."; ntcp2.enable = mkEnableTrueOption "NTCP2.";
ntcp2.published = mkEnableOption "NTCP2 publication."; ntcp2.published = mkEnableOption "NTCP2 publication";
ntcp2.port = mkOption { ntcp2.port = mkOption {
type = types.int; type = types.int;
default = 0; default = 0;

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

@ -20,7 +20,7 @@ in
services.miredo = { services.miredo = {
enable = mkEnableOption "the Miredo IPv6 tunneling service."; enable = mkEnableOption "the Miredo IPv6 tunneling service";
package = mkOption { package = mkOption {
type = types.package; type = types.package;

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

@ -51,7 +51,7 @@ in
services.monero = { services.monero = {
enable = mkEnableOption "Monero node daemon."; enable = mkEnableOption "Monero node daemon";
mining.enable = mkOption { mining.enable = mkOption {
type = types.bool; type = types.bool;

4
nixos/modules/services/networking/mosquitto.nix
View File

@ -44,7 +44,7 @@ in
options = { options = {
services.mosquitto = { services.mosquitto = {
enable = mkEnableOption "Enable the MQTT Mosquitto broker."; enable = mkEnableOption "the MQTT Mosquitto broker";
host = mkOption { host = mkOption {
default = "127.0.0.1"; default = "127.0.0.1";
@ -65,7 +65,7 @@ in
}; };
ssl = { ssl = {
enable = mkEnableOption "Enable SSL listener."; enable = mkEnableOption "SSL listener";
cafile = mkOption { cafile = mkOption {
type = types.nullOr types.path; type = types.nullOr types.path;

3
nixos/modules/services/networking/namecoind.nix
View File

@ -1,3 +1,4 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
with lib; with lib;
@ -43,7 +44,7 @@ in
services.namecoind = { services.namecoind = {
enable = mkEnableOption "namecoind, Namecoin client."; enable = mkEnableOption "namecoind, Namecoin client";
wallet = mkOption { wallet = mkOption {
type = types.path; type = types.path;

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

@ -3,7 +3,7 @@
in { in {
options.services.nullidentdmod = with types; { options.services.nullidentdmod = with types; {
enable = mkEnableOption "Enable the nullidentdmod identd daemon"; enable = mkEnableOption "the nullidentdmod identd daemon";
userid = mkOption { userid = mkOption {
type = nullOr str; type = nullOr str;

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

@ -5,7 +5,7 @@ with lib;
{ {
options = { options = {
services.toxvpn = { services.toxvpn = {
enable = mkEnableOption "enable toxvpn running on startup"; enable = mkEnableOption "toxvpn running on startup";
localip = mkOption { localip = mkOption {
type = types.string; type = types.string;

2
nixos/modules/services/search/kibana.nix
View File

@ -31,7 +31,7 @@ let
in { in {
options.services.kibana = { options.services.kibana = {
enable = mkEnableOption "enable kibana service"; enable = mkEnableOption "kibana service";
listenAddress = mkOption { listenAddress = mkOption {
description = "Kibana listening host"; description = "Kibana listening host";

2
nixos/modules/services/search/solr.nix
View File

@ -11,7 +11,7 @@ in
{ {
options = { options = {
services.solr = { services.solr = {
enable = mkEnableOption "Enables the solr service."; enable = mkEnableOption "Solr";
# default to the 8.x series not forcing major version upgrade of those on the 7.x series # default to the 8.x series not forcing major version upgrade of those on the 7.x series
package = mkOption { package = mkOption {

2
nixos/modules/services/x11/desktop-managers/gnome3.nix
View File

@ -75,7 +75,7 @@ in {
debug = mkEnableOption "gnome-session debug messages"; debug = mkEnableOption "gnome-session debug messages";
flashback = { flashback = {
enableMetacity = mkEnableOption "Enable the standard GNOME Flashback session with Metacity."; enableMetacity = mkEnableOption "the standard GNOME Flashback session with Metacity";
customSessions = mkOption { customSessions = mkOption {
type = types.listOf (types.submodule { type = types.listOf (types.submodule {

2
nixos/modules/services/x11/display-managers/xpra.nix
View File

@ -33,7 +33,7 @@ in
description = "Authentication to use when connecting to xpra"; description = "Authentication to use when connecting to xpra";
}; };
pulseaudio = mkEnableOption "pulseaudio audio streaming."; pulseaudio = mkEnableOption "pulseaudio audio streaming";
extraOptions = mkOption { extraOptions = mkOption {
description = "Extra xpra options"; description = "Extra xpra options";

2
nixos/modules/tasks/filesystems/btrfs.nix
View File

@ -19,7 +19,7 @@ in
# One could also do regular btrfs balances, but that shouldn't be necessary # One could also do regular btrfs balances, but that shouldn't be necessary
# during normal usage and as long as the filesystems aren't filled near capacity # during normal usage and as long as the filesystems aren't filled near capacity
services.btrfs.autoScrub = { services.btrfs.autoScrub = {
enable = mkEnableOption "Enable regular btrfs scrub"; enable = mkEnableOption "regular btrfs scrub";
fileSystems = mkOption { fileSystems = mkOption {
type = types.listOf types.path; type = types.listOf types.path;