Remove deprecated types.loaOf

types.loaOf has been deprecated for a long time and is now in the process of removal. See: NixOS/nixpkgs#96042
theutz · Apr 19, 2023 · e395651 · e395651
1 parent e7eec6e
commit e395651
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/modules/launchd/launchd.nix b/modules/launchd/launchd.nix
@@ -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" ]);

diff --git a/modules/programs/ssh/default.nix b/modules/programs/ssh/default.nix
@@ -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.
       '';

diff --git a/modules/system/etc.nix b/modules/system/etc.nix
@@ -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>.

diff --git a/modules/system/launchd.nix b/modules/system/launchd.nix
@@ -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>.

diff --git a/modules/users/default.nix b/modules/users/default.nix
@@ -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.";
     };