git: fix darwin build #103774
Merged
git: fix darwin build #103774
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
|
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. |
primeos
approved these changes
Nov 14, 2020
There was a problem hiding this comment.
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. |
freezeboy
pushed a commit
to freezeboy/nixpkgs
that referenced
this pull request
Nov 25, 2020
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)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)