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

updated changes for GHC-7.10 #239

Merged
merged 3 commits into from Mar 10, 2015
Merged

updated changes for GHC-7.10 #239

merged 3 commits into from Mar 10, 2015

Conversation

bergey
Copy link
Member

@bergey bergey commented Mar 5, 2015

This supercedes #238

Compared to that PR:

  • it is rebased onto master
  • several commits are squashed to avoid spurious whitespace changes
  • changes from the travis branch are included

I've built it locally with GHC-7.10, but haven't updated the travis
branch since rebasing.

@bergey
update for GHC-7.10, -Wall
6067a97 
- remove tabs
- handle extra imports of Foldable, Traversable, Monoid

By some combination of the import Prelude hack, where effective, CPP,
and -fno-warn.
@bergey
travis: set cabal according to GHC version,
ee7dc43 
no Haddock for 7.10 yet
@bergey
travis: add HEAD_DEPS with GHC-7.10 fixes
a53c1ec
This was referenced Mar 5, 2015
Closed
Merged
@bergey
Copy link
Member Author

bergey commented Mar 5, 2015

I don't understand why the travis build succeeded. I expected it to fail while installing dependencies, as did the build in #238

@byorgey
Copy link
Member

byorgey commented Mar 9, 2015

Looks good to me. Is this ready to merge or are we still waiting for something? (Perhaps waiting to see whether <$> gets snuck into the Prelude at the last minute?)

@bergey
Copy link
Member Author

bergey commented Mar 9, 2015

I think we should merge this, and deal with <$> when it happens.

@cchalmers
Copy link
Member

Sounds good to me.

byorgey added a commit that referenced this pull request Mar 10, 2015
@byorgey
Merge pull request #239 from diagrams/ghc-710-v2
fdb6e5c 
updated changes for GHC-7.10
@byorgey byorgey merged commit fdb6e5c into master Mar 10, 2015
@bergey bergey deleted the ghc-710-v2 branch March 10, 2015 13:06
@fryguybob
Copy link
Member

By the way, <$> export was merged: https://git.haskell.org/ghc.git/commitdiff/eb3661f2b9f8472f3714774126ebe1183484dd85

@bergey
Copy link
Member Author

bergey commented Mar 12, 2015

Yep. I'm looking forward to getting tomorrows RC and making another round of changes.

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
4 participants
@bergey @byorgey @cchalmers @fryguybob