Unverified Commit 041376b9 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into haskell-updates

parents 3d06d762 d042a296
Loading
Loading
Loading
Loading
+14 −0
Original line number Diff line number Diff line
@@ -157,3 +157,17 @@ in the example below and rebuild.
You may make any other changes to your VM in this attribute set. For example,
you could enable Docker or X11 forwarding to your Darwin host.

## Troubleshooting the generated configuration {#sec-darwin-builder-troubleshoot}

The `linux-builder` package exposes the attributes `nixosConfig` and `nixosOptions` that allow you to inspect the generated NixOS configuration in the `nix repl`. For example:

```
$ nix repl --file ~/src/nixpkgs --argstr system aarch64-darwin

nix-repl> darwin.linux-builder.nixosConfig.nix.package
«derivation /nix/store/...-nix-2.17.0.drv»

nix-repl> :p darwin.linux-builder.nixosOptions.virtualisation.memorySize.definitionsWithLocations
[ { file = "/home/user/src/nixpkgs/nixos/modules/profiles/macos-builder.nix"; value = 3072; } ]

```
+6 −0
Original line number Diff line number Diff line
@@ -14804,6 +14804,12 @@
    githubId = 165283;
    name = "Alexey Kutepov";
  };
  rexxDigital = {
    email = "joellarssonpriv@gmail.com";
    github = "rexxDigital";
    githubId = 44014925;
    name = "Rexx Larsson";
  };
  rgnns = {
    email = "jglievano@gmail.com";
    github = "rgnns";
+1 −0
Original line number Diff line number Diff line
@@ -611,6 +611,7 @@ with lib.maintainers; {

  minimal-bootstrap = {
    members = [
      alejandrosame
      artturin
      emilytrau
      ericson2314
+1 −1
Original line number Diff line number Diff line
@@ -69,4 +69,4 @@ do:
  `/etc/group` and `/etc/shadow`. This also creates home directories
- `usrbinenv` creates `/usr/bin/env`
- `var` creates some directories in `/var` that are not service-specific
- `wrappers` creates setuid wrappers like `ping` and `sudo`
- `wrappers` creates setuid wrappers like `sudo`
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ You can quickly validate your edits with `make`:
```ShellSession
$ cd /path/to/nixpkgs/nixos/doc/manual
$ nix-shell
nix-shell$ make
nix-shell$ devmode
```

Once you are done making modifications to the manual, it's important to
Loading