Skip to content

Commit 978dddb

Browse files
authored
Merge pull request #206 from erikd/erikd/ghc-9.12
Support ghc 9.12
2 parents 14c11ce + c913ce8 commit 978dddb

File tree

7 files changed

+23
-10
lines changed

7 files changed

+23
-10
lines changed

.github/workflows/haskell.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
strategy:
1212
fail-fast: false
1313
matrix:
14-
ghc: ["8.10", "9.2", "9.4", "9.6", "9.8", "9.10"]
14+
ghc: ["8.10", "9.2", "9.4", "9.6", "9.8", "9.10", "9.12"]
1515
os: [ubuntu-latest, macos-latest, windows-latest]
1616

1717
defaults:

cabal.project

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
index-state: hackage.haskell.org 2024-05-17T03:42:00Z
1+
index-state: hackage.haskell.org 2025-01-14T02:09:49Z
22

33
packages: ./io-sim
44
./io-classes
@@ -11,3 +11,14 @@ package io-classes
1111

1212
package strict-stm
1313
flags: +asserts
14+
15+
if impl (ghc >= 9.12)
16+
allow-newer:
17+
-- Stuck on `cabal-3.14` issues and recalcitrant maintainers
18+
-- https://github.com/haskell/aeson/issues/1124
19+
, aeson:ghc-prim
20+
, aeson:template-haskell
21+
22+
-- Fix blocked by aeson
23+
-- https://github.com/haskellari/microstache/issues/43
24+
, microstache:base

io-classes/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
### next version
44

5+
* Support ghc-9.12
6+
57
### Breaking changes
68

79
* Added `threadLabel` to `MonadThread`

io-classes/io-classes.cabal

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ library
112112
TypeFamilyDependencies
113113
TypeOperators
114114
UndecidableInstances
115-
build-depends: base >=4.9 && <4.21,
115+
build-depends: base >=4.9 && <4.22,
116116
array,
117117
async >=2.1,
118118
bytestring,
@@ -140,7 +140,7 @@ library strict-stm
140140
reexported-modules: Control.Concurrent.Class.MonadSTM.TSem as Control.Concurrent.Class.MonadSTM.Strict.TSem
141141
default-language: Haskell2010
142142
default-extensions: ImportQualifiedPost
143-
build-depends: base >= 4.9 && <4.21,
143+
build-depends: base >= 4.9 && <4.22,
144144
array,
145145
stm >= 2.5 && <2.6,
146146

@@ -163,7 +163,7 @@ library strict-mvar
163163
exposed-modules: Control.Concurrent.Class.MonadMVar.Strict
164164
default-language: Haskell2010
165165
default-extensions: ImportQualifiedPost
166-
build-depends: base >= 4.9 && <4.21,
166+
build-depends: base >= 4.9 && <4.22,
167167
io-classes:io-classes,
168168
ghc-options: -Wall
169169
-Wno-unticked-promoted-constructors
@@ -190,7 +190,7 @@ library si-timers
190190
NumericUnderscores,
191191
ScopedTypeVariables,
192192
TypeFamilies
193-
build-depends: base >=4.9 && <4.21,
193+
build-depends: base >=4.9 && <4.22,
194194
deepseq,
195195
mtl,
196196
nothunks,
@@ -214,7 +214,7 @@ library mtl
214214
, Control.Monad.Class.MonadTime.SI.Trans
215215
, Control.Monad.Class.MonadTimer.Trans
216216
, Control.Monad.Class.MonadTimer.SI.Trans
217-
build-depends: base >=4.9 && <4.21,
217+
build-depends: base >=4.9 && <4.22,
218218
array,
219219
mtl,
220220

@@ -231,7 +231,7 @@ library testlib
231231
exposed-modules: Test.Control.Concurrent.Class.MonadMVar.Strict.WHNF
232232
default-language: Haskell2010
233233
default-extensions: ImportQualifiedPost
234-
build-depends: base >=4.9 && <4.21,
234+
build-depends: base >=4.9 && <4.22,
235235
nothunks,
236236
QuickCheck,
237237
io-classes:strict-mvar

io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1030,7 +1030,6 @@ unGetTBQueueDefault (TBQueue rsize read wsize _write _size) a = do
10301030
-- | Default implementation of 'TArray'.
10311031
--
10321032
data TArrayDefault m i e = TArray (Array i (TVar m e))
1033-
deriving Typeable
10341033

10351034
deriving instance (Eq (TVar m e), Ix i) => Eq (TArrayDefault m i e)
10361035

io-sim/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
than one that finishes with `SimResult`.
2525
- More polymorphic `ppTrace_` type signature.
2626
- Fixed `tryReadTBQueue` when returning `Nothing`.
27+
- Support ghc 9.12
2728

2829
## 1.6.0.0
2930

io-sim/io-sim.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ library
7979
RankNTypes,
8080
ScopedTypeVariables,
8181
TypeFamilies
82-
build-depends: base >=4.9 && <4.21,
82+
build-depends: base >=4.9 && <4.22,
8383
io-classes:{io-classes,strict-stm,si-timers}
8484
^>=1.6 || ^>= 1.7,
8585
exceptions >=0.10,

0 commit comments

Comments
 (0)