diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2017-02-19 15:49:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-19 15:49:25 +0100 |
commit | 6dbe55ca689cacebc31fa8d38b8660a819e14d81 (patch) | |
tree | 5acd316013704499e8dc56cdc49c92b80fddd2f5 /nixos/modules | |
parent | e6a20759aafa49f938d2ca83e0a5cd8f6f20cee7 (diff) | |
parent | 821e8d46810e44215851696f686bd3ad9b360b8a (diff) | |
download | nixlib-6dbe55ca689cacebc31fa8d38b8660a819e14d81.tar nixlib-6dbe55ca689cacebc31fa8d38b8660a819e14d81.tar.gz nixlib-6dbe55ca689cacebc31fa8d38b8660a819e14d81.tar.bz2 nixlib-6dbe55ca689cacebc31fa8d38b8660a819e14d81.tar.lz nixlib-6dbe55ca689cacebc31fa8d38b8660a819e14d81.tar.xz nixlib-6dbe55ca689cacebc31fa8d38b8660a819e14d81.tar.zst nixlib-6dbe55ca689cacebc31fa8d38b8660a819e14d81.zip |
Merge pull request #20456 from ericsagnes/feat/loaf-dep-1
Use attrsOf in place of loaOf when relevant
Diffstat (limited to 'nixos/modules')
-rw-r--r-- | nixos/modules/security/acme.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/logging/logcheck.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/network-filesystems/tahoe.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/tinc.nix | 4 | ||||
-rw-r--r-- | nixos/modules/services/networking/znc.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/web-servers/zope2.nix | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix index 4e7c966a463a..78bd09441f83 100644 --- a/nixos/modules/security/acme.nix +++ b/nixos/modules/security/acme.nix @@ -129,7 +129,7 @@ in 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. ''; diff --git a/nixos/modules/services/logging/logcheck.nix b/nixos/modules/services/logging/logcheck.nix index 72925b95cae4..2a8ac414720b 100644 --- a/nixos/modules/services/logging/logcheck.nix +++ b/nixos/modules/services/logging/logcheck.nix @@ -184,7 +184,7 @@ in description = '' This option defines extra ignore rules. ''; - type = with types; loaOf (submodule ignoreOptions); + type = with types; attrsOf (submodule ignoreOptions); }; ignoreCron = mkOption { @@ -192,7 +192,7 @@ in description = '' This option defines extra ignore rules for cronjobs. ''; - type = with types; loaOf (submodule ignoreCronOptions); + type = with types; attrsOf (submodule ignoreCronOptions); }; extraGroups = mkOption { diff --git a/nixos/modules/services/network-filesystems/tahoe.nix b/nixos/modules/services/network-filesystems/tahoe.nix index f63f641d00be..3d78ac096a2b 100644 --- a/nixos/modules/services/network-filesystems/tahoe.nix +++ b/nixos/modules/services/network-filesystems/tahoe.nix @@ -8,7 +8,7 @@ in options.services.tahoe = { introducers = mkOption { default = {}; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { nickname = mkOption { type = types.str; @@ -49,7 +49,7 @@ in }; nodes = mkOption { default = {}; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { nickname = mkOption { type = types.str; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index f8e68fda7fc2..6cb40185274d 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -18,7 +18,7 @@ in networks = mkOption { default = { }; - type = with types; loaOf (submodule { + type = with types; attrsOf (submodule { options = { extraConfig = mkOption { @@ -59,7 +59,7 @@ in 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. diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 76ba78ff366f..0d41e3ea92ce 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -208,7 +208,7 @@ in networks = mkOption { default = { }; - type = with types; loaOf (submodule networkOpts); + type = with types; attrsOf (submodule networkOpts); description = '' IRC networks to connect the user to. ''; diff --git a/nixos/modules/services/web-servers/zope2.nix b/nixos/modules/services/web-servers/zope2.nix index 8a453e015577..496e34db4a96 100644 --- a/nixos/modules/services/web-servers/zope2.nix +++ b/nixos/modules/services/web-servers/zope2.nix @@ -74,7 +74,7 @@ in services.zope2.instances = mkOption { default = {}; - type = with types; loaOf (submodule zope2Opts); + type = with types; attrsOf (submodule zope2Opts); example = literalExample '' { plone01 = { |