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

ghcjs/ghcjsHEAD: Use separate patch files to fix build of ghcjs #30214

Merged
merged 1 commit into from Oct 17, 2017

Conversation

cocreature
Copy link
Contributor

Motivation for this change

In #29696 I removed the patch for building ghcjs using cabal-install 2.0 since it had been merged upstream into GHCJS 8.0 (ghcjsHEAD in nixpkgs). However, I’ve missed that this is also used for ghcjs which still needs this patch and is currently broken due to this change (sorry about this).

Things done

Separate the patch files for ghcjsHEAD and ghcjs and include the cabal-install 2.0 patch for ghcjs.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • 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.

@cocreature
Copy link
Contributor Author

Travis failure seems unrelated.

@cocreature
Copy link
Contributor Author

cc @peti @cstrahan

@cocreature cocreature closed this Oct 15, 2017
@cocreature cocreature reopened this Oct 15, 2017
@peti
Copy link
Member

peti commented Oct 15, 2017

Is it possible to download that patch from somewhere instead of checking it into the Nixpkgs repository?

@cocreature
Copy link
Contributor Author

We could download the cabal-install-2.0 related part of the patch from ghcjs/ghcjs@3c10d16 but since we still need the rest of the patch, I don’t think this provides a substantial benefit.

@peti peti merged commit f9090c3 into NixOS:master Oct 17, 2017
cocreature added a commit to cocreature/nixpkgs that referenced this pull request Oct 21, 2017
@cocreature cocreature mentioned this pull request Oct 21, 2017
8 tasks
domenkozar pushed a commit that referenced this pull request Oct 21, 2017
This has been fixed in #30214
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants