From 132a7f0a09d222df25604836893e3420b1c165cf Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Thu, 21 Feb 2019 21:33:00 +0100
Subject: [PATCH] users: increase default nixbld users to 32 and set knownUsers
 by default

Since the users.nix.configureBuildUsers target nixbld users, don't require
them to be added to knownUsers explicitly.
---
 modules/users/nixbld/default.nix        | 5 ++++-
 pkgs/darwin-installer/configuration.nix | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/modules/users/nixbld/default.nix b/modules/users/nixbld/default.nix
index f6be4206..4f12f015 100644
--- a/modules/users/nixbld/default.nix
+++ b/modules/users/nixbld/default.nix
@@ -41,7 +41,7 @@ in
         name = "integer";
         check = t: isInt t && t > 1;
       };
-      default = 10;
+      default = 32;
       description = "Number of nixbld user accounts created to perform secure concurrent builds.";
     };
   };
@@ -57,6 +57,9 @@ in
     users.groups = mkIf cfg.nix.configureBuildUsers buildGroups;
     users.users = mkIf cfg.nix.configureBuildUsers buildUsers;
 
+    users.knownGroups = mkIf cfg.nix.configureBuildUsers [ "nixbld" ];
+    users.knownUsers = mkIf cfg.nix.configureBuildUsers (mkUsers (i: "nixbld${toString i}"));
+
   };
 }
 
diff --git a/pkgs/darwin-installer/configuration.nix b/pkgs/darwin-installer/configuration.nix
index f51c7f11..28fe6dec 100644
--- a/pkgs/darwin-installer/configuration.nix
+++ b/pkgs/darwin-installer/configuration.nix
@@ -5,10 +5,8 @@ with lib;
 {
   imports = [ <user-darwin-config> ];
 
-  # NOTE: don't set this outside of the installer.
   users.nix.configureBuildUsers = true;
   users.knownGroups = [ "nixbld" ];
-  users.knownUsers = [ "nixbld1" "nixbld2" "nixbld3" "nixbld4" "nixbld5" "nixbld6" "nixbld7" "nixbld8" "nixbld9" "nixbld10" ];
 
   system.activationScripts.preUserActivation.text = mkBefore ''
     PATH=/nix/var/nix/profiles/default/bin:$PATH