Some more type cleanup

This commit is contained in:
Eelco Dolstra 2015-06-15 18:18:46 +02:00
parent c63bc92d4c
commit 6e6a96d42c
28 changed files with 33 additions and 33 deletions

View File

@ -63,7 +63,7 @@ in
description = ''
A list of profiles used to setup the global environment.
'';
type = types.listOf types.string;
type = types.listOf types.str;
};
environment.profileRelativeEnvVars = mkOption {

View File

@ -21,7 +21,7 @@ with lib;
warnings = mkOption {
internal = true;
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
example = [ "The `foo' service is deprecated and will go away soon!" ];
description = ''
This option allows modules to show warnings to users during

View File

@ -27,7 +27,7 @@ in
programs.ssh = {
askPassword = mkOption {
type = types.string;
type = types.str;
default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
description = ''Program used by SSH to ask for passwords.'';
};
@ -77,7 +77,7 @@ in
};
agentTimeout = mkOption {
type = types.nullOr types.string;
type = types.nullOr types.str;
default = null;
example = "1h";
description = ''

View File

@ -33,7 +33,7 @@ in
};
security.pki.certificates = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
example = singleton ''
NixOS.org

View File

@ -192,7 +192,7 @@ in
extraGroups = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
example = [ "postdrop" "mongodb" ];
description = ''
Extra groups for the logcheck user, for example to be able to use sendmail,

View File

@ -66,7 +66,7 @@ in
};
extraParams = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [ ];
example = [ "-m 0" ];
description = ''

View File

@ -83,7 +83,7 @@ in
};
extraParams = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [ ];
example = [ "-m 0" ];
description = ''

View File

@ -24,7 +24,7 @@ in {
};
extraServerArgs = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
example = [ "-v" "-P mta" ];
description = ''

View File

@ -108,7 +108,7 @@ in {
"-Djava.awt.headless=true"
"-Djava.net.preferIPv4Stack=true"
];
type = types.listOf types.string;
type = types.listOf types.str;
example = [
"-Djava.net.preferIPv4Stack=true"
"-Dcom.sun.management.jmxremote"

View File

@ -45,7 +45,7 @@ in {
See https://mesos.apache.org/documentation/latest/configuration/
'';
default = [ "" ];
type = types.listOf types.string;
type = types.listOf types.str;
example = [ "--credentials=VALUE" ];
};

View File

@ -70,7 +70,7 @@ in {
See https://mesos.apache.org/documentation/latest/configuration/
'';
default = [ "" ];
type = types.listOf types.string;
type = types.listOf types.str;
example = [ "--gc_delay=3days" ];
};

View File

@ -94,7 +94,7 @@ in {
extraCmdLineOptions = mkOption {
description = "Extra command line options for the Zookeeper launcher.";
default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
type = types.listOf types.string;
type = types.listOf types.str;
example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
};

View File

@ -63,7 +63,7 @@ let
directives = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = ''
List of configuration directives for this UPS.
'';

View File

@ -45,7 +45,7 @@ in
};
servers = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
example = [ "8.8.8.8" "8.8.4.4" ];
description = ''

View File

@ -287,7 +287,7 @@ in
};
networking.firewall.trustedInterfaces = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
description =
''
Traffic coming in from these interfaces will be accepted
@ -379,7 +379,7 @@ in
networking.firewall.connectionTrackingModules = mkOption {
default = [ "ftp" ];
example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
type = types.listOf types.string;
type = types.listOf types.str;
description =
''
List of connection-tracking helpers that are auto-loaded.

View File

@ -30,7 +30,7 @@ in
};
services.minidlna.mediaDirs = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
example = [ "/data/media" "V,/home/alice/video" ];
description =

View File

@ -118,7 +118,7 @@ in {
};
appendNameservers = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
description = ''
A list of name servers that should be appended
@ -127,7 +127,7 @@ in {
};
insertNameservers = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
description = ''
A list of name servers that should be inserted before

View File

@ -42,7 +42,7 @@ in
};
allowedClients = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [ "127.0.0.1" "::1" ];
example = [ "127.0.0.1" "::1" "134.157.168.0/24" "2001:660:116::/48" ];
description = ''

View File

@ -234,7 +234,7 @@ in
];
options = {
hostNames = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
description = ''
A list of host names and/or IP numbers used for accessing

View File

@ -43,7 +43,7 @@ in
};
interfaces = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [];
example = [ "wlan0" "wlan1" ];
description = ''

View File

@ -144,7 +144,7 @@ in
*/
confOptions = {
modules = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [ "partyline" "webadmin" "adminlog" "log" ];
example = [ "partyline" "webadmin" "adminlog" "log" ];
description = ''
@ -153,7 +153,7 @@ in
};
userModules = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default = [ ];
example = [ "fish" "push" ];
description = ''

View File

@ -102,7 +102,7 @@ in {
extraCmdLineOptions = mkOption {
description = "Extra command line options for the elasticsearch launcher.";
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
example = [ "-Djava.net.preferIPv4Stack=true" ];
};

View File

@ -211,7 +211,7 @@ in
};
boot.initrd.luks.cryptoModules = mkOption {
type = types.listOf types.string;
type = types.listOf types.str;
default =
[ "aes" "aes_generic" "blowfish" "twofish"
"serpent" "cbc" "xts" "lrw" "sha1" "sha256" "sha512"

View File

@ -358,7 +358,7 @@ in
boot.initrd.supportedFilesystems = mkOption {
default = [ ];
example = [ "btrfs" ];
type = types.listOf types.string;
type = types.listOf types.str;
description = "Names of supported filesystem types in the initial ramdisk.";
};

View File

@ -42,13 +42,13 @@ in rec {
requiredBy = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = "Units that require (i.e. depend on and need to go down with) this unit.";
};
wantedBy = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
description = "Units that want (i.e. depend on) this unit.";
};

View File

@ -121,7 +121,7 @@ in
boot.supportedFilesystems = mkOption {
default = [ ];
example = [ "btrfs" ];
type = types.listOf types.string;
type = types.listOf types.str;
description = "Names of supported filesystem types.";
};

View File

@ -22,7 +22,7 @@ in
# FIXME: still needed?
boot.extraTTYs = mkOption {
default = [];
type = types.listOf types.string;
type = types.listOf types.str;
example = ["tty8" "tty9"];
description = ''
Tty (virtual console) devices, in addition to the consoles on

View File

@ -392,7 +392,7 @@ in
interfaces = mkOption {
example = [ "eth0" "eth1" ];
type = types.listOf types.string;
type = types.listOf types.str;
description =
"The physical network interfaces connected by the bridge.";
};