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: 0ec723375bc6
Choose a base ref
...
head repository: NixOS/nix
compare: 24883645a696
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jul 25, 2017

  1. Test to see if nix-daemon is running already

    A user had an install, uninstalled it via the instructions, and found their nix broken.
    
    The issue was based around nix-daemon already running.
    
    I tried to be very smart around searching their launchctl files:
    
      $ grep -ri nix-daemon  ~/Library/LaunchAgents /Library/LaunchAgents /Library/LaunchDaemons /System/Library/LaunchAgents /System/Library/LaunchDaemons
    
    but then couldn't figure out how to write out (nicely) commands for uninstalling
    or unloading them based on their name, and also couching the instrunctions in a
    bit of doubt so we don't piss off some poor mac admin because their users just
    deleted some important launchd files.
    grahamc committed Jul 25, 2017
    Configuration menu
    Copy the full SHA
    9a04bc6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1486 from grahamc/detect-already-running

    Test to see if nix-daemon is running already
    edolstra committed Jul 25, 2017
    Configuration menu
    Copy the full SHA
    2488364 View commit details
    Browse the repository at this point in the history