Skip to content

Commit

Permalink
dev-haskell/ghcide: Add patch for >=ghc-9.8.3
Browse files Browse the repository at this point in the history
Signed-off-by: hololeap <[email protected]>
  • Loading branch information
hololeap committed Jan 4, 2025
1 parent dfdcdd3 commit 36764fe
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 2 deletions.
16 changes: 16 additions & 0 deletions dev-haskell/ghcide/files/ghcide-2.9.0.0-ghc-9_8_3.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
From https://github.com/haskell/haskell-language-server/pull/4444
From: Fendor <[email protected]>
Date: Mon, 4 Nov 2024 09:12:00 +0100
Subject: [PATCH] Build HLS with GHC 9.8.3

--- a/src/Development/IDE/GHC/Compat/Core.hs
+++ b/src/Development/IDE/GHC/Compat/Core.hs
@@ -674,7 +674,7 @@ initObjLinker env =
loadDLL :: HscEnv -> String -> IO (Maybe String)
loadDLL env str = do
res <- GHCi.loadDLL (GHCi.hscInterp env) str
-#if MIN_VERSION_ghc(9,11,0)
+#if MIN_VERSION_ghc(9,11,0) || (MIN_VERSION_ghc(9, 8, 3) && !MIN_VERSION_ghc(9, 9, 0))
pure $
case res of
Left err_msg -> Just err_msg
8 changes: 6 additions & 2 deletions dev-haskell/ghcide/ghcide-2.9.0.0.ebuild
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Copyright 1999-2024 Gentoo Authors
# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=8

# ebuild generated by hackport 0.8.5.1.9999
# ebuild generated by hackport 0.9.0.0.9999
#hackport: flags: -ghc-patched-unboxed-bytecode,-pedantic

CABAL_FEATURES="lib profile haddock hoogle hscolour"
Expand All @@ -21,6 +21,10 @@ IUSE="executable test-exe"
# Should be fixed in Cabal-3.10 (https://github.com/haskell/cabal/issues/1919)
CABAL_HADDOCK_TARGETS="lib:${CABAL_PN}"

PATCHES=(
"${FILESDIR}/${PN}-2.9.0.0-ghc-9_8_3.patch"
)

RDEPEND="
dev-haskell/aeson:=[profile?]
dev-haskell/async:=[profile?]
Expand Down

0 comments on commit 36764fe

Please sign in to comment.