Add support for GHC912

sol · Dec 21, 2024 · 2890055 · 2890055
1 parent 1ba35af
commit 2890055
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,6 +8,7 @@ on:
   push:
     branches:
       - main
+      - ghc912
   pull_request:
     branches:
       - main
@@ -68,6 +69,7 @@ jobs:
           - 9.8.1
           - 9.8.2
           - 9.10.1
+          - 9.12.1
         include:
           - os: macos-latest
             ghc: 9.6.2

diff --git a/doctest.cabal b/doctest.cabal
diff --git a/package.yaml b/package.yaml
@@ -54,7 +54,7 @@ library:
     - Test.DocTest.Internal.Cabal
 
   dependencies: &dependencies
-    ghc: ">= 8.0 && < 9.12"
+    ghc: ">= 8.0 && < 9.14"
     syb: ">= 0.3"
     code-page: ">= 0.1"
     deepseq:

diff --git a/src/Extract.hs b/src/Extract.hs
@@ -55,7 +55,9 @@ import           GHC.Unit.Module.Graph
 
 -- | A wrapper around `SomeException`, to allow for a custom `Show` instance.
 newtype ExtractError = ExtractError SomeException
+#if __GLASGOW_HASKELL__ < 912
   deriving Typeable
+#endif
 
 instance Show ExtractError where
   show (ExtractError e) =

diff --git a/test/Language/Haskell/GhciWrapperSpec.hs b/test/Language/Haskell/GhciWrapperSpec.hs
@@ -78,7 +78,11 @@ spec = do
 
     it "shows exceptions" $ withInterpreter $ \ghci -> do
       ghci "import Control.Exception" `shouldReturn` ""
+#if __GLASGOW_HASKELL__ >= 912
+      ghci "throwIO DivideByZero" `shouldReturn` "*** Exception: divide by zero\n\nHasCallStack backtrace:\n  throwIO, called at <interactive>:25:1 in interactive:Ghci22\n\n"
+#else
       ghci "throwIO DivideByZero" `shouldReturn` "*** Exception: divide by zero\n"
+#endif
 
     it "shows exceptions (ExitCode)" $ withInterpreter $ \ghci -> do
       ghci "import System.Exit" `shouldReturn` ""