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

Commits on Oct 9, 2019

  1. Make nix-daemon.plist less fragile on macOS 

    We're calling `wait4path` on the full, resolved `@bindir@/nix-daemon` path.

That means we're hardcoding something like:

    /bin/wait4path /nix/store/zs9c5xhp3zv9p23qnjxp87nl5injsi1i-nix-2.3/bin/nix-daemon && /nix/var/nix/profiles/default/bin/nix-daemon

That seems unnecessarily fragile.

It might be better to wait4path on the path we intend to call.
    @callahad
    callahad committed Oct 9, 2019
    1

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    callahad Dan Callahan
    GPG key ID: 8D6DD713E9EBA7FD
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8c4a5e7 View commit details

  2. Merge pull request #3133 from callahad/launchd 

    Make nix-daemon.plist less fragile on macOS
    @edolstra
    edolstra authored Oct 9, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    335504a View commit details
Showing with 1 addition and 1 deletion.
  1. +1 −1 misc/launchd/org.nixos.nix-daemon.plist.in
2 changes: 1 addition & 1 deletion misc/launchd/org.nixos.nix-daemon.plist.in
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<array>
<string>/bin/sh</string>
<string>-c</string>
<string>/bin/wait4path @bindir@/nix-daemon &amp;&amp; /nix/var/nix/profiles/default/bin/nix-daemon</string>
<string>/bin/wait4path /nix/var/nix/profiles/default/bin/nix-daemon &amp;&amp; /nix/var/nix/profiles/default/bin/nix-daemon</string>
</array>
<key>StandardErrorPath</key>
<string>/var/log/nix-daemon.log</string>