Merge pull request #123 from MarcWeber/feed-upstream/toList

replace list by listOf using same style as for attrsOf
This commit is contained in:
Nicolas B. Pierron 2013-03-23 16:21:21 -07:00
commit 8b2256686b
9 changed files with 15 additions and 15 deletions

View file

@ -26,7 +26,7 @@ with utils;
recommended.
'';
type = types.list types.optionSet;
type = types.listOf types.optionSet;
options = {config, options, ...}: {

View file

@ -221,7 +221,7 @@ in
binaryCaches = mkOption {
default = [ http://nixos.org/binary-cache ];
type = types.list types.string;
type = types.listOf types.string;
description = ''
List of binary cache URLs used to obtain pre-built binaries
of Nix packages.
@ -231,7 +231,7 @@ in
trustedBinaryCaches = mkOption {
default = [ ];
example = [ http://hydra.nixos.org/ ];
type = types.list types.string;
type = types.listOf types.string;
description = ''
List of binary cache URLs that non-root users can use (in
addition to those specified using

View file

@ -85,7 +85,7 @@ in
devices = mkOption {
default = [];
example = [ { device = "/dev/sda"; } { device = "/dev/sdb"; options = "-d sat"; } ];
type = types.list types.optionSet;
type = types.listOf types.optionSet;
options = [ smartdOpts ];
description = ''
List of devices to monitor. By default -- if this list is empty --,

View file

@ -108,7 +108,7 @@ in
};
networking.firewall.trustedInterfaces = mkOption {
type = types.list types.string;
type = types.listOf types.string;
description =
''
Traffic coming in from these interfaces will be accepted
@ -119,7 +119,7 @@ in
networking.firewall.allowedTCPPorts = mkOption {
default = [];
example = [ 22 80 ];
type = types.list types.int;
type = types.listOf types.int;
description =
''
List of TCP ports on which incoming connections are
@ -130,7 +130,7 @@ in
networking.firewall.allowedUDPPorts = mkOption {
default = [];
example = [ 53 ];
type = types.list types.int;
type = types.listOf types.int;
description =
''
List of open UDP ports.
@ -168,7 +168,7 @@ in
networking.firewall.connectionTrackingModules = mkOption {
default = [ "ftp" ];
example = [ "ftp" "irc" "sane" "sip" "tftp" "amanda" "h323" "netbios_sn" "pptp" "snmp" ];
type = types.list types.string;
type = types.listOf types.string;
description =
''
List of connection-tracking helpers that are auto-loaded.

View file

@ -67,7 +67,7 @@ in
A list of services provided by xinetd.
'';
type = types.list types.optionSet;
type = types.listOf types.optionSet;
options = {

View file

@ -55,7 +55,7 @@ in
};
phononBackends = mkOption {
type = types.list types.string;
type = types.listOf types.string;
default = ["gstreamer"];
example = ["gstreamer" "vlc"];
description = "Which phonon multimedia backend kde should use";
@ -65,7 +65,7 @@ in
environment.kdePackages = mkOption {
default = [];
example = "[ pkgs.kde4.kdesdk ]";
type = types.list types.package;
type = types.listOf types.package;
description = "This option is obsolete. Please use <option>environment.systemPackages</option> instead.";
};

View file

@ -383,7 +383,7 @@ in
environment.x11Packages = mkOption {
default = [];
type = types.list types.package;
type = types.listOf types.package;
description = ''
List of packages added to the system when the X server is
activated (<option>services.xserver.enable</option>).

View file

@ -84,7 +84,7 @@ in
Make sure that initrd has the crypto modules needed for decryption.
'';
type = types.list types.optionSet;
type = types.listOf types.optionSet;
options = {

View file

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