Skip to content
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

Merged
merged 1 commit into from Nov 14, 2020
Merged

git: fix darwin build #103774

merged 1 commit into from Nov 14, 2020

Conversation

thefloweringash
Copy link
Member

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

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.
Copy link
Contributor

@wmertens wmertens left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lgtm

@wmertens
Copy link
Contributor

Is there a reason it's draft?

@wmertens
Copy link
Contributor

I see tests fail on aarch64, can't imagine how that could be related though, looks good to merge.

Copy link
Member

@primeos primeos left a 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.)

@thefloweringash
Copy link
Member Author

Builds locally for me! Ready for review.

@thefloweringash thefloweringash marked this pull request as ready for review November 14, 2020 11:38
@primeos primeos merged commit d686ded into NixOS:staging Nov 14, 2020
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants