Merge pull request #6481 from commercialhaskell/re6270

Re #6270 Fix `--haddock-arguments` with `--haddock-for-hackage`
commercialhaskell · Feb 11, 2024 · a95b831 · a95b831
2 parents a108c79 + de4dec2
commit a95b831
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -14,6 +14,8 @@ Other enhancements:
 
 Bug fixes:
 
+* `--haddock-for-hackage` does not ignore `--haddock-arguments`.
+
 ## v2.15.1 - 2024-02-09
 
 Release notes:

diff --git a/src/Stack/Build/ExecutePackage.hs b/src/Stack/Build/ExecutePackage.hs
@@ -596,20 +596,21 @@ singleBuild
 
       fulfillHaddockExpectations pname mcurator $ \keep -> do
         let args = concat
-              (  if isHaddockForHackage
-                   then
-                     [ [ "--for-hackage" ] ]
-                   else
-                     [ [ "--html"
-                       , "--hoogle"
-                       , "--html-location=../$pkg-$version/"
-                       ]
-                     , [ "--haddock-option=--hyperlinked-source"
-                       | ee.buildOpts.haddockHyperlinkSource
-                       ]
-                     , [ "--internal" | ee.buildOpts.haddockInternal  ]
-                     , quickjump
-                     ]
+              (  ( if isHaddockForHackage
+                    then
+                      [ [ "--for-hackage" ] ]
+                    else
+                      [ [ "--html"
+                        , "--hoogle"
+                        , "--html-location=../$pkg-$version/"
+                        ]
+                      , [ "--haddock-option=--hyperlinked-source"
+                        | ee.buildOpts.haddockHyperlinkSource
+                        ]
+                      , [ "--internal" | ee.buildOpts.haddockInternal  ]
+                      , quickjump
+                      ]
+                 )
               <> [ [ "--haddock-option=" <> opt
                    | opt <- ee.buildOpts.haddockOpts.additionalArgs
                    ]