lol

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

Use attrsOf in place of loaOf when relevant

authored by

Joachim F and committed by
GitHub
6dbe55ca e6a20759

+9 -9
+1 -1
nixos/modules/security/acme.nix
··· 129 130 certs = mkOption { 131 default = { }; 132 - type = with types; loaOf (submodule certOpts); 133 description = '' 134 Attribute set of certificates to get signed and renewed. 135 '';
··· 129 130 certs = mkOption { 131 default = { }; 132 + type = with types; attrsOf (submodule certOpts); 133 description = '' 134 Attribute set of certificates to get signed and renewed. 135 '';
+2 -2
nixos/modules/services/logging/logcheck.nix
··· 184 description = '' 185 This option defines extra ignore rules. 186 ''; 187 - type = with types; loaOf (submodule ignoreOptions); 188 }; 189 190 ignoreCron = mkOption { ··· 192 description = '' 193 This option defines extra ignore rules for cronjobs. 194 ''; 195 - type = with types; loaOf (submodule ignoreCronOptions); 196 }; 197 198 extraGroups = mkOption {
··· 184 description = '' 185 This option defines extra ignore rules. 186 ''; 187 + type = with types; attrsOf (submodule ignoreOptions); 188 }; 189 190 ignoreCron = mkOption { ··· 192 description = '' 193 This option defines extra ignore rules for cronjobs. 194 ''; 195 + type = with types; attrsOf (submodule ignoreCronOptions); 196 }; 197 198 extraGroups = mkOption {
+2 -2
nixos/modules/services/network-filesystems/tahoe.nix
··· 8 options.services.tahoe = { 9 introducers = mkOption { 10 default = {}; 11 - type = with types; loaOf (submodule { 12 options = { 13 nickname = mkOption { 14 type = types.str; ··· 49 }; 50 nodes = mkOption { 51 default = {}; 52 - type = with types; loaOf (submodule { 53 options = { 54 nickname = mkOption { 55 type = types.str;
··· 8 options.services.tahoe = { 9 introducers = mkOption { 10 default = {}; 11 + type = with types; attrsOf (submodule { 12 options = { 13 nickname = mkOption { 14 type = types.str; ··· 49 }; 50 nodes = mkOption { 51 default = {}; 52 + type = with types; attrsOf (submodule { 53 options = { 54 nickname = mkOption { 55 type = types.str;
+2 -2
nixos/modules/services/networking/tinc.nix
··· 18 19 networks = mkOption { 20 default = { }; 21 - type = with types; loaOf (submodule { 22 options = { 23 24 extraConfig = mkOption { ··· 59 60 hosts = mkOption { 61 default = { }; 62 - type = types.loaOf types.lines; 63 description = '' 64 The name of the host in the network as well as the configuration for that host. 65 This name should only contain alphanumerics and underscores.
··· 18 19 networks = mkOption { 20 default = { }; 21 + type = with types; attrsOf (submodule { 22 options = { 23 24 extraConfig = mkOption { ··· 59 60 hosts = mkOption { 61 default = { }; 62 + type = types.attrsOf types.lines; 63 description = '' 64 The name of the host in the network as well as the configuration for that host. 65 This name should only contain alphanumerics and underscores.
+1 -1
nixos/modules/services/networking/znc.nix
··· 208 209 networks = mkOption { 210 default = { }; 211 - type = with types; loaOf (submodule networkOpts); 212 description = '' 213 IRC networks to connect the user to. 214 '';
··· 208 209 networks = mkOption { 210 default = { }; 211 + type = with types; attrsOf (submodule networkOpts); 212 description = '' 213 IRC networks to connect the user to. 214 '';
+1 -1
nixos/modules/services/web-servers/zope2.nix
··· 74 75 services.zope2.instances = mkOption { 76 default = {}; 77 - type = with types; loaOf (submodule zope2Opts); 78 example = literalExample '' 79 { 80 plone01 = {
··· 74 75 services.zope2.instances = mkOption { 76 default = {}; 77 + type = with types; attrsOf (submodule zope2Opts); 78 example = literalExample '' 79 { 80 plone01 = {