Skip to content

Commit f2faa40

Browse files
committed
Upgrade GHC 9.6.2 -> 9.6.5
- use lts-22.27 for ghc 9.6.5 - drop override for protoc and ghc-source-gen packages and use packages from hackage instead - re-pin stackage snapshots
1 parent 6012182 commit f2faa40

19 files changed

+444
-443
lines changed

.github/workflows/workflow.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
bzlmod: [true, false]
4949
ghc:
5050
- 9.4.6
51-
- 9.6.2
51+
- 9.6.5
5252
- 9.8.1
5353
exclude:
5454
- module: rules_haskell_nix
@@ -58,7 +58,7 @@ jobs:
5858
# and stack config per GHC version
5959
- ghc: 9.8.1
6060
bzlmod: true
61-
- ghc: 9.6.2
61+
- ghc: 9.6.5
6262
bzlmod: true
6363
runs-on: ${{ matrix.os }}
6464
env:
@@ -144,14 +144,14 @@ jobs:
144144
bzlmod: [true, false]
145145
ghc:
146146
- 9.4.6
147-
- 9.6.2
147+
- 9.6.5
148148
- 9.8.1
149149
exclude:
150150
# TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
151151
# and stack config per GHC version
152152
- ghc: 9.8.1
153153
bzlmod: true
154-
- ghc: 9.6.2
154+
- ghc: 9.6.5
155155
bzlmod: true
156156
# currently proto-lens-protoc fails with an access violation on Windows
157157
- ghc: 9.6.2

rules_haskell_tests/ghcide-snapshot_9.6.2.json

Lines changed: 0 additions & 200 deletions
This file was deleted.

rules_haskell_tests/ghcide-snapshot_9.6.5.json

Lines changed: 205 additions & 0 deletions
Large diffs are not rendered by default.

rules_haskell_tests/ghcide-stack-snapshot_9.6.2.yaml renamed to rules_haskell_tests/ghcide-stack-snapshot_9.6.5.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: nightly-2023-09-03
1+
resolver: lts-22.27
22

33
packages:
44
- ghcide-2.2.0.0

rules_haskell_tests/stackage-pinning-test_9.6.2.yaml renamed to rules_haskell_tests/stackage-pinning-test_9.6.5.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
resolver: nightly-2023-09-03
1+
resolver: lts-22.27
22
packages:
33
- github: hspec/hspec
44
# NOTE Keep in sync with resolver version
5-
commit: "a8c7472ca344fa5b87dfaea8f1dd760ec9feceb2"
6-
sha256: "d8aac8b70bcd6208d59383fdb132fcbaaa3be650e17d8316476d75cc9d60b993"
5+
commit: "c19f465d082b585e21f4e0d9f62691bdc9b0792a"
6+
sha256: "114792383e60e91dc4d5a177c6c1c0a42ba200449e4294ab891d1b0a6b820739"
77
subdirs:
88
- .
99
- hspec-contrib

rules_haskell_tests/stackage-pinning-test_snapshot_9.6.2.json

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)