pyrox.dev / nixpkgs
lol
fork atom

darwin.linux-builder: split `create-builder` script

The current workflow for starting the `linux-builder` on macOS is to run
`nix run nixpkgs#darwin.linux-builder`, which adds keys to the store and
then starts the builder.

Adding the keys requires user input (due to `sudo`) but the actual
builder should just stay running in the background somewhere.

I'd like to automate this process, but it's currently rather complex:
the first part of the script needs user input for `sudo`, and then
there's no signal when the process has finished starting up. The user
will need to see stdout/stderr during the first part, which makes it
challenging to capture it for the second part to determine when startup
has finished.

To fix this, I've split the `create-builder` script into an `add-keys`
script (interactive) and a `run-builder` script (background). These new
scripts are exposed in the `passthru` attributes for external users. The
`create-builder` script is now a simple call of `add-keys` and then
`run-builder`.

See: https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder

Rebecca Turner 2263f723 7b3c99fb

options
unified split
Changed files
+16 -2
nixos
modules
profiles
nix-builder-vm.nix
+16 -2
nixos/modules/profiles/nix-builder-vm.nix 
···

       
163

       
163

       
 

       



     

       
164

       
164

       
 

       
        hostPkgs = config.virtualisation.host.pkgs;


     

       
165

       
165

       
 

       



     

       
166

       

       
-

       
        script = hostPkgs.writeShellScriptBin "create-builder" (


     

       

       
166

       
+

       
        add-keys = hostPkgs.writeShellScriptBin "add-keys" (


     

       
167

       
167

       
 

       
          ''


     

       
168

       
168

       
 

       
            set -euo pipefail


     

       
169

       
169

       
 

       
          ''


     
···

       
191

       
191

       
 

       
            if ! ${hostPkgs.diffutils}/bin/cmp "''${PUBLIC_KEY}" ${publicKey}; then


     

       
192

       
192

       
 

       
              (set -x; sudo --reset-timestamp ${installCredentials} "''${KEYS}")


     

       
193

       
193

       
 

       
            fi


     

       
194

       

       
-

       
            KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm}


     

       
195

       
194

       
 

       
          ''


     

       
196

       
195

       
 

       
        );


     

       
197

       
196

       
 

       



     

       

       
197

       
+

       
        run-builder = hostPkgs.writeShellScriptBin "run-builder" (''


     

       

       
198

       
+

       
          set -euo pipefail


     

       

       
199

       
+

       
          KEYS="''${KEYS:-./keys}"


     

       

       
200

       
+

       
          KEYS="$(${hostPkgs.nix}/bin/nix-store --add "$KEYS")" ${lib.getExe config.system.build.vm}


     

       

       
201

       
+

       
        '');


     

       

       
202

       
+

       



     

       

       
203

       
+

       
        script = hostPkgs.writeShellScriptBin "create-builder" (''


     

       

       
204

       
+

       
          set -euo pipefail


     

       

       
205

       
+

       
          export KEYS="''${KEYS:-./keys}"


     

       

       
206

       
+

       
          ${lib.getExe add-keys}


     

       

       
207

       
+

       
          ${lib.getExe run-builder}


     

       

       
208

       
+

       
        '');


     

       

       
209

       
+

       



     

       
198

       
210

       
 

       
      in


     

       
199

       
211

       
 

       
      script.overrideAttrs (old: {


     

       
200

       
212

       
 

       
        pos = __curPos; # sets meta.position to point here; see script binding above for package definition


     
···

       
205

       
217

       
 

       
          # Let users in the repl inspect the config


     

       
206

       
218

       
 

       
          nixosConfig = config;


     

       
207

       
219

       
 

       
          nixosOptions = options;


     

       

       
220

       
+

       



     

       

       
221

       
+

       
          inherit add-keys run-builder;


     

       
208

       
222

       
 

       
        };


     

       
209

       
223

       
 

       
      });


     

       
210

       
224