From a34dea283cba40cdc048eb0e33f893bdf7db5867 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Sep 2020 04:20:00 +0000
Subject: [PATCH] Remove deprecated types.loaOf

types.loaOf has been deprecated for a long time and is now in the
process of removal. See: https://github.com/NixOS/nixpkgs/pull/96042
---
 modules/launchd/launchd.nix      | 2 +-
 modules/programs/ssh/default.nix | 2 +-
 modules/system/etc.nix           | 2 +-
 modules/system/launchd.nix       | 6 +++---
 modules/users/default.nix        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/launchd/launchd.nix b/modules/launchd/launchd.nix
index d8ae175c..e903c99c 100644
--- 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
index 2a15a8b3..af2d76b9 100644
--- 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
index fc1ff064..527cda7a 100644
--- 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
index 3df6610a..88ecb959 100644
--- a/modules/system/launchd.nix
+++ b/modules/system/launchd.nix
@@ -57,7 +57,7 @@ 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>.
@@ -65,7 +65,7 @@ in
     };
 
     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>.
@@ -73,7 +73,7 @@ in
     };
 
     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
index 6605a28d..bb075ec4 100644
--- 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.";
     };