New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git: fix darwin build #103774
git: fix darwin build #103774
Conversation
The install step for the darwin specific $out/etc/gitconfig file assumed that $out/etc already existed. This assumption is no longer true after f5e2ff1 in NixOS#103421. This change makes make sure the directory exists before adding to it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Lgtm
Is there a reason it's draft? |
I see tests fail on aarch64, can't imagine how that could be related though, looks good to merge. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is untested. I'm opening as draft while I wait for the build.
Ok, we can merge it then once the build (hopefully) succeeded.
I see tests fail on aarch64, can't imagine how that could be related though
Yeah, unfortunately it seems like there are still some (hopefully only one) flaky tests on AArch64. I'll look at the older PRs to see if it's always the same one. For some reasons this also doesn't seem to be a problem on Hydra (IIRC).
(Upate: Only found one older PR but not the failing test as I manually restarted the build.)
Builds locally for me! Ready for review. |
The install step for the darwin specific $out/etc/gitconfig file assumed that $out/etc already existed. This assumption is no longer true after f5e2ff1 in NixOS#103421. This change makes make sure the directory exists before adding to it. (cherry picked from commit d686ded)
The install step for the darwin specific $out/etc/gitconfig file
assumed that $out/etc already existed. This assumption is no longer
true after f5e2ff1 in #103421. This
change makes make sure the directory exists before adding to it.
Motivation for this change
Fix failing build.
This is untested. I'm opening as draft while I wait for the build.
Things done
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)