mirror of
https://github.com/NixOS/nix.git
synced 2025-11-10 20:46:01 +01:00
72b8673e06
- 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
|
||
|---|---|---|
| .. | ||
| create-darwin-volume.sh | ||
| install-darwin-multi-user.sh | ||
| install-multi-user.sh | ||
| install-nix-from-closure.sh | ||
| install-systemd-multi-user.sh | ||
| install.in | ||
| local.mk | ||
| nix-http-export.cgi.in | ||
| nix-profile-daemon.sh.in | ||
| nix-profile.sh.in | ||
| nix-reduce-build.in | ||