Skip to content

Commit 0468451

Browse files
committed
Use existing haddock-library and haddock-api on GHC >9.12
1 parent 9f7d4ac commit 0468451

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

lib/call-cabal-project-to-nix.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,8 @@ let
461461
cabal_file=${ghcSrc}/compiler/${name}.cabal.in
462462
elif [ -f ${ghcSrc}/libraries/${name}/${name}.cabal.in ]; then
463463
cabal_file=${ghcSrc}/libraries/${name}/${name}.cabal.in
464+
elif [ -f ${ghcSrc}/utils/haddock/${name}/${name}.cabal ]; then
465+
cabal_file=${ghcSrc}/utils/haddock/${name}/${name}.cabal
464466
fi
465467
if [[ "$cabal_file" != "" ]]; then
466468
fixed_cabal_file=$(mktemp)

overlays/haskell.nix

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,6 +1126,9 @@ final: prev: {
11261126
"xhtml"
11271127
] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.4" > 0) [
11281128
"system-cxx-std-lib"
1129+
] ++ final.lib.optionals (builtins.compareVersions ghc.version "9.12" > 0) [
1130+
"haddock-api"
1131+
"haddock-library"
11291132
] ++ final.lib.optionals (
11301133
!final.stdenv.targetPlatform.isGhcjs
11311134
&& !final.stdenv.targetPlatform.isWindows

0 commit comments

Comments
 (0)