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.

Sign up for GitHub

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

ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions #29696

Merged
merged 1 commit into from Sep 30, 2017
Merged

ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions #29696

merged 1 commit into from Sep 30, 2017

Conversation

cocreature
Copy link
Contributor

Motivation for this change

There have been a number of bugfixes and the PRs that forced nixpkgs to not track upstream have been merged.

Things done
  • Switch ghcjs and ghcjs-boot back to tracking the upstream repos and update them to the newest revision.
  • Regenerate head_stage2.nix.
  • Remove parts of ghcjs.patch that are now in upstream 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.

This should probably go together with #29586 and it supercedes #29564.

cc @peti @basvandijk

@cocreature cocreature changed the title ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions [WIP] ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions Sep 23, 2017
@cocreature
Copy link
Contributor Author

Something is broken with old-time. Investigating.

@basvandijk basvandijk mentioned this pull request Sep 23, 2017
Closed
@cocreature
ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions
582c7d2 
head_stage2.nix has been regenerated to reflect changes in ghcjs
@cocreature cocreature changed the title [WIP] ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions ghcjsHEAD: Bump ghcjs and ghcjs-boot revisions Sep 23, 2017
@cocreature
Copy link
Contributor Author

I’ve fixed the issue with old-time so I consider this ready to be merged.

@cstrahan
Copy link
Contributor

Thanks!

@cstrahan cstrahan merged commit 9b8c278 into NixOS:master Sep 30, 2017
@cocreature cocreature mentioned this pull request Oct 8, 2017
Merged
8 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@cocreature @cstrahan