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

haskell infra, ghc: Start to fix cross compilation without changing hashes #33358

Merged
merged 6 commits into from Jan 3, 2018

Conversation

Ericson2314
Copy link
Member

Motivation for this change

This a little bit of #26799. I want to merge it first so that a) @GrahamcOfBorg can ensure there really are no rebuilds, and b) that second PR has a more readable diff.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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/)
  • Fits CONTRIBUTING.md.

Cross case purposely changed as it will be rewritten anyways. But no
native hashes should be changed.
@@ -41,6 +41,7 @@ let
libtool = nativePlatforms;
libunistring = nativePlatforms;
windows.wxMSW = nativePlatforms;
windows.mingw_w64_pthreads = nativePlatforms;
Copy link
Member Author

Choose a reason for hiding this comment

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

This is a function of GitHub's lousy diff algorithm. It is not part of #33358.

@peti
Copy link
Member

peti commented Jan 3, 2018

Pushed 8b01cb35a17..e7fb469c690 to haskell-updates. Test builds are running at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates.

@peti peti self-assigned this Jan 3, 2018
@peti
Copy link
Member

peti commented Jan 3, 2018

OK, Hydra conveniently confirmed that no hashes were changed by this PR. So, I guess, there's not much test-building to be done. :-)

@peti peti merged commit eb6db32 into NixOS:master Jan 3, 2018
@Ericson2314 Ericson2314 deleted the cross-haskell-samehash branch January 3, 2018 15:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: cross-compilation Building packages on a different sort platform than than they will be run on 6.topic: haskell 10.rebuild-darwin: 0 10.rebuild-linux: 1-10
Projects
No open projects
Cross compilation
After big PR
Development

Successfully merging this pull request may close these issues.

None yet

5 participants