From a104f07a071c9223d5cf76f7649e74223cdce98b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Mar 2010 16:50:08 +0000
Subject: [PATCH] =?UTF-8?q?*=20Move=20the=20definition=20of=20the=20Nix=20?=
 =?UTF-8?q?build=20users=20out=20of=20user-groups.nix=20to=20=20=20nix-dae?=
 =?UTF-8?q?mon.nix.=20*=20Add=20an=20option=20=E2=80=98nix.nrBuildUsers?=
 =?UTF-8?q?=E2=80=99=20to=20allow=20the=20number=20of=20build=20users=20?=
 =?UTF-8?q?=20=20to=20be=20overriden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

svn path=/nixos/trunk/; revision=20571
---
 modules/config/users-groups.nix      | 16 +---------------
 modules/services/misc/nix-daemon.nix | 28 ++++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/modules/config/users-groups.nix b/modules/config/users-groups.nix
index 1b66d3ff4c96..72d3e21f2039 100644
--- a/modules/config/users-groups.nix
+++ b/modules/config/users-groups.nix
@@ -24,20 +24,6 @@ let
           }
         ];
 
-      makeNixBuildUser = nr:
-        { name = "nixbld${toString nr}";
-          description = "Nix build user ${toString nr}";
-
-          /* For consistency with the setgid(2), setuid(2), and setgroups(2)
-             calls in `libstore/build.cc', don't add any supplementary group
-             here.  */
-          uid = builtins.add ids.uids.nixbld nr;
-          group = "nixbld";
-          extraGroups = [];
-        };
-
-      nixBuildUsers = map makeNixBuildUser (pkgs.lib.range 1 10);
-      
       addAttrs =
         { name
         , description
@@ -52,7 +38,7 @@ let
         }:
         { inherit name description uid group extraGroups home shell createHome password; };
 
-    in map addAttrs (defaultUsers ++ nixBuildUsers ++ config.users.extraUsers);
+    in map addAttrs (defaultUsers ++ config.users.extraUsers);
 
 
   # Groups to be created/updated by NixOS.
diff --git a/modules/services/misc/nix-daemon.nix b/modules/services/misc/nix-daemon.nix
index ee7136212d53..f347fb8ce47a 100644
--- a/modules/services/misc/nix-daemon.nix
+++ b/modules/services/misc/nix-daemon.nix
@@ -5,6 +5,18 @@ with pkgs.lib;
 let
 
   inherit (config.environment) nix;
+  
+  makeNixBuildUser = nr:
+    { name = "nixbld${toString nr}";
+      description = "Nix build user ${toString nr}";
+
+      /* For consistency with the setgid(2), setuid(2), and setgroups(2)
+         calls in `libstore/build.cc', don't add any supplementary group
+         here.  */
+      uid = builtins.add config.ids.uids.nixbld nr;
+      group = "nixbld";
+      extraGroups = [];
+    };
 
 in
 
@@ -148,6 +160,17 @@ in
           Environment variables used by Nix.
         ";
       };
+
+      nrBuildUsers = mkOption {
+        default = 10;
+        description = ''
+          Number of <literal>nixbld</literal> user accounts created to
+          perform secure concurrent builds.  If you receive an error
+          message saying that “all build users are currently in use”,
+          you should increase this value.
+        '';
+      };
+      
     };
   };
 
@@ -213,6 +236,9 @@ in
           ''
             export PATH=${if config.nix.distributedBuilds then "${pkgs.openssh}/bin:${pkgs.gzip}/bin:" else ""}${pkgs.openssl}/bin:${nix}/bin:$PATH
             ${config.nix.envVars}
+            # To reduce the load on Hydra, don't start all those
+            # unnecessary substituter processes.
+            export NIX_SUBSTITUTERS=
             exec \
               nice -n ${builtins.toString config.nix.daemonNiceLevel} \
               ${pkgs.utillinux}/bin/ionice -n ${builtins.toString config.nix.daemonIONiceLevel} \
@@ -261,6 +287,8 @@ in
         export ftp_proxy=${config.nix.proxy}
       '';
 
+    users.extraUsers = map makeNixBuildUser (pkgs.lib.range 1 config.nix.nrBuildUsers);
+
   };
 
 }