Merge pull request #11218 from haskell/wip/fix-pkgroot-haddock-html

mergify[bot] · web-flow · commit 2150ca554628 · 2026-01-25T14:10:54.000Z
Expand ${pkgroot} variable when reading haddock-html field from ghc-pkg
diff --git a/Cabal/src/Distribution/Simple/Program/HcPkg.hs b/Cabal/src/Distribution/Simple/Program/HcPkg.hs
@@ -339,7 +339,7 @@ mungePackagePaths pkgroot pkginfo =
     , libraryDynDirs = mungePaths (libraryDynDirs pkginfo)
     , frameworkDirs = mungePaths (frameworkDirs pkginfo)
     , haddockInterfaces = mungePaths (haddockInterfaces pkginfo)
-    , haddockHTMLs = mungeUrls (haddockHTMLs pkginfo)
+    , haddockHTMLs = mungePaths (mungeUrls (haddockHTMLs pkginfo))
     }
   where
     mungePaths = map mungePath
diff --git a/changelog.d/pr-11218.md b/changelog.d/pr-11218.md
@@ -0,0 +1,9 @@
+synopsis: Fix links to installed documentation when running `cabal haddock`
+packages: Cabal
+prs: #11218
+
+Links to installed documentation (i.e. for base) from generated haddocks should
+now work.
+
+The `pkgroot` variable wasn't being expanded when reading the `haddock-html` field
+from a package description.

Original file line number	Diff line number	Diff line change
`@@ -339,7 +339,7 @@ mungePackagePaths pkgroot pkginfo =`
`339`	`339`	`, libraryDynDirs = mungePaths (libraryDynDirs pkginfo)`
`340`	`340`	`, frameworkDirs = mungePaths (frameworkDirs pkginfo)`
`341`	`341`	`, haddockInterfaces = mungePaths (haddockInterfaces pkginfo)`
`342`		`- , haddockHTMLs = mungeUrls (haddockHTMLs pkginfo)`
	`342`	`+ , haddockHTMLs = mungePaths (mungeUrls (haddockHTMLs pkginfo))`
`343`	`343`	`}`
`344`	`344`	`where`
`345`	`345`	`mungePaths = map mungePath`