Expand ${pkgroot} variable when reading haddock-html field from ghc-pkg

mpickering · mpickering · commit 31e3f332ea02 · 2025-09-16T16:57:56.000+01:00
This fixes #11217 No test, as it is difficult to test since you need to: 1. Ensure there is a package registration with ${pkgroot} 2. Check the existence of a certain link in the generated HTML.
diff --git a/Cabal/src/Distribution/Simple/Program/HcPkg.hs b/Cabal/src/Distribution/Simple/Program/HcPkg.hs
@@ -351,7 +351,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,6 @@
+synopsis: Fix links to installed documentation when running `cabal haddock`
+packages: Cabal
+prs: #11218
+
+Links to installed documentation (i.e. for base) from generated haddock should
+now work.

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ mungePackagePaths pkgroot pkginfo =`
`351`	`351`	`, libraryDynDirs = mungePaths (libraryDynDirs pkginfo)`
`352`	`352`	`, frameworkDirs = mungePaths (frameworkDirs pkginfo)`
`353`	`353`	`, haddockInterfaces = mungePaths (haddockInterfaces pkginfo)`
`354`		`- , haddockHTMLs = mungeUrls (haddockHTMLs pkginfo)`
	`354`	`+ , haddockHTMLs = mungePaths (mungeUrls (haddockHTMLs pkginfo))`
`355`	`355`	`}`
`356`	`356`	`where`
`357`	`357`	`mungePaths = map mungePath`