installer: don't assume GNU diff #7948
Conversation
|
Any chance you can attach a screenshot of the format it produces for reference? There are instructions for getting the installer tests working in https://github.com/NixOS/nix/blob/master/doc/manual/src/contributing/hacking.md#installer-tests. They are of, eh, marginal utility here. They help demonstrate that the happy path works w/o a human having to do it. They also technically generate installers a human can use, but since gha doesn't have arm runners for macos, we'd have to hunt down someone in the venn diagram of Intel + Ventura to see if they are open to engineering a test that would trigger this path. Since you have directly tested that part of the code, I think it's fine to skip. Lmk if that isn't tolerable for any reason and I can make a copy and push this to get a CI result. |
There was a problem hiding this comment.
This looks like a pretty clear win over the current fail-and-print-help that Ventura users can currently end up with.
I'd personally say that merging will close #7286
For reference, here's what the format looks like in GNU diff on macOS Catalina:
|
Sorry this got buried. Here's a comparison of Ventura diff on the left and GNU diff on the right: |
|
As for testing, I'm happy to do whatever you think is best. I've tested by copying and pasting into a shell script I can run directly, but I haven't actually tested it in the context of an installation |
|
@thufschmitt would you be able to merge this? |
Actually not, the CI doesn't run for some reason, so I can't merge. Can you try re-triggering it by pushing something on the branch? |
macOS Ventura ships with it's own version of diff. Try to output a similar diff with Apple diff as with GNU diff, instead of failing Helps NixOS#7286
|
Thanks for looking at this! Pushed |
macOS Ventura ships with it's own version of diff. Try to output a similar diff with Apple diff as with GNU diff, instead of failing
Helps #7286