ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-13 09:17:07 +03:00
Code Issues Projects Releases Wiki Activity

Some more type cleanup

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/config/shells-environment.nix
View File

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

2
nixos/modules/misc/assertions.nix
View File

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

4
nixos/modules/programs/ssh.nix
View File

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

2
nixos/modules/security/ca.nix
View File

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

2
nixos/modules/services/logging/logcheck.nix
View File

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

2
nixos/modules/services/logging/rsyslogd.nix
View File

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

2
nixos/modules/services/logging/syslogd.nix
View File

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

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

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

2
nixos/modules/services/misc/apache-kafka.nix
View File

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

2
nixos/modules/services/misc/mesos-master.nix
View File

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

2
nixos/modules/services/misc/mesos-slave.nix
View File

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

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

@ -94,7 +94,7 @@ in {
extraCmdLineOptions = mkOption { extraCmdLineOptions = mkOption {
description = "Extra command line options for the Zookeeper launcher."; description = "Extra command line options for the Zookeeper launcher.";
default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ]; 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" ]; example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ];
}; };

2
nixos/modules/services/monitoring/ups.nix
View File

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

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

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

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

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

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

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

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

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

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

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

2
nixos/modules/services/networking/ssh/sshd.nix
View File

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

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

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

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

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

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

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

2
nixos/modules/system/boot/luksroot.nix
View File

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

2
nixos/modules/system/boot/stage-1.nix
View File

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

4
nixos/modules/system/boot/systemd-unit-options.nix
View File

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

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

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

2
nixos/modules/tasks/kbd.nix
View File

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

2
nixos/modules/tasks/network-interfaces.nix
View File

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