Skip to content

Commit 40145ca

Browse files
committed
Bump stack resolver to 21.20
This bumps GHC to 9.4.7 and requires a few dependency bumps. Unfortunately, `msgpack` does not really seem to be maintained these days, so we will have to `allow-newer: true` until they bump their upper bounds.
1 parent 6e57282 commit 40145ca

File tree

6 files changed

+54
-58
lines changed

6 files changed

+54
-58
lines changed

lighthouse-client/lighthouse-client.cabal

+22-22
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,17 @@ library
4141
src
4242
ghc-options: -Wall
4343
build-depends:
44-
base >=4.14 && <5
45-
, bytestring ==0.10.*
46-
, msgpack ==1.0.*
47-
, mtl ==2.2.*
48-
, network ==3.1.*
49-
, random >=1.2.1 && <1.3
50-
, text ==1.2.*
51-
, transformers ==0.5.*
52-
, vector ==0.12.*
53-
, websockets ==0.12.*
54-
, wuss ==1.1.*
44+
base >=4.17 && <5
45+
, bytestring >=0.11 && <1
46+
, msgpack >=1.0 && <2
47+
, mtl >=2.3 && <3
48+
, network >=3.1 && <4
49+
, random >=1.2.1 && <2
50+
, text >=2.1 && <3
51+
, transformers >=0.6 && <1
52+
, vector >=0.13 && <1
53+
, websockets >=0.12 && <1
54+
, wuss >=2.0 && <3
5555
default-language: Haskell2010
5656

5757
test-suite lighthouse-client-test
@@ -63,16 +63,16 @@ test-suite lighthouse-client-test
6363
test
6464
ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
6565
build-depends:
66-
base >=4.14 && <5
67-
, bytestring ==0.10.*
66+
base >=4.17 && <5
67+
, bytestring >=0.11 && <1
6868
, lighthouse-client
69-
, msgpack ==1.0.*
70-
, mtl ==2.2.*
71-
, network ==3.1.*
72-
, random >=1.2.1 && <1.3
73-
, text ==1.2.*
74-
, transformers ==0.5.*
75-
, vector ==0.12.*
76-
, websockets ==0.12.*
77-
, wuss ==1.1.*
69+
, msgpack >=1.0 && <2
70+
, mtl >=2.3 && <3
71+
, network >=3.1 && <4
72+
, random >=1.2.1 && <2
73+
, text >=2.1 && <3
74+
, transformers >=0.6 && <1
75+
, vector >=0.13 && <1
76+
, websockets >=0.12 && <1
77+
, wuss >=2.0 && <3
7878
default-language: Haskell2010

lighthouse-client/package.yaml

+11-11
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ category: Web
1717
description: Please see the README on GitHub at <https://github.com/ProjectLighthouseCAU/project-lighthouse-haskell#readme>
1818

1919
dependencies:
20-
- base >= 4.14 && < 5
21-
- bytestring >= 0.10 && < 0.11
22-
- text >= 1.2 && < 1.3
23-
- random >= 1.2.1 && < 1.3
24-
- mtl >= 2.2 && < 2.3
25-
- transformers >= 0.5 && < 0.6
26-
- vector >= 0.12 && < 0.13
27-
- msgpack >= 1.0 && < 1.1
28-
- network >= 3.1 && < 3.2
29-
- websockets >= 0.12 && < 0.13
30-
- wuss >= 1.1 && < 1.2
20+
- base >= 4.17 && < 5
21+
- bytestring >= 0.11 && < 1
22+
- text >= 2.1 && < 3
23+
- random >= 1.2.1 && < 2
24+
- mtl >= 2.3 && < 3
25+
- transformers >= 0.6 && < 1
26+
- vector >= 0.13 && < 1
27+
- msgpack >= 1.0 && < 2
28+
- network >= 3.1 && < 4
29+
- websockets >= 0.12 && < 1
30+
- wuss >= 2.0 && < 3
3131

3232
library:
3333
source-dirs: src

lighthouse-demo/lighthouse-demo.cabal

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ executable lighthouse-demo
3131
app
3232
ghc-options: -threaded -rtsopts -with-rtsopts=-N -Wall
3333
build-depends:
34-
JuicyPixels ==3.3.*
35-
, base >=4.14 && <5
34+
JuicyPixels >=3.3 && <4
35+
, base >=4.17 && <5
3636
, lighthouse-client
37-
, mtl ==2.2.*
38-
, random >=1.2.1 && <1.3
39-
, text ==1.2.*
40-
, transformers ==0.5.*
37+
, mtl >=2.3 && <3
38+
, random >=1.2.1 && <2
39+
, text >=2.1 && <3
40+
, transformers >=0.6 && <1
4141
default-language: Haskell2010

lighthouse-demo/package.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ category: Application
1717
description: Please see the README on GitHub at <https://github.com/ProjectLighthouseCAU/lighthouse-haskell#readme>
1818

1919
dependencies:
20-
- base >= 4.14 && < 5
21-
- text >= 1.2 && < 1.3
22-
- mtl >= 2.2 && < 2.3
23-
- transformers >= 0.5 && < 0.6
24-
- random >= 1.2.1 && < 1.3
25-
- JuicyPixels >= 3.3 && < 3.4
20+
- base >= 4.17 && < 5
21+
- text >= 2.1 && < 3
22+
- mtl >= 2.3 && < 3
23+
- transformers >= 0.6 && < 1
24+
- random >= 1.2.1 && < 2
25+
- JuicyPixels >= 3.3 && < 4
2626

2727
executables:
2828
lighthouse-demo:

stack.yaml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
# Resolver to choose a 'specific' stackage snapshot or a compiler version.
22
# A snapshot resolver dictates the compiler version and the set of packages
33
# to be used for project dependencies.
4-
resolver: lts-18.23
4+
resolver: lts-21.20
55

66
# User packages to be built.
77
packages:
88
- lighthouse-client
99
- lighthouse-demo
1010

1111
extra-deps:
12-
- random-1.2.1
1312
- msgpack-1.0.1.0
13+
14+
# Unfortunately, msgpack still has outdated upper bounds,
15+
# so we will have to ignore those constraints.
16+
allow-newer: true

stack.yaml.lock

+4-11
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,6 @@
44
# https://docs.haskellstack.org/en/stable/lock_files
55

66
packages:
7-
- completed:
8-
hackage: random-1.2.1@sha256:8bee24dc0c985a90ee78d94c61f8aed21c49633686f0f1c14c5078d818ee43a2,6598
9-
pantry-tree:
10-
sha256: 8bdc994ce41f43624ab42302a881fe5a0f81d965f5d238841e24943664681a06
11-
size: 1528
12-
original:
13-
hackage: random-1.2.1
147
- completed:
158
hackage: msgpack-1.0.1.0@sha256:a87b663fc28d661b41552331d22e10b34028cad8a592ae758ac47e363933b6bd,3004
169
pantry-tree:
@@ -20,7 +13,7 @@ packages:
2013
hackage: msgpack-1.0.1.0
2114
snapshots:
2215
- completed:
23-
sha256: 7f69bb29a57495586e7e3ed31ecc59c0d2c959cb23bd52b71ca676f254c9beb1
24-
size: 587819
25-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/23.yaml
26-
original: lts-18.23
16+
sha256: 5921ddc75f5dd3f197fbc32e1e5676895a8e7b971d4f82ef6b556657801dd18a
17+
size: 640054
18+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/20.yaml
19+
original: lts-21.20

0 commit comments

Comments
 (0)