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: 9635fb77bd63
Choose a base ref
...
head repository: NixOS/nix
compare: e0ca98c2071b
Choose a head ref
  • 9 commits
  • 6 files changed
  • 2 contributors

Commits on Oct 19, 2020

  1. update macOS version handling for Big Sur

    Keeping this commit narrow for reviewability, but some of these
    conditionals will change in subsequent commits in this PR.
    
    Fixes #3852.
    abathur committed Oct 19, 2020
    Copy the full SHA
    9c3dc9d View commit details
    Browse the repository at this point in the history
  2. fix xpath and conditional bugs; xpath -> xmllint

    - xpath -> xmllint: xpath's cli interface changed in Big Sur
      rather than add conditional logic for picking the correct
      syntax for xpath, I'm changing to xmllint --xpath, which
      appears to be consistent across versions I've tested...
    
    - /plist/dict/key[text()='Writable']/following-sibling::true[1]
      doesn't do quite what's expected. It was written to try to
      select a <true /> node paired with the Writable key, but it
      will also select the *next* <true /> node that appears even
      if it was paired with another key.
    
    - I think there's also a logic bug in the conditionals here.
      I'm not sure anyone ever actuall saw it, thanks to the xpath
      bug, though. With the xpath fix, this conditional passes if /nix
      does not exist, / IS writable, and the version is Catalina+.
    
      I think it meant to test for /nix does not exist, / is NOT
      writable, and the version is Catalina+. I reworked this lightly
      to make it a little clearer at the code level.
    abathur committed Oct 19, 2020
    Copy the full SHA
    1f02b65 View commit details
    Browse the repository at this point in the history
  3. replace xpath with xmllint --xpath; simplify

    As mentioned in previous commit, Big Sur changes the syntax for the
    xpath command slightly.
    
    In the process of testing out replacements for these, I noticed a few
    small simplification wins.
    abathur committed Oct 19, 2020
    Copy the full SHA
    e736f8f View commit details
    Browse the repository at this point in the history
  4. adapt to apfs.util flag diff in catalina/big sur

    Fixes #3957. Just runs both forms to minimize moving parts.
    abathur committed Oct 19, 2020
    Copy the full SHA
    fe80790 View commit details
    Browse the repository at this point in the history
  5. restore create-darwin-volume to release tarball

    The move from release.nix to flake.nix appears to have lost some
    changes from #3628 / 1c56f18, leaving
    create-darwin-volume.sh out of the release tarball.
    
    Under the assumption that this was just an accident/byproduct of when
    flake.nix split off and not intentional, I am restoring those edits.
    abathur committed Oct 19, 2020
    Copy the full SHA
    3a8699a View commit details
    Browse the repository at this point in the history
  6. fix skipped multi-user install steps on macOS

    Some of the changes in #3788 to support non-systemd Nix installs
    don't appear to be aware that the darwin installer exists, which
    resulted in some skipped steps and inappropriate instructions.
    abathur committed Oct 19, 2020
    Copy the full SHA
    b719f68 View commit details
    Browse the repository at this point in the history
  7. create missing profile files to fix zsh envvars

    Env vars for ZSH were moved from /etc/zshrc to /etc/zshenv in #3608
    to address an issue with zshrc getting clobbered by OS updates, but
    /etc/zshenv doesn't exist by default--so *nothing* would get set up
    for zsh users unless they already happened to have /etc/zshenv.
    
    Creating these files if they don't exist. Also cut separate creation
    of profile.d/nix.sh, which isn't needed now.
    abathur committed Oct 19, 2020
    Copy the full SHA
    c40bad4 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    f289bdb View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2020

  1. Merge pull request #3996 from abathur/macos_big_sur_fixes

    Macos big sur installer fixes
    domenkozar committed Oct 20, 2020
    Copy the full SHA
    e0ca98c View commit details
    Browse the repository at this point in the history