diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-01-04 06:01:44 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-04 06:01:44 +0000 |
| commit | 47507cf77a26d73af8e8bf892b41b07402a7ed10 (patch) | |
| tree | c6fd5222a5f13a3ccba0670f5328013ceaa83222 /doc | |
| parent | e464bde9ba6554bbc0cc29bc65777e68bdaa5b9a (diff) | |
| parent | ce1da07174ab7dd31fde15044dbdc574c4dc1b55 (diff) | |
| download | nixpkgs-47507cf77a26d73af8e8bf892b41b07402a7ed10.tar nixpkgs-47507cf77a26d73af8e8bf892b41b07402a7ed10.tar.gz nixpkgs-47507cf77a26d73af8e8bf892b41b07402a7ed10.tar.bz2 nixpkgs-47507cf77a26d73af8e8bf892b41b07402a7ed10.tar.lz nixpkgs-47507cf77a26d73af8e8bf892b41b07402a7ed10.tar.xz nixpkgs-47507cf77a26d73af8e8bf892b41b07402a7ed10.tar.zst nixpkgs-47507cf77a26d73af8e8bf892b41b07402a7ed10.zip | |
Merge staging-next into staging
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/builders/special/darwin-builder.section.md | 12 | ||||
| -rw-r--r-- | doc/contributing/quick-start.chapter.md | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/doc/builders/special/darwin-builder.section.md b/doc/builders/special/darwin-builder.section.md index af9de5751b2..3913b692498 100644 --- a/doc/builders/special/darwin-builder.section.md +++ b/doc/builders/special/darwin-builder.section.md @@ -28,19 +28,21 @@ Password: ``` … so that it can install a private key used to `ssh` into the build server. -After that the script will launch the virtual machine: +After that the script will launch the virtual machine and automatically log you +in as the `builder` user: ``` <<< Welcome to NixOS 22.11.20220901.1bd8d11 (aarch64) - ttyAMA0 >>> Run 'nixos-help' for the NixOS manual. -nixos login: +nixos login: builder (automatic login) + + +[builder@nixos:~]$ ``` -> Note: When you need to stop the VM, type `Ctrl`-`a` + `c` to open the `qemu` -> prompt and then type `system_powerdown` followed by `Enter`, or run `shutdown now` -> as the `builder` user (e.g. `ssh -i keys/builder_ed25519 builder@localhost shutdown now`) +> Note: When you need to stop the VM, run `shutdown now` as the `builder` user. To delegate builds to the remote builder, add the following options to your `nix.conf` file: diff --git a/doc/contributing/quick-start.chapter.md b/doc/contributing/quick-start.chapter.md index 96b30d3822c..e6bb5f2b0b6 100644 --- a/doc/contributing/quick-start.chapter.md +++ b/doc/contributing/quick-start.chapter.md @@ -34,7 +34,7 @@ To add a package to Nixpkgs: - Apache HTTPD: [`pkgs/servers/http/apache-httpd/2.4.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/servers/http/apache-httpd/2.4.nix). A bunch of optional features, variable substitutions in the configure flags, a post-install hook, and miscellaneous hackery. - - Thunderbird: [`pkgs/applications/networking/mailreaders/thunderbird/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/mailreaders/thunderbird/default.nix). Lots of dependencies. + - buildMozillaMach: [`pkgs/applications/networking/browser/firefox/common.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/browsers/firefox/common.nix). A reusable build function for Firefox, Thunderbird and Librewolf. - JDiskReport, a Java utility: [`pkgs/tools/misc/jdiskreport/default.nix`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/tools/misc/jdiskreport/default.nix). Nixpkgs doesn’t have a decent `stdenv` for Java yet so this is pretty ad-hoc. |