Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
base: eb6b9bd67293
Choose a base ref
...
head repository: NixOS/nix
compare: 605bacdc929d
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 23, 2020

  1. Fix macOS sandbox build 

    Since c4c3c15 (#4251) building Nix for
macOS with sandboxing fails:
```
getting status of /nix/var/nix/profiles/per-user/root/channels/nixpkgs: Operation not permitted
```

This happens, because `EvalSettings::getDefaultNixPath` tries to access
paths outside the sandbox. Since the state-dir is not required for
doc generation, it is set to the dummy folder. This needs to be done
for all nix invocations during doc generation, as
`EvalSettings::getDefaultNixPath` is called unconditionally.
    @B4dM4n
    B4dM4n committed Nov 23, 2020
    Copy the full SHA
    5b07903 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #4276 from B4dM4n/macos-sandbox-build 

    Fix macOS sandbox build
    @edolstra
    edolstra committed Nov 23, 2020
    Copy the full SHA
    605bacd View commit details
    Browse the repository at this point in the history