Build with ghc-9.10

coot · coot · commit 8ec054652157 · 2024-05-17T08:59:21.000Z
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ghc: ["8.10", "9.2", "9.4", "9.6", "9.8"]
+        ghc: ["8.10", "9.2", "9.4", "9.6", "9.8", "9.10"]
         os: [ubuntu-latest, macos-latest, windows-latest]
 
     defaults:
@@ -27,7 +27,7 @@ jobs:
       id: setup-haskell
       with:
         ghc-version: ${{ matrix.ghc }}
-        cabal-version: "3.10.1.0"
+        cabal-version: "3.10.3.0"
 
     - name: Install LLVM (macOS)
       if: runner.os == 'macOS'
diff --git a/cabal.project b/cabal.project
@@ -1,4 +1,4 @@
-index-state: hackage.haskell.org 2023-11-06T00:00:00Z
+index-state: hackage.haskell.org 2024-05-17T03:42:00Z
 
 packages: ./io-sim
           ./io-classes
diff --git a/io-classes-mtl/io-classes-mtl.cabal b/io-classes-mtl/io-classes-mtl.cabal
@@ -15,7 +15,7 @@ category:           Control
 build-type:         Simple
 extra-doc-files:    README.md CHANGELOG.md
 bug-reports:        https://github.com/input-output-hk/io-sim/issues
-tested-with:        GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
+tested-with:        GHC == { 8.10, 9.2, 9.4, 9.6, 9.8, 9.10 }
 
 common warnings
     ghc-options: -Wall
@@ -40,7 +40,7 @@ library
                    ,  Control.Monad.Class.MonadTime.SI.Trans
                    ,  Control.Monad.Class.MonadTimer.Trans
                    ,  Control.Monad.Class.MonadTimer.SI.Trans
-    build-depends:    base >=4.9 && <4.20,
+    build-depends:    base >=4.9 && <4.21,
                       array,
                       mtl,
 
diff --git a/io-classes-mtl/src/Control/Monad/Class/MonadSTM/Trans.hs b/io-classes-mtl/src/Control/Monad/Class/MonadSTM/Trans.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                        #-}
 {-# LANGUAGE DeriveFunctor              #-}
 {-# LANGUAGE FlexibleContexts           #-}
 {-# LANGUAGE FlexibleInstances          #-}
@@ -51,6 +52,9 @@ instance ( MonadSTM m, MArray e a (STM m) ) => MArray e a (ContTSTM r m) where
     getNumElements    = ContTSTM . getNumElements
     unsafeRead arr    = ContTSTM . unsafeRead arr
     unsafeWrite arr i = ContTSTM . unsafeWrite arr i
+#if __GLASGOW_HASKELL__ >= 910
+    newArray idxs     = ContTSTM . newArray idxs
+#endif
 
 
 -- note: this (and the following) instance requires 'UndecidableInstances'
diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal
@@ -19,7 +19,7 @@ category:            Control
 build-type:          Simple
 extra-doc-files:     CHANGELOG.md README.md
 bug-reports:         https://github.com/input-output-hk/io-sim/issues
-tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8, 9.10 }
 
 source-repository head
   type:     git
@@ -93,12 +93,12 @@ library
                        TypeFamilyDependencies
                        TypeOperators
                        UndecidableInstances
-  build-depends:       base  >=4.9 && <4.20,
+  build-depends:       base  >=4.9 && <4.21,
                        array,
                        async >=2.1,
                        bytestring,
                        mtl   >=2.2 && <2.4,
-                       primitive >= 0.7 && <0.10,
+                       primitive >= 0.7 && <0.11,
                        stm   >=2.5 && <2.6,
                        time  >=1.9.1 && <1.13
 
diff --git a/io-sim/io-sim.cabal b/io-sim/io-sim.cabal
@@ -15,7 +15,7 @@ category:            Testing
 build-type:          Simple
 extra-doc-files:     CHANGELOG.md README.md
 bug-reports:         https://github.com/input-output-hk/io-sim/issues
-tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8, 9.10 }
 
 flag asserts
   description: Enable assertions
@@ -75,13 +75,13 @@ library
                        RankNTypes,
                        ScopedTypeVariables,
                        TypeFamilies
-  build-depends:       base              >=4.9 && <4.20,
-                       io-classes       ^>=1.4.1,
+  build-depends:       base              >=4.9 && <4.21,
+                       io-classes       ^>=1.4,
                        exceptions        >=0.10,
                        containers,
                        deepseq,
                        nothunks,
-                       primitive         >=0.7 && <0.10,
+                       primitive         >=0.7 && <0.11,
                        psqueues          >=0.2 && <0.3,
                        strict-stm       ^>=1.4,
                        si-timers        ^>=1.4,
@@ -131,7 +131,7 @@ benchmark bench
   default-language:    Haskell2010
   default-extensions:  ImportQualifiedPost
   build-depends:       base,
-                       criterion,
+                       criterion ^>= 1.6,
 
                        io-classes,
                        io-sim,
diff --git a/io-sim/src/Data/Deque/Strict.hs b/io-sim/src/Data/Deque/Strict.hs
@@ -1,10 +1,15 @@
+{-# LANGUAGE CPP        #-}
 {-# LANGUAGE LambdaCase #-}
 
 -- | A minimal implementation of a strict deque.
 --
 module Data.Deque.Strict where
 
+#if __GLASGOW_HASKELL__ >= 910
+import Data.Foldable (foldr')
+#else
 import Data.Foldable (foldl', foldr')
+#endif
 import Data.List qualified as List
 import Prelude hiding (head, init, tail)
 
diff --git a/io-sim/test/Test/Control/Monad/IOSim.hs b/io-sim/test/Test/Control/Monad/IOSim.hs
@@ -24,7 +24,9 @@ module Test.Control.Monad.IOSim
 
 import Data.Either (isLeft)
 import Data.Fixed (Micro)
+#if __GLASGOW_HASKELL__ < 910
 import Data.Foldable (foldl')
+#endif
 import Data.Functor (($>))
 import Data.Time.Clock (picosecondsToDiffTime)
 
diff --git a/io-sim/test/Test/Control/Monad/IOSimPOR.hs b/io-sim/test/Test/Control/Monad/IOSimPOR.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP                   #-}
 {-# LANGUAGE DeriveGeneric         #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE LambdaCase            #-}
@@ -11,7 +12,11 @@
 module Test.Control.Monad.IOSimPOR (tests) where
 
 import Data.Fixed (Micro)
+#if __GLASGOW_HASKELL__ >= 910
+import Data.Foldable (traverse_)
+#else
 import Data.Foldable (foldl', traverse_)
+#endif
 import Data.Functor (($>))
 import Data.List qualified as List
 import Data.Map (Map)
diff --git a/si-timers/si-timers.cabal b/si-timers/si-timers.cabal
@@ -14,7 +14,7 @@ category:            Time
 build-type:          Simple
 extra-doc-files:     CHANGELOG.md README.md
 bug-reports:         https://github.com/input-output-hk/io-sim/issues
-tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8, 9.10 }
 
 flag asserts
   description: Enable assertions
@@ -53,7 +53,7 @@ library
                        NumericUnderscores,
                        ScopedTypeVariables,
                        TypeFamilies
-  build-depends:       base              >=4.9 && <4.20,
+  build-depends:       base              >=4.9 && <4.21,
                        deepseq,
                        mtl,
                        nothunks,
diff --git a/strict-mvar/strict-mvar.cabal b/strict-mvar/strict-mvar.cabal
@@ -15,7 +15,7 @@ category:            Concurrency
 build-type:          Simple
 extra-doc-files:     CHANGELOG.md README.md
 bug-reports:         https://github.com/input-output-hk/io-sim/issues
-tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8, 9.10 }
 
 source-repository head
   type:     git
@@ -28,7 +28,7 @@ library
   exposed-modules:     Control.Concurrent.Class.MonadMVar.Strict
   default-language:    Haskell2010
   default-extensions:  ImportQualifiedPost
-  build-depends:       base        >= 4.9 && <4.20,
+  build-depends:       base        >= 4.9 && <4.21,
                        io-classes ^>= 1.4
   ghc-options:         -Wall
                        -Wno-unticked-promoted-constructors
@@ -47,7 +47,7 @@ test-suite test
                        Test.Utils
   default-language:    Haskell2010
   default-extensions:  ImportQualifiedPost
-  build-depends:       base >=4.9 && <4.20,
+  build-depends:       base,
                        io-sim,
                        nothunks,
                        QuickCheck,
diff --git a/strict-stm/strict-stm.cabal b/strict-stm/strict-stm.cabal
@@ -16,7 +16,7 @@ category:            Concurrency
 build-type:          Simple
 extra-doc-files:     CHANGELOG.md README.md
 bug-reports:         https://github.com/input-output-hk/io-sim/issues
-tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
+tested-with:         GHC == { 8.10, 9.2, 9.4, 9.6, 9.8, 9.10 }
 
 source-repository head
   type:     git
@@ -41,7 +41,7 @@ library
   reexported-modules:  Control.Concurrent.Class.MonadSTM.TSem as Control.Concurrent.Class.MonadSTM.Strict.TSem
   default-language:    Haskell2010
   default-extensions:  ImportQualifiedPost
-  build-depends:       base        >=4.9 && <4.20,
+  build-depends:       base        >=4.9 && <4.21,
                        array,
                        stm         >=2.5 && <2.6,
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-index-state: hackage.haskell.org 2023-11-06T00:00:00Z`
	`1`	`+index-state: hackage.haskell.org 2024-05-17T03:42:00Z`
`2`	`2`
`3`	`3`	`packages: ./io-sim`
`4`	`4`	`./io-classes`