Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support ghc 9.12 #206

Merged
merged 4 commits into from
Jan 14, 2025
Merged

Support ghc 9.12 #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4512b9a
Make it build with ghc 9.12
erikd Jan 14, 2025
d6fa219
CI: Add ghc-9.12 to the build matrix
erikd Jan 14, 2025
e5adb8d
Update CHANGELOG files
erikd Jan 14, 2025
c913ce8
Remove derived Typeable instances
erikd Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/haskell.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ghc: ["8.10", "9.2", "9.4", "9.6", "9.8", "9.10"]
ghc: ["8.10", "9.2", "9.4", "9.6", "9.8", "9.10", "9.12"]
os: [ubuntu-latest, macos-latest, windows-latest]

defaults:
Expand Down
13 changes: 12 additions & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -11,3 +11,14 @@ 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
2 changes: 2 additions & 0 deletions io-classes/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

### next version

* Support ghc-9.12

### Breaking changes

* Added `threadLabel` to `MonadThread`
Expand Down
12 changes: 6 additions & 6 deletions io-classes/io-classes.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ library
TypeFamilyDependencies
TypeOperators
UndecidableInstances
build-depends: base >=4.9 && <4.21,
build-depends: base >=4.9 && <4.22,
array,
async >=2.1,
bytestring,
Expand Down Expand Up @@ -140,7 +140,7 @@ library strict-stm
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,

Expand All @@ -163,7 +163,7 @@ library strict-mvar
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:io-classes,
ghc-options: -Wall
-Wno-unticked-promoted-constructors
Expand All @@ -190,7 +190,7 @@ library si-timers
NumericUnderscores,
ScopedTypeVariables,
TypeFamilies
build-depends: base >=4.9 && <4.21,
build-depends: base >=4.9 && <4.22,
deepseq,
mtl,
nothunks,
Expand All @@ -214,7 +214,7 @@ library mtl
, 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,

Expand All @@ -231,7 +231,7 @@ library testlib
exposed-modules: Test.Control.Concurrent.Class.MonadMVar.Strict.WHNF
default-language: Haskell2010
default-extensions: ImportQualifiedPost
build-depends: base >=4.9 && <4.21,
build-depends: base >=4.9 && <4.22,
nothunks,
QuickCheck,
io-classes:strict-mvar
Expand Down
1 change: 0 additions & 1 deletion io-classes/src/Control/Monad/Class/MonadSTM/Internal.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1030,7 +1030,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
Copy link
Member Author

@erikd erikd Jan 14, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GHC has derived Typeable by default since ghc-8.6 or something. With ghc-9.12 a warning was added for unneeded derived instances.


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

Expand Down
1 change: 1 addition & 0 deletions io-sim/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
than one that finishes with `SimResult`.
- More polymorphic `ppTrace_` type signature.
- Fixed `tryReadTBQueue` when returning `Nothing`.
- Support ghc 9.12

## 1.6.0.0

Expand Down
2 changes: 1 addition & 1 deletion io-sim/io-sim.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ library
RankNTypes,
ScopedTypeVariables,
TypeFamilies
build-depends: base >=4.9 && <4.21,
build-depends: base >=4.9 && <4.22,
io-classes:{io-classes,strict-stm,si-timers}
^>=1.6 || ^>= 1.7,
exceptions >=0.10,
Expand Down
Loading