Skip to content

Commit 4084556

Browse files
cootcoot
committed
io-sim-1.3.0.0 release
Also make the packages compatible with `ghc-9.8`.
1 parent 4437193 commit 4084556

File tree

16 files changed

+112
-60
lines changed

16 files changed

+112
-60
lines changed

‎.github/workflows/haskell.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
ghc: ["8.10.7", "9.2.8", "9.4.4", "9.6.2"]
17-
cabal: ["3.8.1.0"]
16+
ghc: ["8.10", "9.2", "9.4", "9.6", "9.8"]
1817
os: [ubuntu-latest, macos-latest, windows-latest]
1918

2019
defaults:
@@ -41,12 +40,12 @@ jobs:
4140
run: echo "CACHE_VERSION=pu4Aevoo_v1" >> $GITHUB_ENV
4241

4342
- name: "LINUX: Setup Haskell"
44-
uses: haskell/actions/setup@v2
43+
uses: haskell-actions/setup@v2
4544
if: runner.os != 'Windows'
4645
id: setup-haskell
4746
with:
4847
ghc-version: ${{ matrix.ghc }}
49-
cabal-version: ${{ matrix.cabal }}
48+
cabal-version: "3.10.1.0"
5049

5150
- name: "WIN: Setup Haskell"
5251
id: win-setup-haskell
@@ -151,11 +150,11 @@ jobs:
151150
sudo apt-get -y install fd-find
152151
153152
- name: "Setup Haskell"
154-
uses: haskell/actions/setup@v2
153+
uses: haskell-actions/setup@v2
155154
id: setup-haskell
156155
with:
157-
ghc-version: 9.2.8
158-
cabal-version: 3.8.1.0
156+
ghc-version: 9.6.3
157+
cabal-version: 3.10.1.0
159158

160159
- name: "Setup cabal bin path"
161160
run: |

‎cabal.project

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,4 @@
1-
-- Custom repository for cardano haskell packages, see CONTRIBUTING for more
2-
repository cardano-haskell-packages
3-
url: https://input-output-hk.github.io/cardano-haskell-packages
4-
secure: True
5-
root-keys:
6-
3e0cce471cf09815f930210f7827266fd09045445d65923e6d0238a6cd15126f
7-
443abb7fb497a134c343faf52f0b659bd7999bc06b7f63fa76dc99d631f9bea1
8-
a86a1f6ce86c449c46666bda44268677abf29b5b2d2eb5ec7af903ec2f117a82
9-
bcec67e8e99cabfa7764d75ad9b158d72bfacf70ca1d0ec8bc6b4406d1bf8413
10-
c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56
11-
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
12-
13-
index-state:
14-
, hackage.haskell.org 2023-09-20T00:00:00Z
15-
, cardano-haskell-packages 2022-11-15T17:30:00Z
16-
17-
-- TODO: early ghc-9.6 support
18-
-- https://github.com/nikita-volkov/strict-list/issues/1
19-
allow-newer: strict-list:semigroupoids
1+
index-state: hackage.haskell.org 2023-11-06T00:00:00Z
202

213
packages: ./io-sim
224
./io-classes

‎io-classes-mtl/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Revision history for io-classes-mtl
22

3+
## next release
4+
5+
### Breaking changes
6+
7+
### Non-breaking changes
8+
9+
## 0.1.0.2
10+
11+
* Support `ghc-9.8`.
12+
313
## 0.1.0.1
414

515
### Non breaking changes

‎io-classes-mtl/io-classes-mtl.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: io-classes-mtl
3-
version: 0.1.0.1
3+
version: 0.1.0.2
44
synopsis: Experimental MTL instances for io-classes
55
description:
66
MTL instances for
@@ -15,7 +15,7 @@ category: Control
1515
build-type: Simple
1616
extra-doc-files: README.md CHANGELOG.md
1717
bug-reports: https://github.com/input-output-hk/io-sim/issues
18-
tested-with: GHC == { 8.10, 9.2, 9.4, 9.6 }
18+
tested-with: GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
1919

2020
common warnings
2121
ghc-options: -Wall
@@ -40,11 +40,11 @@ library
4040
, Control.Monad.Class.MonadTime.SI.Trans
4141
, Control.Monad.Class.MonadTimer.Trans
4242
, Control.Monad.Class.MonadTimer.SI.Trans
43-
build-depends: base >=4.9 && <4.19,
43+
build-depends: base >=4.9 && <4.20,
4444
array,
4545
mtl,
4646

47-
io-classes >= 1.0 && < 1.3,
47+
io-classes >= 1.0 && < 1.4,
4848
si-timers,
4949

5050

‎io-classes/CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# Revsion history of io-classes
22

3+
## next release
4+
5+
### Breaking changes
6+
7+
### Non-breaking changes
8+
9+
## 1.3.0.0
10+
11+
- `io-sim-1.3.0.0`.
12+
* Support `ghc-9.8`.
13+
314
## 1.2.0.0
415

516
### Non-breaking changes
@@ -8,7 +19,6 @@
819
an `MVar` in an underlying monad (if applicable). This is mainly useful for
920
`io-sim`, since the underlying monad is `ST`. `IO` has no underlying monad, so
1021
the provided instance for `IO` defaults `inspectMVar` to `tryReadMVar`.
11-
1222
* Add some Haddock documentation to `MonadDelay`
1323

1424
## 1.1.0.0

‎io-classes/io-classes.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: io-classes
3-
version: 1.2.0.0
3+
version: 1.3.0.0
44
synopsis: Type classes for concurrency with STM, ST and timing
55
description:
66
IO Monad class hierarchy compatible with
@@ -15,7 +15,7 @@ category: Control
1515
build-type: Simple
1616
extra-doc-files: CHANGELOG.md README.md
1717
bug-reports: https://github.com/input-output-hk/io-sim/issues
18-
tested-with: GHC == { 8.10, 9.2, 9.4, 9.6 }
18+
tested-with: GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
1919

2020
source-repository head
2121
type: git
@@ -89,7 +89,7 @@ library
8989
TypeFamilyDependencies
9090
TypeOperators
9191
UndecidableInstances
92-
build-depends: base >=4.9 && <4.19,
92+
build-depends: base >=4.9 && <4.20,
9393
array,
9494
async >=2.1,
9595
bytestring,

‎io-sim/CHANGELOG.md

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
# Revsion history of io-sim
22

3-
## next
3+
## next release
4+
5+
### Breaking changes
6+
7+
### Non-breaking changes
8+
9+
## 1.3.0.0
410

511
### Breaking changes
612

@@ -15,7 +21,7 @@
1521
there's a bug in `IOSimPOR`. Currently it's only used by some of the
1622
assertions in `IOSimPOR`.
1723

18-
#### Non breaking changes
24+
#### Non-breaking changes
1925

2026
* Refactored the internal API to avoid `unsafePerformIO`.
2127
* Fixed bugs which lead to discovery of schedules which are impossible to run.
@@ -34,6 +40,7 @@
3440
trace of these calls.
3541
* Fixed `traceTVar` for `TVar`'s created with `registerDelay`.
3642
* Added pretty printer for `SimResult`, and other pretty printer improvements.
43+
* Support `ghc-9.8`.
3744

3845
## 1.2.0.0
3946

@@ -46,20 +53,20 @@
4653
- `selectTraceEventsSayWithTime`
4754
- `selectTraceEventsSayWithTime'`
4855

49-
### Non breaking changes
56+
### Non-breaking changes
5057

5158
* Provide `MonadInspectMVar` instance for `IOSim`.
5259
- Added NFData & NoThunks instances for `ThreadId`
5360

5461
## 1.1.0.0
5562

56-
### Non breaking changes
63+
### Non-breaking changes
5764

5865
* `io-classes-1.1.0.0`
5966

6067
## 1.0.0.1
6168

62-
### Non breaking changes
69+
### Non-breaking changes
6370

6471
* Support `ghc-9.6`.
6572

@@ -76,7 +83,7 @@
7683

7784
* Added `TimeoutId` to `EventThreadDelay` and `EventThreadFired` events.
7885

79-
### Non breaking changes
86+
### Non-breaking changes
8087

8188
* Fixed `threadDelay` in presence of asynchronous exceptions (in `IOSim` and `IOSimPOR`) (#80).
8289
* Fixed bug in `IOSim` & `IOSimPOR` which resulted in reusing existing

‎io-sim/io-sim.cabal

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 3.0
22
name: io-sim
3-
version: 1.2.0.0
3+
version: 1.3.0.0
44
synopsis: A pure simulator for monadic concurrency with STM.
55
description:
66
A pure simulator monad with support of concurency (base, async), stm,
@@ -15,7 +15,7 @@ category: Testing
1515
build-type: Simple
1616
extra-doc-files: CHANGELOG.md README.md
1717
bug-reports: https://github.com/input-output-hk/io-sim/issues
18-
tested-with: GHC == { 8.10, 9.2, 9.4, 9.6 }
18+
tested-with: GHC == { 8.10, 9.2, 9.4, 9.6, 9.8 }
1919

2020
flag asserts
2121
description: Enable assertions
@@ -74,15 +74,15 @@ library
7474
RankNTypes,
7575
ScopedTypeVariables,
7676
TypeFamilies
77-
build-depends: base >=4.9 && <4.19,
78-
io-classes ^>=1.2,
77+
build-depends: base >=4.9 && <4.20,
78+
io-classes ^>=1.3,
7979
exceptions >=0.10,
8080
containers,
8181
deepseq,
8282
nothunks,
8383
psqueues >=0.2 && <0.3,
84-
strict-stm ^>=1.2,
85-
si-timers ^>=1.2,
84+
strict-stm ^>=1.3,
85+
si-timers ^>=1.3,
8686
time >=1.9.1 && <1.13,
8787
quiet,
8888
QuickCheck,
@@ -116,7 +116,8 @@ test-suite test
116116
time
117117
ghc-options: -fno-ignore-asserts
118118
-rtsopts
119-
-- -threaded
119+
if impl(ghc >= 9.8)
120+
ghc-options: -Wno-x-partial
120121

121122
benchmark bench
122123
import: warnings

‎io-sim/src/Control/Monad/IOSim/Internal.hs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{-# LANGUAGE BangPatterns #-}
2+
{-# LANGUAGE CPP #-}
23
{-# LANGUAGE DerivingVia #-}
34
{-# LANGUAGE ExistentialQuantification #-}
45
{-# LANGUAGE FlexibleInstances #-}
@@ -12,6 +13,10 @@
1213
-- incomplete uni patterns in 'schedule' (when interpreting 'StmTxCommitted')
1314
-- and 'reschedule'.
1415
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
16+
#if __GLASGOW_HASKELL__ >= 908
17+
-- We use partial functions from `Data.List`.
18+
{-# OPTIONS_GHC -Wno-x-partial #-}
19+
#endif
1520

1621
module Control.Monad.IOSim.Internal
1722
( IOSim (..)

‎io-sim/src/Control/Monad/IOSimPOR/Internal.hs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{-# LANGUAGE BangPatterns #-}
2+
{-# LANGUAGE CPP #-}
23
{-# LANGUAGE DerivingVia #-}
34
{-# LANGUAGE ExistentialQuantification #-}
45
{-# LANGUAGE FlexibleContexts #-}
@@ -15,6 +16,10 @@
1516
-- incomplete uni patterns in 'schedule' (when interpreting 'StmTxCommitted')
1617
-- and 'reschedule'.
1718
{-# OPTIONS_GHC -Wno-incomplete-uni-patterns -Wno-unused-matches #-}
19+
#if __GLASGOW_HASKELL__ >= 908
20+
-- We use partial functions from `Data.List`.
21+
{-# OPTIONS_GHC -Wno-x-partial #-}
22+
#endif
1823

1924
module Control.Monad.IOSimPOR.Internal
2025
( IOSim (..)

0 commit comments

Comments
 (0)