ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-09 22:57:41 +03:00
Code Issues Projects Releases Wiki Activity

darwin.linux-builder: rename from darwin.builder

Browse Source
This commit is contained in:
Michael Hoang 2023-07-04 20:46:42 +10:00
parent 34f6ce2fc2
commit edef486898
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/builders/special/darwin-builder.section.md
View File

@ -1,9 +1,13 @@
# darwin.builder {#sec-darwin-builder}
# darwin.linux-builder {#sec-darwin-builder}
`darwin.builder` provides a way to bootstrap a Linux builder on a macOS machine.
`darwin.linux-builder` provides a way to bootstrap a Linux builder on a macOS machine.
This requires macOS version 12.4 or later.
The builder runs on host port 31022 by default.
You can change it by overriding `virtualisation.darwin-builder.hostPort`.
See the [example](#sec-darwin-builder-example-flake).
You will also need to be a trusted user for your Nix installation. In other
words, your `/etc/nix/nix.conf` should have something like:
@ -14,7 +18,7 @@ extra-trusted-users = <your username goes here>
To launch the builder, run the following flake:
```ShellSession
$ nix run nixpkgs#darwin.builder
$ nix run nixpkgs#darwin.linux-builder
```
That will prompt you to enter your `sudo` password:

2
nixos/modules/profiles/macos-builder.nix
View File

@ -177,7 +177,7 @@ in
Please inspect the trace of the following command to figure out which module
has a dependency on stateVersion.
nix-instantiate --attr darwin.builder --show-trace
nix-instantiate --attr darwin.linux-builder --show-trace
'');
};

6
pkgs/top-level/darwin-packages.nix
View File

@ -3,6 +3,7 @@
, generateSplicesForMkScope, makeScopeWithSplicing
, stdenv
, preLibcCrossHeaders
, config
}:
let
@ -229,7 +230,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { };
# See doc/builders/special/darwin-builder.section.md
builder = lib.makeOverridable ({ modules }:
linux-builder = lib.makeOverridable ({ modules }:
let
toGuest = builtins.replaceStrings [ "darwin" ] [ "linux" ];
@ -247,4 +248,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
in
nixos.config.system.build.macos-builder-installer) { modules = [ ]; };
} // lib.optionalAttrs config.allowAliases {
builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06
})