From de96126fd0df40e83758c97317656e92631d0886 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Wed, 15 Jan 2025 16:57:29 +1100 Subject: [PATCH 1/2] Remove derived Typeable instance --- io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs | 1 - 1 file changed, 1 deletion(-) diff --git a/io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs b/io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs index b7ed593c..f1195777 100644 --- a/io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs +++ b/io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs @@ -982,7 +982,6 @@ unGetTBQueueDefault (TBQueue rsize read wsize _write _size) a = do -- | Default implementation of 'TArray'. -- data TArrayDefault m i e = TArray (Array i (TVar m e)) - deriving Typeable deriving instance (Eq (TVar m e), Ix i) => Eq (TArrayDefault m i e) From be32f673efeb2920e4430e8e675a68b58e6ac70f Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Wed, 15 Jan 2025 16:57:39 +1100 Subject: [PATCH 2/2] Support ghc 9.12 --- cabal.project | 14 +++++++++++++- io-classes-mtl/io-classes-mtl.cabal | 2 +- io-classes/io-classes.cabal | 2 +- io-sim/io-sim.cabal | 2 +- si-timers/si-timers.cabal | 2 +- strict-mvar/strict-mvar.cabal | 2 +- strict-stm/strict-stm.cabal | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/cabal.project b/cabal.project index cb43b405..e0ec5633 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ -index-state: hackage.haskell.org 2024-05-17T03:42:00Z +index-state: hackage.haskell.org 2025-01-14T02:09:49Z packages: ./io-sim ./io-classes @@ -15,3 +15,15 @@ package io-classes package strict-stm flags: +asserts + +if impl (ghc >= 9.12) + allow-newer: + -- Stuck on `cabal-3.14` issues and recalcitrant maintainers + -- https://github.com/haskell/aeson/issues/1124 + , aeson:ghc-prim + , aeson:template-haskell + + -- Fix blocked by aeson + -- https://github.com/haskellari/microstache/issues/43 + , microstache:base + diff --git a/io-classes-mtl/io-classes-mtl.cabal b/io-classes-mtl/io-classes-mtl.cabal index a160fd37..e83f4d8d 100644 --- a/io-classes-mtl/io-classes-mtl.cabal +++ b/io-classes-mtl/io-classes-mtl.cabal @@ -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.21, + build-depends: base >=4.9 && <4.22, array, mtl, diff --git a/io-classes/io-classes.cabal b/io-classes/io-classes.cabal index fee614fe..50c5b20f 100644 --- a/io-classes/io-classes.cabal +++ b/io-classes/io-classes.cabal @@ -93,7 +93,7 @@ library TypeFamilyDependencies TypeOperators UndecidableInstances - build-depends: base >=4.9 && <4.21, + build-depends: base >=4.9 && <4.22, array, async >=2.1, bytestring, diff --git a/io-sim/io-sim.cabal b/io-sim/io-sim.cabal index 213bfa5e..8651d2b6 100644 --- a/io-sim/io-sim.cabal +++ b/io-sim/io-sim.cabal @@ -75,7 +75,7 @@ library RankNTypes, ScopedTypeVariables, TypeFamilies - build-depends: base >=4.9 && <4.21, + build-depends: base >=4.9 && <4.22, io-classes ^>=1.5, exceptions >=0.10, containers, diff --git a/si-timers/si-timers.cabal b/si-timers/si-timers.cabal index c0ffccf8..b558bc7d 100644 --- a/si-timers/si-timers.cabal +++ b/si-timers/si-timers.cabal @@ -53,7 +53,7 @@ library NumericUnderscores, ScopedTypeVariables, TypeFamilies - build-depends: base >=4.9 && <4.21, + build-depends: base >=4.9 && <4.22, deepseq, mtl, nothunks, diff --git a/strict-mvar/strict-mvar.cabal b/strict-mvar/strict-mvar.cabal index bfc48acd..8757c541 100644 --- a/strict-mvar/strict-mvar.cabal +++ b/strict-mvar/strict-mvar.cabal @@ -28,7 +28,7 @@ library exposed-modules: Control.Concurrent.Class.MonadMVar.Strict default-language: Haskell2010 default-extensions: ImportQualifiedPost - build-depends: base >= 4.9 && <4.21, + build-depends: base >= 4.9 && <4.22, io-classes ^>= 1.5 ghc-options: -Wall -Wno-unticked-promoted-constructors diff --git a/strict-stm/strict-stm.cabal b/strict-stm/strict-stm.cabal index de06db9c..2f49739a 100644 --- a/strict-stm/strict-stm.cabal +++ b/strict-stm/strict-stm.cabal @@ -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.21, + build-depends: base >=4.9 && <4.22, array, stm >=2.5 && <2.6,