Merge pull request #20456 from ericsagnes/feat/loaf-dep-1

Use attrsOf in place of loaOf when relevant

Changed files
+9 -9
nixos
modules
security
services
logging
network-filesystems
networking
web-servers
+1 -1
nixos/modules/security/acme.nix
···
certs = mkOption {
default = { };
-
type = with types; loaOf (submodule certOpts);
+
type = with types; attrsOf (submodule certOpts);
description = ''
Attribute set of certificates to get signed and renewed.
'';
+2 -2
nixos/modules/services/logging/logcheck.nix
···
description = ''
This option defines extra ignore rules.
'';
-
type = with types; loaOf (submodule ignoreOptions);
+
type = with types; attrsOf (submodule ignoreOptions);
};
ignoreCron = mkOption {
···
description = ''
This option defines extra ignore rules for cronjobs.
'';
-
type = with types; loaOf (submodule ignoreCronOptions);
+
type = with types; attrsOf (submodule ignoreCronOptions);
};
extraGroups = mkOption {
+2 -2
nixos/modules/services/network-filesystems/tahoe.nix
···
options.services.tahoe = {
introducers = mkOption {
default = {};
-
type = with types; loaOf (submodule {
+
type = with types; attrsOf (submodule {
options = {
nickname = mkOption {
type = types.str;
···
};
nodes = mkOption {
default = {};
-
type = with types; loaOf (submodule {
+
type = with types; attrsOf (submodule {
options = {
nickname = mkOption {
type = types.str;
+2 -2
nixos/modules/services/networking/tinc.nix
···
networks = mkOption {
default = { };
-
type = with types; loaOf (submodule {
+
type = with types; attrsOf (submodule {
options = {
extraConfig = mkOption {
···
hosts = mkOption {
default = { };
-
type = types.loaOf types.lines;
+
type = types.attrsOf types.lines;
description = ''
The name of the host in the network as well as the configuration for that host.
This name should only contain alphanumerics and underscores.
+1 -1
nixos/modules/services/networking/znc.nix
···
networks = mkOption {
default = { };
-
type = with types; loaOf (submodule networkOpts);
+
type = with types; attrsOf (submodule networkOpts);
description = ''
IRC networks to connect the user to.
'';
+1 -1
nixos/modules/services/web-servers/zope2.nix
···
services.zope2.instances = mkOption {
default = {};
-
type = with types; loaOf (submodule zope2Opts);
+
type = with types; attrsOf (submodule zope2Opts);
example = literalExample ''
{
plone01 = {