JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Use attrsOf in place of loaOf when relevant
This commit is contained in:
Joachim F 2017-02-19 15:49:25 +01:00 committed by GitHub
commit 6dbe55ca68
6 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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.
'';

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

@ -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 {

4
nixos/modules/services/network-filesystems/tahoe.nix
View File

@ -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;

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

@ -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.

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

@ -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.
'';

2
nixos/modules/services/web-servers/zope2.nix
View File

@ -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 = {