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: 6b3a6fe5a2e5
Choose a base ref
...
head repository: NixOS/nix
compare: 7bb5ddbe15be
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on Oct 9, 2019

  1. Copy instead of linking launch agent 

    On Catalina, the /nix filesystem might not be mounted at start time.
To avoid this service not starting, we need to keep the launch agent
outside of the Nix store. A wait4pid will hold for our /nix dir to be
mounted.

Fixes #3125.
    @matthewbauer
    matthewbauer committed Oct 9, 2019
    1
    Copy the full SHA
    0847f2f View commit details
    Browse the repository at this point in the history

  2. Make preexisting Nix install a warning, not a failure 

    In the multi-user install script, we originally made sure no previous
references to Nix existed. This prevented any previous installs from
contaminating the new install. However, some users need the ability to
repair their existing Nix installation without uninstalling all
references to Nix. This change allows users with existing Nix
installations to use the installer, while still outputing a warning
message on the dangers of this. As a result, the multi-user install
script work much more like the single-user install script has worked
in the past.

This is a requirement for macOS Catalina users now that
/Library/LaunchDaemons/org.nixos.nix-daemon.plisg is not managed by
the Nix store. If there is ever a change to the .plist, all users will
need to rerun this install script to get the new changes. Otherwise,
changes to the launch daemon will require manual interventions.
    @matthewbauer
    matthewbauer committed Oct 9, 2019
    Copy the full SHA
    d4e51aa View commit details
    Browse the repository at this point in the history

  3. Merge pull request #3128 from matthewbauer/dont-symlink-launchagent 

    Don't symlink org.nixos.nix-daemon.plist in installer
    @edolstra
    edolstra committed Oct 9, 2019
    Copy the full SHA
    7bb5ddb View commit details
    Browse the repository at this point in the history