From 7b1a693fb48d57662bffed9d8f3751452d2d5ddc Mon Sep 17 00:00:00 2001 From: Finley Date: Thu, 29 Jun 2023 11:08:53 -0600 Subject: [PATCH] Do not always pass `--quickjump` to haddock (#9049) --- Cabal/src/Distribution/Simple/Haddock.hs | 2 +- changelog.d/pr-9049 | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 changelog.d/pr-9049 diff --git a/Cabal/src/Distribution/Simple/Haddock.hs b/Cabal/src/Distribution/Simple/Haddock.hs index 6b54de6b6c9..16a97a6eb03 100644 --- a/Cabal/src/Distribution/Simple/Haddock.hs +++ b/Cabal/src/Distribution/Simple/Haddock.hs @@ -867,7 +867,7 @@ renderPureArgs version comp platform args = $ args else [] , ["--since-qual=external" | isVersion 2 20] - , [ "--quickjump" | isVersion 2 19, _ <- flagToList . argQuickJump $ args + , [ "--quickjump" | isVersion 2 19, True <- flagToList . argQuickJump $ args ] , [ "--hyperlinked-source" | isVersion 2 17, True <- flagToList . argLinkedSource $ args ] diff --git a/changelog.d/pr-9049 b/changelog.d/pr-9049 new file mode 100644 index 00000000000..41fcd0a5bb7 --- /dev/null +++ b/changelog.d/pr-9049 @@ -0,0 +1,13 @@ +synopsis: Do not always pass --quickjump to haddock #9049 +packages: Cabal +prs: #9049 +issues: #9060 +description: { + +6d8adf13101 caused `cabal` to always pass the `--quickjump` flag to Haddock. +Not only does this waste memory for a service that user hasn't asked for, +but also leads to a failure with Haddocks shipped with GHC 9.0 and 9.2, +which had a separate bug (fixed in later versions but not backported) when +Haddock does not pass `--quickjump` recursively to the package dependencies. + +}