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

Bring back old types of {hscolour,haddock}Pref and haddockForHackage. #4146

Merged
merged 2 commits into from
Dec 2, 2016

Conversation

23Skidoo
Copy link
Member

Fixes #4123.

@mention-bot
Copy link

@23Skidoo, thanks for your PR! By analyzing the history of the files in this pull request, we identified @bennofs, @dcoutts and @Saizan to be potential reviewers.

@23Skidoo
Copy link
Member Author

@rthomas If people agree that this is an acceptable fix, we'll need a new Cabal lib release from the 1.24 branch.

@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 1, 2016

@dcoutts @hvr @ezyang @bennofs Any objections to this?

@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 1, 2016

This appears to be only a partial fix for #4123, since a0b4956 also contains the following change:

-    haddockForHackage   :: Flag Bool,
+    haddockForHackage   :: Flag HaddockTarget,

@hvr
Copy link
Member

hvr commented Dec 1, 2016

@23Skidoo we should also try comparing the API between 1.24.0.0 and 1.24.1 with something like https://hackage.haskell.org/package/hackage-diff to make sure there weren't other non-backward compat changes (at the type-level, at least) that snuck in

@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 1, 2016

Pushed an updated fix.

@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 1, 2016

@hvr I tried that, but the result was somewhat disappointing:

$ hackage-diff Cabal 1.24.0.0 1.24.1.0
Downloading / Reading Hoogle DBs...
Parsing Hoogle DBs...
endOfInput

Filed an issue (blitzcode/hackage-diff#6).

@23Skidoo 23Skidoo changed the title Bring back old types of {hscolour,haddock}Pref. Bring back old types of {hscolour,haddock}Pref and haddockForHackage. Dec 1, 2016
@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 2, 2016

All right, I'm merging this.

@23Skidoo 23Skidoo merged commit d7e6c5c into haskell:1.24 Dec 2, 2016
@23Skidoo 23Skidoo deleted the hscolour-pref-1.24 branch December 2, 2016 16:08
@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 4, 2016

@rthomas Ping.

@phadej
Copy link
Collaborator

phadej commented Dec 4, 2016

@23Skidoo try hackage-diff --mode=builddb

@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 5, 2016

@phadej Here's the result:

$ hackage-diff --mode=builddb Cabal 1.24.0.0 1.24.1.0        
Downloading Cabal-1.24.0.0...
Downloading Cabal-1.24.1.0...
Processing Cabal-1.24.0.0...
  Creating Sandbox
  Installing Dependencies
  Configuring
  Building Haddock
Processing Cabal-1.24.1.0...
  Creating Sandbox
  Installing Dependencies
  Configuring
  Building Haddock

--- Diff for | 1.24.0.0 → 1.24.1.0 | ---

· Distribution.Compat.Binary
· Distribution.Compat.ReadP
· Distribution.Compat.Semigroup
· Distribution.PackageDescription.Utils
· Distribution.Simple.CCompiler
· Distribution.Simple.PreProcess.Unlit
· Distribution.Simple.Program.Internal
· Distribution.TestSuite

[+ Added] [- Removed] [× Modified] [· Unmodified]

Looks kinda strange to be honest. /cc @blitzcode

@bgamari
Copy link
Contributor

bgamari commented Dec 6, 2016

@23Skidoo, when do you think we'll be able to get a new 1.24 release?

@23Skidoo
Copy link
Member Author

23Skidoo commented Dec 6, 2016

@bgamari I'll do it today. @rthomas seems to be away or something.

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.

5 participants