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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 03b4a4f7f1d1
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 03aaabce2452
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Mar 15, 2019

  1. nix-daemon: add variable to disable fork safety 

    Since macOS 10.14 this has become an error, causing problems if the
nix-daemon loads nix during substitution (this is a forked process).

Workaround for #2523.

(cherry picked from commit 8ac1130)
    @LnL7
    LnL7 committed Mar 15, 2019
    Copy the full SHA
    34d897e View commit details

Commits on Mar 18, 2019

  1. Merge pull request #2729 from LnL7/2.2-maintenance 

    backport nix-daemon fork safety to 2.2
    @edolstra
    edolstra authored Mar 18, 2019
    Copy the full SHA
    03aaabc View commit details
Showing with 5 additions and 0 deletions.
  1. +5 −0 misc/launchd/org.nixos.nix-daemon.plist.in
5 changes: 5 additions & 0 deletions misc/launchd/org.nixos.nix-daemon.plist.in
View file
Original file line number Diff line number Diff line change
@@ -2,6 +2,11 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>EnvironmentVariables</key>
<dict>
<key>OBJC_DISABLE_INITIALIZE_FORK_SAFETY</key>
<string>YES</string>
</dict>
<key>Label</key>
<string>org.nixos.nix-daemon</string>
<key>KeepAlive</key>