Skip to content

Commit 11c58c6

Browse files
committed
Update GHC versions and repin
- 9.4.6 -> 9.4.8 - 9.8.1 -> 9.8.2
1 parent fad1417 commit 11c58c6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+704
-454
lines changed

.github/workflows/workflow.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ jobs:
4747
module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
4848
bzlmod: [true, false]
4949
ghc:
50-
- 9.4.6
50+
- 9.4.8
5151
- 9.6.5
52-
- 9.8.1
52+
- 9.8.2
5353
exclude:
5454
- module: rules_haskell_nix
5555

5656
bzlmod: false
5757
# TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
5858
# and stack config per GHC version
59-
- ghc: 9.8.1
59+
- ghc: 9.8.2
6060
bzlmod: true
6161
- ghc: 9.6.5
6262
bzlmod: true
@@ -143,20 +143,20 @@ jobs:
143143
module: [rules_haskell, rules_haskell_tests]
144144
bzlmod: [true, false]
145145
ghc:
146-
- 9.4.6
146+
- 9.4.8
147147
- 9.6.5
148-
- 9.8.1
148+
- 9.8.2
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
152-
- ghc: 9.8.1
152+
- ghc: 9.8.2
153153
bzlmod: true
154154
- ghc: 9.6.5
155155
bzlmod: true
156-
# currently proto-lens-protoc fails with an access violation on Windows
156+
# currently proto-lens-protoc (read: protoc-gen-haskell) fails with an access violation on Windows
157157
- ghc: 9.6.5
158158
os: windows-latest
159-
- ghc: 9.8.1
159+
- ghc: 9.8.2
160160
os: windows-latest
161161
env:
162162
GHC_VERSION: ${{ matrix.ghc }}

constants.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
test_ghc_version = "9.4.6"
1+
test_ghc_version = "9.4.8"
22
test_asterius_version = "0.0.1"

examples/WORKSPACE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
1919
haskell_register_ghc_nixpkgs(
2020
attribute_path = "haskell.compiler.ghc946",
2121
repository = "@rules_haskell//nixpkgs:default.nix",
22-
version = "9.4.6",
22+
version = "9.4.8",
2323
)
2424

2525
load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
2626

27-
rules_haskell_toolchains(version = "9.4.6")
27+
rules_haskell_toolchains(version = "9.4.8")
2828

2929
load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
3030
load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")

haskell/ghc.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# (see stackage.org).
33

44
# Currently, we are using GHC 9.2.x as default.
5-
DEFAULT_GHC_VERSION = "9.4.6"
5+
DEFAULT_GHC_VERSION = "9.4.8"

rules_haskell_nix/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ nix_haskell_toolchains.new(
4444
attribute_path = "",
4545
nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc946.ghc""",
4646
repository = "@nixpkgs_default",
47-
version = "9.4.6",
47+
version = "9.4.8",
4848
)
4949
use_repo(
5050
nix_haskell_toolchains,

rules_haskell_tests/MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ haskell_toolchains = use_extension(
257257
"haskell_toolchains",
258258
)
259259

260-
test_ghc_version = "9.4.6"
260+
test_ghc_version = "9.4.8"
261261

262262
test_ghcopts = [
263263
"-XStandaloneDeriving", # Flag used at compile time

rules_haskell_tests/ghcide-snapshot_9.8.1.json renamed to rules_haskell_tests/ghcide-snapshot_9.4.8.json

Lines changed: 91 additions & 95 deletions
Large diffs are not rendered by default.

rules_haskell_tests/ghcide-snapshot_9.8.2.json

Lines changed: 198 additions & 0 deletions
Large diffs are not rendered by default.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ghcide-stack-snapshot_9.4.6.yaml
1+
ghcide-stack-snapshot_9.4.8.yaml

rules_haskell_tests/ghcide-stack-snapshot_9.4.6.yaml renamed to rules_haskell_tests/ghcide-stack-snapshot_9.4.8.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
resolver: lts-21.11
1+
resolver: lts-21.25
22

33
packages:
44
- algebraic-graphs-0.6
@@ -32,7 +32,7 @@ drop-packages:
3232
- Win32
3333

3434

35-
# stackage lts-21.11/ghc 9.4.6 only contains Win32-2.12.0.1
35+
# stackage lts-21.25/ghc 9.4.8 only contains Win32-2.12.0.1
3636
flags:
3737
ansi-terminal:
3838
Win32-2-13-1: false

0 commit comments

Comments
 (0)