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

ghc-8.4.3: minor fixes for cross-musl, same as used with 8.2.2 #42581

Merged
merged 1 commit into from
Jun 25, 2018

Conversation

dtzWill
Copy link
Member

@dtzWill dtzWill commented Jun 25, 2018

Patches are no longer needed, seem to be more or less upstreamed.

Fixes at least x86_64 cross-compilation to musl!

cc #37598

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

Patches are no longer needed, seem to be more or less upstreamed.
@dtzWill dtzWill requested a review from peti as a code owner June 25, 2018 18:21
@peti peti merged commit 92a047a into NixOS:master Jun 25, 2018
@matthewbauer
Copy link
Member

Can you put these two changes into HEAD & maybe also ghc822?

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild labels Jun 25, 2018
@dtzWill
Copy link
Member Author

dtzWill commented Jun 25, 2018

And x86_64-linux-gnu -> aarch64-linux-musl ! \o/

I'll look into doing similar for HEAD--822 should already work (and have these changes), see #37598 (that originally made the changes in this PR to 8.4.2 but those were lost in update or something).

I didn't make the ncurses/etc change since it didn't seem necessary for the configurations I was testing this time 'round, presumably addressed upstream :).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: haskell 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild 10.rebuild-linux: 0 This PR does not cause any packages to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants