Merge pull request #6 from GaloisInc/ghc-9.6

Support building with `mtl-2.3.*` (GHC 9.6)
GaloisInc · Jun 30, 2023 · ca7de7a · ca7de7a
2 parents 5c7101f + f48704a
commit ca7de7a
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 47 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,8 +7,8 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc-ver: ["8.8.4", "8.10.7", "9.0.2", "9.2.2"]
-        cabal: ["3.6.2.0"]
+        ghc-ver: ["9.2.8", "9.4.5", "9.6.2"]
+        cabal: ["3.10.1.0"]
       # complete all jobs
       fail-fast: false
     steps:

diff --git a/cabal.project.dist.freeze.ghc-8.10.7 b/cabal.project.dist.freeze.ghc-8.10.7
diff --git a/cabal.project.dist.freeze.ghc-8.8.4 b/cabal.project.dist.freeze.ghc-8.8.4
diff --git a/cabal.project.dist.freeze.ghc-9.0.2 b/cabal.project.dist.freeze.ghc-9.0.2
diff --git a/cabal.project.dist.freeze.ghc-9.2.2 → cabal.project.dist.freeze.ghc-9.2.8 b/cabal.project.dist.freeze.ghc-9.2.2 → cabal.project.dist.freeze.ghc-9.2.8
@@ -1,16 +1,16 @@
 active-repositories: hackage.haskell.org:merge
 constraints: any.array ==0.5.4.0,
-             any.base ==4.16.1.0,
+             any.base ==4.16.4.0,
              any.binary ==0.8.9.0,
-             any.bytestring ==0.11.3.0,
+             any.bytestring ==0.11.4.0,
              any.containers ==0.6.5.1,
              any.deepseq ==1.4.6.1,
              any.ghc-bignum ==1.2,
-             any.ghc-boot-th ==9.2.2,
+             any.ghc-boot-th ==9.2.8,
              any.ghc-prim ==0.8.0,
              any.mtl ==2.2.2,
              any.pretty ==1.1.3.6,
              any.rts ==1.0.2,
              any.template-haskell ==2.18.0.0,
              any.transformers ==0.5.6.2
-index-state: hackage.haskell.org 2022-04-28T12:52:36Z
+index-state: hackage.haskell.org 2023-06-09T13:53:50Z
diff --git a/cabal.project.dist.freeze.ghc-9.4.5 b/cabal.project.dist.freeze.ghc-9.4.5
@@ -0,0 +1,16 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.array ==0.5.4.0,
+             any.base ==4.17.1.0,
+             any.binary ==0.8.9.1,
+             any.bytestring ==0.11.4.0,
+             any.containers ==0.6.7,
+             any.deepseq ==1.4.8.0,
+             any.ghc-bignum ==1.3,
+             any.ghc-boot-th ==9.4.5,
+             any.ghc-prim ==0.9.0,
+             any.mtl ==2.2.2,
+             any.pretty ==1.1.3.6,
+             any.rts ==1.0.2,
+             any.template-haskell ==2.19.0.0,
+             any.transformers ==0.5.6.2
+index-state: hackage.haskell.org 2023-06-09T13:53:50Z
diff --git a/cabal.project.dist.freeze.ghc-9.6.2 b/cabal.project.dist.freeze.ghc-9.6.2
@@ -0,0 +1,16 @@
+active-repositories: hackage.haskell.org:merge
+constraints: any.array ==0.5.5.0,
+             any.base ==4.18.0.0,
+             any.binary ==0.8.9.1,
+             any.bytestring ==0.11.4.0,
+             any.containers ==0.6.7,
+             any.deepseq ==1.4.8.1,
+             any.ghc-bignum ==1.3,
+             any.ghc-boot-th ==9.6.2,
+             any.ghc-prim ==0.10.0,
+             any.mtl ==2.3.1,
+             any.pretty ==1.1.3.6,
+             any.rts ==1.0.2,
+             any.template-haskell ==2.20.0.0,
+             any.transformers ==0.6.1.0
+index-state: hackage.haskell.org 2023-06-09T13:53:50Z
diff --git a/tests/Main.hs b/tests/Main.hs
@@ -2,8 +2,9 @@
 module Main (main) where
 
 import           Control.Exception
---import           Control.Monad.IO
-import           Control.Monad.Reader
+import           Control.Monad (forM_, when)
+import           Control.Monad.IO.Class (MonadIO)
+import           Control.Monad.Reader (ReaderT(..))
 import qualified Data.ByteString as BS
 import           Data.Dwarf.Internals
 import           Data.Typeable