Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated types.loaOf #224

Merged
merged 1 commit into from
Sep 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/launchd/launchd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -722,7 +722,7 @@ with lib;

The parameters below are used as inputs to call <literal>getaddrinfo(3)</literal>.
'';
type = types.nullOr (types.loaOf (types.submodule {
type = types.nullOr (types.attrsOf (types.submodule {
options = {
SockType = mkOption {
type = types.nullOr (types.enum [ "stream" "dgram" "seqpacket" ]);
Expand Down
2 changes: 1 addition & 1 deletion modules/programs/ssh/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ in

programs.ssh.knownHosts = mkOption {
default = {};
type = types.loaOf (types.submodule host);
type = types.attrsOf (types.submodule host);
description = ''
The set of system-wide known SSH hosts.
'';
Expand Down
2 changes: 1 addition & 1 deletion modules/system/etc.nix
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ in
options = {

environment.etc = mkOption {
type = types.loaOf (types.submodule text);
type = types.attrsOf (types.submodule text);
default = {};
description = ''
Set of files that have to be linked in <filename>/etc</filename>.
Expand Down
6 changes: 3 additions & 3 deletions modules/system/launchd.nix
Original file line number Diff line number Diff line change
Expand Up @@ -57,23 +57,23 @@ in
options = {

environment.launchAgents = mkOption {
type = types.loaOf (types.submodule text);
type = types.attrsOf (types.submodule text);
default = {};
description = ''
Set of files that have to be linked in <filename>/Library/LaunchAgents</filename>.
'';
};

environment.launchDaemons = mkOption {
type = types.loaOf (types.submodule text);
type = types.attrsOf (types.submodule text);
default = {};
description = ''
Set of files that have to be linked in <filename>/Library/LaunchDaemons</filename>.
'';
};

environment.userLaunchAgents = mkOption {
type = types.loaOf (types.submodule text);
type = types.attrsOf (types.submodule text);
default = {};
description = ''
Set of files that have to be linked in <filename>~/Library/LaunchAgents</filename>.
Expand Down
4 changes: 2 additions & 2 deletions modules/users/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ in
};

users.groups = mkOption {
type = types.loaOf (types.submodule group);
type = types.attrsOf (types.submodule group);
default = {};
description = "Configuration for groups.";
};

users.users = mkOption {
type = types.loaOf (types.submodule user);
type = types.attrsOf (types.submodule user);
default = {};
description = "Configuration for users.";
};
Expand Down