From 267f50e63ddc5b3f634d647c6f9d8f5bdf59cfca Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 21 Jan 2020 12:02:39 +0100
Subject: [PATCH] replace list values for types.loaOf

This type has been deprecated in nixpkgs, these options will be
replaced with types.attrsOf in the future.
---
 modules/users/nixbld/default.nix | 6 ++++--
 tests/programs-ssh.nix           | 9 ++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/users/nixbld/default.nix b/modules/users/nixbld/default.nix
index 4f12f015..ca098800 100644
--- a/modules/users/nixbld/default.nix
+++ b/modules/users/nixbld/default.nix
@@ -5,6 +5,8 @@ with lib;
 let
   cfg = config.users;
 
+  named = xs: listToAttrs (map (x: { name = x.name; value = x; }) xs);
+
   createdGroups = mapAttrsToList (n: v: v.name) cfg.groups;
   createdUsers = mapAttrsToList (n: v: v.name) cfg.users;
 
@@ -54,8 +56,8 @@ in
       { assertion = cfg.groups ? "nixbld" -> cfg.groups.nixbld.members != []; message = "refusing to remove all members from nixbld group, this would break nix"; }
     ];
 
-    users.groups = mkIf cfg.nix.configureBuildUsers buildGroups;
-    users.users = mkIf cfg.nix.configureBuildUsers buildUsers;
+    users.groups = mkIf cfg.nix.configureBuildUsers (named buildGroups);
+    users.users = mkIf cfg.nix.configureBuildUsers (named buildUsers);
 
     users.knownGroups = mkIf cfg.nix.configureBuildUsers [ "nixbld" ];
     users.knownUsers = mkIf cfg.nix.configureBuildUsers (mkUsers (i: "nixbld${toString i}"));
diff --git a/tests/programs-ssh.nix b/tests/programs-ssh.nix
index a6207fca..71f285c0 100644
--- a/tests/programs-ssh.nix
+++ b/tests/programs-ssh.nix
@@ -1,12 +1,11 @@
 { config, pkgs, ... }:
 
 {
-  programs.ssh.knownHosts = [
-    {
-      hostNames = [ "github.com" ];
+  programs.ssh.knownHosts = {
+    "github.com" = {
       publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==";
-    }
-  ];
+    };
+  };
 
   test = ''
     echo >&2 "checking for github.com in /etc/ssh/ssh_known_hosts"