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

Haddock: Pass hyperlink source directory with --read-interface #5212

Merged
merged 1 commit into from
Mar 28, 2018

Conversation

alexbiehl
Copy link
Member

With this patch Cabal passes the directory to hyperlinked sources for each package, if present. This helps for package cross-references in hyperlinked-sources.

Please include the following checklist in your PR:

  • Patches conform to the coding conventions.
  • Any changes that could be relevant to users have been recorded in the changelog.
  • The documentation has been updated, if necessary.
  • If the change is docs-only, [ci skip] is used to avoid triggering the build bots.

Please also shortly describe how you tested your change. Bonus points for added tests!

@hvr
Copy link
Member

hvr commented Mar 14, 2018

I assume you tested this for cabal new-haddock w/ and w/o --haddock-for-hackage?


haddockPackageFlags :: Verbosity
-> LocalBuildInfo
-> ComponentLocalBuildInfo
-> Maybe PathTemplate
-> IO ([(FilePath, Maybe FilePath)], Maybe String)
-> IO ([(FilePath, Maybe FilePath, Maybe FilePath)], Maybe String)
Copy link
Member

Choose a reason for hiding this comment

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

Can you please add a Haddock comment to this function? The type sig starts to get a bit unwieldy, esp. the return type.

Copy link
Member Author

Choose a reason for hiding this comment

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

yeah, true

@23Skidoo 23Skidoo merged commit 457ebb8 into haskell:master Mar 28, 2018
@23Skidoo
Copy link
Member

Merged, thanks!

@23Skidoo
Copy link
Member

@hvr This changes the type of an exported lib:Cabal function, so cherry-picking this into 2.2 == breaking PVP.

@hvr
Copy link
Member

hvr commented Mar 28, 2018

@23Skidoo good catch; then we shouldn't cherry-pick...

@23Skidoo
Copy link
Member

Backporting in a PVP-compliant way should be easy, though.

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.

3 participants