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

haskell.compiler.ghcjs86: Bump ghc-8.6 branch, fix build. #68989

Merged
merged 1 commit into from Sep 20, 2019
Merged

haskell.compiler.ghcjs86: Bump ghc-8.6 branch, fix build. #68989

merged 1 commit into from Sep 20, 2019

Conversation

TravisWhitaker
Copy link
Contributor

@TravisWhitaker TravisWhitaker commented Sep 17, 2019 •
edited

This fixes the GHCJS 8.6 build. Previously the build was failing because the utils/makePackages.sh script was booting the GHC source tree before copying in the lib/* extra packages. This caused cabal to fail, since those packages are mentioned in GHCJS' cabal.project file. Bumping the ghc-8.6 branch fixed this.

ghc-api-ghcjs requires happy >= 1.19 && < 1.19.12, so happy 1.19.5 is used.

Tested on macOS, will test on Linux.

Things done
  • 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 nix-review --run "nix-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.

@TravisWhitaker
Copy link
Contributor Author

CC @vaibhavsagar @ElvishJerricco

@peti peti force-pushed the haskell-updates branch 3 times, most recently from 74d6877 to 8e6e631 Compare September 18, 2019 17:37
@TravisWhitaker TravisWhitaker force-pushed the haskell-updates branch 2 times, most recently from 7d924d6 to 502976a Compare September 18, 2019 19:07
ElvishJerricco
ElvishJerricco reviewed Sep 19, 2019
View reviewed changes
pkgs/development/compilers/ghcjs-ng/8.6/stage0.nix
src = configuredSrc + /lib/ghc-api-ghcjs;
libraryHaskellDepends = [
array base binary bytestring containers deepseq directory filepath
ghc-boot ghc-boot-th ghc-heap ghci-ghcjs hpc process
template-haskell-ghcjs terminfo time transformers unix
];
libraryToolDepends = [ alex happy ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you change this manually, or did genStage0 do it?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This file comes from genStage0.

pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix Outdated
@@ -1,7 +1,11 @@
{ haskellLib }:
{ haskellLib, happy_1_19_5 }:
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't you just use self.happy_1_19_5 rather than passing it in this way? Why is this version needed anyway?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ghc-api-ghcjs has the constraint happy >= 1.19 && <= 1.19.9.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't get it from self because common-overrides.nix didn't use self.

peti
peti requested changes Sep 19, 2019
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

Please do not edit hackage-packages.nix.

@TravisWhitaker
Copy link
Contributor Author

@peti This PR is not meant to edit hackage-packages.nix. When you force-push to the NixOS:haskell-updates branch, PRs against NixOS:haskell-updates need to be rebased and force-pushed.

@peti
Copy link
Member

peti commented Sep 20, 2019

This PR is not meant to edit hackage-packages.nix. When you force-push to the NixOS:haskell-updates branch, PRs against NixOS:haskell-updates need to be rebased and force-pushed.

Oh, you are right. I hadn't realized that!

@peti peti merged commit 02a715d into NixOS:haskell-updates Sep 20, 2019
@TravisWhitaker
Copy link
Contributor Author

@peti Thanks! What's required to get ghcjs86 building on Hydra again?

@peti
Copy link
Member

peti commented Sep 24, 2019

What's required to get ghcjs86 building on Hydra again?

Hydra builds all non-broken attributes in haskell.compiler automatically.

@TravisWhitaker
Copy link
Contributor Author

TravisWhitaker commented Sep 24, 2019 •
edited

I can't seem to find it in the trunk jobset or the haskell-updates jobset, but maybe I'm looking in the wrong place?

@TravisWhitaker
Copy link
Contributor Author

Does meta.hydraPlatforms = [] here prevent it from being built?

@peti
Copy link
Member

peti commented Sep 24, 2019 via email

@TravisWhitaker TravisWhitaker deleted the haskell-updates branch September 25, 2019 23:58
@yorickvP yorickvP mentioned this pull request Nov 5, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ElvishJerricco ElvishJerricco ElvishJerricco left review comments

@peti peti peti requested changes

@basvandijk basvandijk Awaiting requested review from basvandijk

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@TravisWhitaker @peti @ElvishJerricco