Skip to content

Commit d04ce72

Browse files
wenkokkewenkokke
committed
Bump GHC & Cabal versions
1 parent 42257e8 commit d04ce72

20 files changed

+264
-317
lines changed

‎.github/workflows/build-vehicle-python.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ defaults:
1313
env:
1414
# NOTE: cibuildwheel builds manylinux wheels in a container, and the versions
1515
# of GHC and Cabal are hardcoded in the `before-all-$ID.sh` scripts.
16-
DEFAULT_GHC_VERSION: "9.4.4"
17-
DEFAULT_CABAL_VERSION: "3.10.1.0"
16+
DEFAULT_GHC_VERSION: "9.4.8"
17+
DEFAULT_CABAL_VERSION: "3.10.2.1"
1818

1919
jobs:
2020
build-vehicle-python:

‎.github/workflows/build-vehicle.yml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,33 +20,33 @@ jobs:
2020
type: "windows-latest"
2121
haskell:
2222
- ghc:
23-
version: "9.4.4"
23+
version: "9.4.8"
2424
cabal:
25-
version: "3.8.1.0"
26-
project-file: "cabal.project.ghc-9.4.4"
25+
version: "3.10.2.1"
26+
project-file: "cabal.project.ghc-9.4.8"
2727
extra-args: ""
2828
include:
29-
# Build with GHC 9.6.1
29+
# Build with GHC 9.6.4
3030
- os:
3131
name: Linux
3232
type: ubuntu-latest
3333
haskell:
3434
ghc:
35-
version: "9.6.1"
35+
version: "9.6.4"
3636
cabal:
37-
version: "3.10.1.0"
38-
project-file: "cabal.project.ghc-9.6.1"
37+
version: "3.10.2.1"
38+
project-file: "cabal.project.ghc-9.6.4"
3939
extra-args: ""
40-
# Build with GHC 9.2.7
40+
# Build with GHC 9.2.8
4141
- os:
4242
name: Linux
4343
type: ubuntu-latest
4444
haskell:
4545
ghc:
46-
version: "9.2.7"
46+
version: "9.2.8"
4747
cabal:
4848
version: "3.8.1.0"
49-
project-file: "cabal.project.ghc-9.2.7"
49+
project-file: "cabal.project.ghc-9.2.8"
5050
extra-args: ""
5151
# Build with GHC 9.0.2
5252
- os:
@@ -76,10 +76,10 @@ jobs:
7676
type: ubuntu-latest
7777
haskell:
7878
ghc:
79-
version: "9.4.4"
79+
version: "9.4.8"
8080
cabal:
81-
version: "3.8.1.0"
82-
project-file: "cabal.project.nothunks.ghc-9.4.4"
81+
version: "3.10.2.1"
82+
project-file: "cabal.project.nothunks.ghc-9.4.8"
8383
extra-args: "-fnothunks"
8484
# 20-12-2022:
8585
# This test is disabled because -fghc-debug requires two threads, which triggers #342.
@@ -89,10 +89,10 @@ jobs:
8989
# type: ubuntu-latest
9090
# haskell:
9191
# ghc:
92-
# version: "9.4.4"
92+
# version: "9.4.8"
9393
# cabal:
94-
# version: "3.8.1.0"
95-
# project-file: "cabal.project.ghc-debug.ghc-9.4.4"
94+
# version: "3.10.2.1"
95+
# project-file: "cabal.project.ghc-debug.ghc-9.4.8"
9696
# extra-args: "-fghc-debug"
9797
# 20-12-2022:
9898
# This test is disabled because -fghc-debug requires two threads, which triggers #342.
@@ -102,10 +102,10 @@ jobs:
102102
# type: ubuntu-latest
103103
# haskell:
104104
# ghc:
105-
# version: "9.4.4"
105+
# version: "9.4.8"
106106
# cabal:
107-
# version: "3.8.1.0"
108-
# project-file: "cabal.project.ghc-debug.nothunks.ghc-9.4.4"
107+
# version: "3.10.2.1"
108+
# project-file: "cabal.project.ghc-debug.nothunks.ghc-9.4.8"
109109
# extra-args: "-fghc-debug -fnothunks"
110110

111111
name: vehicle / ${{ matrix.os.name }} - GHC ${{ matrix.haskell.ghc.version }} ${{ matrix.haskell.cabal.extra-args }}

‎.github/workflows/test-integration-marabou.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ jobs:
2020
plat: "macosx_10_9_x86_64"
2121
haskell:
2222
- ghc:
23-
version: "9.4.4"
23+
version: "9.4.8"
2424
cabal:
25-
version: "3.8.1.0"
26-
project-file: "cabal.project.ghc-9.4.4"
25+
version: "3.10.2.1"
26+
project-file: "cabal.project.ghc-9.4.8"
2727
extra-args: ""
2828
python:
2929
- version: "3.11"

‎CONTRIBUTING.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,14 @@ We recommend you install GHC and Cabal using [GHCup].
8181

8282
1. Install GHCup following the instruction on the website: <https://www.haskell.org/ghcup/>
8383

84-
2. Instal GHC 9.4.4 and the latest version of Cabal.
84+
2. Instal GHC 9.4.8 and the latest version of Cabal.
8585

8686
Run the following commands:
8787

8888
```sh
8989
ghcup upgrade
90-
ghcup install ghc 9.4.4
91-
ghcup set ghc 9.4.4
90+
ghcup install ghc 9.4.8
91+
ghcup set ghc 9.4.8
9292
ghcup install cabal latest
9393
ghcup set cabal latest
9494
```
@@ -104,7 +104,7 @@ We recommend you install GHC and Cabal using [GHCup].
104104
This should print:
105105

106106
```
107-
The Glorious Glasgow Haskell Compilation System, version 9.4.4
107+
The Glorious Glasgow Haskell Compilation System, version 9.4.8
108108
```
109109

110110
Run the following command:
@@ -116,15 +116,15 @@ We recommend you install GHC and Cabal using [GHCup].
116116
This should print:
117117

118118
```
119-
cabal-install version 3.10.1.0
120-
compiled using version 3.10.1.0 of the Cabal library
119+
cabal-install version 3.10.2.1
120+
compiled using version 3.10.2.1 of the Cabal library
121121
```
122122

123123
If you'd like to use a different version of GHC, you can find the list of versions that we test with in [build-vehicle.yml]. However, be aware that building the Python bindings _requires_ [our preferred version](#the-preferred-version-of-ghc).
124124

125125
##### The preferred version of GHC
126126

127-
The preferred version of GHC is currently _GHC 9.4.4_, which is the version of GHC we recommend you use, and which is required to build the Python bindings.
127+
The preferred version of GHC is currently _GHC 9.4.8_, which is the version of GHC we recommend you use, and which is required to build the Python bindings.
128128

129129
#### Building
130130

‎cabal.project.ghc-9.2.7 renamed to ‎cabal.project.ghc-9.2.8

File renamed without changes.

‎cabal.project.ghc-9.2.7.freeze renamed to ‎cabal.project.ghc-9.2.8.freeze

Lines changed: 30 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,30 @@
11
active-repositories: hackage.haskell.org:merge
2-
constraints: any.BNFC ==2.9.4.1,
2+
constraints: any.BNFC ==2.9.5,
33
any.Cabal ==3.6.3.0,
44
any.Diff ==0.4.1,
55
any.Glob ==0.10.2,
66
any.OneTuple ==0.4.1.1,
7-
any.QuickCheck ==2.14.2,
7+
any.QuickCheck ==2.14.3,
88
QuickCheck -old-random +templatehaskell,
99
any.StateVar ==1.2.2,
1010
any.aeson ==2.1.2.1,
1111
aeson -cffi +ordered-keymap,
12-
any.aeson-pretty ==0.8.9,
12+
any.aeson-pretty ==0.8.10,
1313
aeson-pretty -lib-only,
14-
any.alex ==3.2.7.1,
14+
any.alex ==3.4.0.1,
1515
any.ansi-terminal ==0.11.5,
1616
ansi-terminal -example -win32-2-13-1,
1717
any.ansi-terminal-types ==0.11.5,
18-
any.ansi-wl-pprint ==0.6.9,
19-
ansi-wl-pprint -example,
2018
any.array ==0.5.4.0,
2119
any.assoc ==1.1,
2220
assoc +tagged,
23-
any.async ==2.2.4,
24-
async -bench,
2521
any.attoparsec ==0.14.4,
2622
attoparsec -developer,
23+
any.attoparsec-aeson ==2.1.0.0,
2724
any.base ==4.16.4.0,
28-
any.base-compat ==0.13.0,
29-
any.base-compat-batteries ==0.13.0,
30-
any.base-orphans ==0.9.0,
25+
any.base-compat ==0.13.1,
26+
any.base-compat-batteries ==0.13.1,
27+
any.base-orphans ==0.9.1,
3128
any.bifunctors ==5.6.1,
3229
bifunctors +tagged,
3330
any.binary ==0.8.9.0,
@@ -58,65 +55,63 @@ constraints: any.BNFC ==2.9.4.1,
5855
any.dlist ==1.0,
5956
dlist -werror,
6057
any.exceptions ==0.10.4,
58+
any.file-embed ==0.0.15.0,
6159
any.filepath ==1.4.2.2,
6260
any.foldable1-classes-compat ==0.1,
6361
foldable1-classes-compat +tagged,
64-
any.free ==5.2,
6562
any.generically ==0.1.1,
6663
any.ghc-bignum ==1.2,
67-
any.ghc-boot-th ==9.2.7,
64+
any.ghc-boot-th ==9.2.8,
6865
any.ghc-prim ==0.8.0,
66+
any.gitrev ==1.3.1,
6967
any.happy ==1.20.1.1,
70-
any.hashable ==1.4.2.0,
68+
any.hashable ==1.4.3.0,
7169
hashable +integer-gmp -random-initial-seed,
72-
any.hsc2hs ==0.68.9,
70+
any.hsc2hs ==0.68.10,
7371
hsc2hs -in-ghc-tree,
74-
any.indexed-traversable ==0.1.2.1,
72+
any.indexed-traversable ==0.1.3,
7573
any.indexed-traversable-instances ==0.1.1.2,
7674
any.integer-logarithms ==1.0.3.1,
7775
integer-logarithms -check-bounds +integer-gmp,
7876
any.linkedhashmap ==0.4.0.0,
7977
any.mnist-idx ==0.1.3.2,
8078
any.mtl ==2.2.2,
8179
any.old-locale ==1.0.0.7,
82-
any.optparse-applicative ==0.17.0.0,
80+
any.optparse-applicative ==0.18.1.0,
8381
optparse-applicative +process,
8482
any.parsec ==3.1.15.0,
8583
any.pretty ==1.1.3.6,
8684
any.prettyprinter ==1.7.1,
8785
prettyprinter -buildreadme +text,
86+
any.prettyprinter-ansi-terminal ==1.1.3,
8887
any.primitive ==0.8.0.0,
8988
any.process ==1.6.16.0,
90-
any.profunctors ==5.6.2,
9189
any.random ==1.2.1.1,
92-
any.recursion-schemes ==5.2.2.4,
93-
recursion-schemes +template-haskell,
9490
any.regex-base ==0.94.0.2,
95-
any.regex-tdfa ==1.3.2,
96-
regex-tdfa -force-o2,
91+
any.regex-tdfa ==1.3.2.2,
92+
regex-tdfa +doctest -force-o2,
9793
any.rts ==1.0.2,
9894
any.scientific ==0.3.7.0,
9995
scientific -bytestring-builder -integer-simple,
10096
any.semialign ==1.3,
10197
semialign +semigroupoids,
10298
any.semigroupoids ==6.0.0.1,
10399
semigroupoids +comonad +containers +contravariant +distributive +tagged +unordered-containers,
104-
any.split ==0.2.3.5,
105-
any.splitmix ==0.1.0.4,
100+
any.split ==0.2.4,
101+
any.splitmix ==0.1.0.5,
106102
splitmix -optimised-mixer,
103+
any.sscript ==0.1.0.2,
107104
any.stm ==2.5.0.2,
108105
any.strict ==0.5,
109-
any.string-qq ==0.0.4,
110-
any.tagged ==0.8.7,
106+
any.string-qq ==0.0.5,
107+
any.tagged ==0.8.8,
111108
tagged +deepseq +transformers,
112109
any.tasty ==1.4.3,
113110
tasty +unix,
114-
any.tasty-golden ==2.3.5,
115-
tasty-golden -build-example,
116-
any.tasty-hunit ==0.10.0.3,
111+
any.tasty-hunit ==0.10.1,
117112
any.template-haskell ==2.18.0.0,
118113
any.temporary ==1.3,
119-
any.terminal-progress-bar ==0.4.1,
114+
any.terminal-progress-bar ==0.4.2,
120115
any.terminal-size ==0.3.3,
121116
any.text ==1.2.5.0,
122117
any.text-short ==0.1.5,
@@ -127,20 +122,16 @@ constraints: any.BNFC ==2.9.4.1,
127122
any.time-compat ==1.9.6.1,
128123
time-compat -old-locale,
129124
any.transformers ==0.5.6.2,
130-
any.transformers-base ==0.4.6,
131-
transformers-base +orphaninstances,
132125
any.transformers-compat ==0.7.2,
133126
transformers-compat -five +five-three -four +generic-deriving +mtl -three -two,
134-
any.typed-process ==0.2.11.0,
135127
any.unix ==2.7.2.2,
136-
any.unliftio-core ==0.2.1.0,
137128
any.unordered-containers ==0.2.19.1,
138129
unordered-containers -debug,
139-
any.uuid-types ==1.0.5,
140-
any.vector ==0.13.0.0,
130+
any.uuid-types ==1.0.5.1,
131+
any.vector ==0.13.1.0,
141132
vector +boundschecks -internalchecks -unsafechecks -wall,
142133
any.vector-stream ==0.1.0.0,
143-
vehicle -ghc-debug -nothunks,
144-
vehicle-syntax -ghc-debug -nothunks,
134+
vehicle -ghc-debug -nothunks -optimise-heavily -release-build,
135+
vehicle-syntax -ghc-debug -nothunks -optimise-heavily,
145136
any.witherable ==0.4.2
146-
index-state: hackage.haskell.org 2023-04-03T17:27:20Z
137+
index-state: hackage.haskell.org 2023-12-30T13:39:40Z

‎cabal.project.ghc-9.4.4 renamed to ‎cabal.project.ghc-9.4.8

File renamed without changes.

0 commit comments

Comments
 (0)