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

Jump to bottom

GHC / Haskell packages, wasm cross compilation support #92168

Merged
merged 4 commits into from Aug 16, 2020
Merged

GHC / Haskell packages, wasm cross compilation support #92168

merged 4 commits into from Aug 16, 2020

Conversation

dfordivam
Copy link
Contributor

@dfordivam dfordivam commented Jul 3, 2020 •
edited

Motivation for this change

These are needed to building GHC and Haskell packages for wasm target, and are being used by WebGHC.

Except the STRIP_CMD = :, all other changes are under the isWasm target flag, so should not impact any other target's compilation.

These are fairly small changes, so I clubbed them together in one PR.

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.

@ofborg ofborg bot requested review from kosmikus and peti July 3, 2020 12:05
Ericson2314
Ericson2314 reviewed Jul 4, 2020
View reviewed changes
Copy link
Member

@Ericson2314 Ericson2314 left a comment

Choose a reason for hiding this comment

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

Even though WebGHC doesn't support the older GHCs, could we apply these changes to them too? Should be harmless and helps avoid them accidentally drifting out of sync. (And keeps alive the hope that somebody will finally write an abstraction to replace the copy-paste.)

pkgs/development/haskell-modules/generic-builder.nix Outdated Show resolved Hide resolved
pkgs/development/haskell-modules/make-package-set.nix Outdated Show resolved Hide resolved
@dfordivam dfordivam force-pushed the upstream-wasm-cross-nixpkgs-4 branch from a386c0d to 84c30da Compare July 6, 2020 06:20
@Ericson2314
Copy link
Member

@dfordivam Looks good! Could you just update the other GHCs like I mentioned in #92168 (review) ? Sorry I took so long to get back to your PRs.

@dfordivam dfordivam force-pushed the upstream-wasm-cross-nixpkgs-4 branch from 84c30da to fee55e2 Compare August 5, 2020 15:35
@dfordivam
Copy link
Contributor Author

@dfordivam Looks good! Could you just update the other GHCs like I mentioned in #92168 (review) ? Sorry I took so long to get back to your PRs.

@Ericson2314 I did not change the 8.6.5 as it has the dontStrip set to true, and my "fix" of the STRIP_CMD will effect it.
ref: https://github.com/NixOS/nixpkgs/pull/64371/files

@FRidh
Copy link
Member

FRidh commented Aug 15, 2020 •
edited

Please rebase. I leave it to the Haskell maintainers to merge it into staging or the haskell-updates branch.

@FRidh FRidh changed the base branch from master to staging August 15, 2020 06:57
@Ericson2314 Ericson2314 merged commit d4d9ad6 into NixOS:staging Aug 16, 2020
@Ericson2314
Copy link
Member

Sorry I didn't see the new version earlier!

@dfordivam dfordivam mentioned this pull request Aug 17, 2020
Merged
@dfordivam dfordivam mentioned this pull request Sep 26, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ericson2314 Ericson2314 Ericson2314 left review comments

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

@kosmikus kosmikus Awaiting requested review from kosmikus

@peti peti Awaiting requested review from peti

Assignees
No one assigned
Labels
6.topic: haskell 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@dfordivam @Ericson2314 @FRidh