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: 00a52f61f4f1
Choose a base ref
...
head repository: NixOS/nix
compare: 51a4a5e1cf3b
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 20, 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.

(cherry picked from commit 9c3dc9d)
Signed-off-by: Domen Kožar <domen@dev.si>
    @abathur @domenkozar
    abathur authored and domenkozar committed Oct 20, 2020
    Copy the full SHA
    14c7e77 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.

(cherry picked from commit 1f02b65)
Signed-off-by: Domen Kožar <domen@dev.si>
    @abathur @domenkozar
    abathur authored and domenkozar committed Oct 20, 2020
    Copy the full SHA
    72b8673 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.

(cherry picked from commit e736f8f)
Signed-off-by: Domen Kožar <domen@dev.si>
    @abathur @domenkozar
    abathur authored and domenkozar committed Oct 20, 2020
    Copy the full SHA
    613297a 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.

(cherry picked from commit fe80790)
Signed-off-by: Domen Kožar <domen@dev.si>
    @abathur @domenkozar
    abathur authored and domenkozar committed Oct 20, 2020
    Copy the full SHA
    51a4a5e View commit details
    Browse the repository at this point in the history