Skip to content

Commit 441df6f

Browse files
committed
Re #6270 Fix --haddock-arguments with --haddock-for-hackage
1 parent 59f3e81 commit 441df6f

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Other enhancements:
1414

1515
Bug fixes:
1616

17+
* `--haddock-for-hackage` does not ignore `--haddock-arguments`.
18+
1719
## v2.15.1 - 2024-02-09
1820

1921
Release notes:

src/Stack/Build/ExecutePackage.hs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -596,20 +596,21 @@ singleBuild
596596

597597
fulfillHaddockExpectations pname mcurator $ \keep -> do
598598
let args = concat
599-
( if isHaddockForHackage
600-
then
601-
[ [ "--for-hackage" ] ]
602-
else
603-
[ [ "--html"
604-
, "--hoogle"
605-
, "--html-location=../$pkg-$version/"
606-
]
607-
, [ "--haddock-option=--hyperlinked-source"
608-
| ee.buildOpts.haddockHyperlinkSource
609-
]
610-
, [ "--internal" | ee.buildOpts.haddockInternal ]
611-
, quickjump
612-
]
599+
( ( if isHaddockForHackage
600+
then
601+
[ [ "--for-hackage" ] ]
602+
else
603+
[ [ "--html"
604+
, "--hoogle"
605+
, "--html-location=../$pkg-$version/"
606+
]
607+
, [ "--haddock-option=--hyperlinked-source"
608+
| ee.buildOpts.haddockHyperlinkSource
609+
]
610+
, [ "--internal" | ee.buildOpts.haddockInternal ]
611+
, quickjump
612+
]
613+
)
613614
<> [ [ "--haddock-option=" <> opt
614615
| opt <- ee.buildOpts.haddockOpts.additionalArgs
615616
]

0 commit comments

Comments
 (0)