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

[#5503] Add filterHaddockFlags for new-haddock #5569

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cabal-install/Distribution/Client/ProjectBuilding.hs
Original file line number Diff line number Diff line change
Expand Up @@ -1070,7 +1070,8 @@ buildAndInstallUnpackedPackage verbosity
buildFlags _ = setupHsBuildFlags pkg pkgshared verbosity builddir

haddockCommand = Cabal.haddockCommand
haddockFlags _ = setupHsHaddockFlags pkg pkgshared
haddockFlags v = flip filterHaddockFlags v $
setupHsHaddockFlags pkg pkgshared
verbosity builddir

generateInstalledPackageInfo :: IO InstalledPackageInfo
Expand Down
3 changes: 2 additions & 1 deletion cabal-install/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

2.6.0.0 (current development version)
* New solver flag: '--reject-unconstrained-dependencies'. (#2568)
* Fix 'cabal new-haddock' for build-type:configure (#5503).

2.4.0.0 Mikhail Glushenkov <mikhail.glushenkov@gmail.com> September 2018
* Bugfix: "cabal new-build --ghc-option '--bogus' --ghc-option '-O1'"
* Bugfix: "cabal new-build --ghc-option '--bogus' --ghc-option '-O1'"
no longer ignores all arguments except the last one (#5512).
* Add the following option aliases for '-dir'-suffixed options:
'storedir', 'logsdir', 'packagedir', 'sourcedir', 'outputdir' (#5484).
Expand Down