summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2020-01-21 12:02:39 +0100
committerDaiderd Jordan <daiderd@gmail.com>2020-01-21 12:11:32 +0100
commit267f50e63ddc5b3f634d647c6f9d8f5bdf59cfca (patch)
tree75f224d955ee19e59b3127ca31c9de30f8119275 /modules
parent7175f5286018e55807a536a20e97ad3008c71384 (diff)
replace list values for types.loaOf
This type has been deprecated in nixpkgs, these options will be replaced with types.attrsOf in the future.
Diffstat (limited to 'modules')
-rw-r--r--modules/users/nixbld/default.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/users/nixbld/default.nix b/modules/users/nixbld/default.nix
index 4f12f01..ca09880 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}"));