Skip to content

Commit 4dd62ad

Browse files
committed
Set default ghc version to 9.4.6
1 parent 2265ebf commit 4dd62ad

File tree

15 files changed

+35
-34
lines changed

15 files changed

+35
-34
lines changed

.github/workflows/workflow.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
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.4.6
59+
- ghc: 9.2.8
6060
bzlmod: true
6161
- ghc: 9.6.2
6262
bzlmod: true
@@ -149,7 +149,7 @@ jobs:
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.4.6
152+
- ghc: 9.2.8
153153
bzlmod: true
154154
- ghc: 9.6.2
155155
bzlmod: true

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.2.8"
1+
test_ghc_version = "9.4.6"
22
test_asterius_version = "0.0.1"

examples/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ rules_haskell_dependencies()
1717
load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
1818

1919
haskell_register_ghc_nixpkgs(
20-
attribute_path = "haskell.compiler.ghc928",
20+
attribute_path = "haskell.compiler.ghc946",
2121
repository = "@rules_haskell//nixpkgs:default.nix",
22-
version = "9.2.8",
22+
version = "9.4.6",
2323
)
2424

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

27-
rules_haskell_toolchains(version = "9.2.8")
27+
rules_haskell_toolchains(version = "9.4.6")
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.2.8"
5+
DEFAULT_GHC_VERSION = "9.4.6"

rules_haskell_nix/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ nix_haskell_toolchains = use_extension(
4242
# Declare a default nix-based toolchain
4343
nix_haskell_toolchains.new(
4444
attribute_path = "",
45-
nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc928.ghc""",
45+
nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc946.ghc""",
4646
repository = "@nixpkgs_default",
47-
version = "9.2.8",
47+
version = "9.4.6",
4848
)
4949
use_repo(
5050
nix_haskell_toolchains,

rules_haskell_tests/MODULE.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ haskell_toolchains = use_extension(
250250
"haskell_toolchains",
251251
)
252252

253-
test_ghc_version = "9.2.8"
253+
test_ghc_version = "9.4.6"
254254

255255
test_ghcopts = [
256256
"-XStandaloneDeriving", # Flag used at compile time
@@ -316,12 +316,13 @@ nix_haskell_toolchains = use_extension(
316316
"@rules_haskell_nix//extensions:nix_haskell_toolchains.bzl",
317317
"nix_haskell_toolchains",
318318
)
319+
319320
nix_haskell_toolchains.new(
320321
attribute_path = "",
321322
cabalopts = test_cabalopts,
322323
ghcopts = test_ghcopts,
323324
haddock_flags = test_haddock_flags,
324-
nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc928.ghc""",
325+
nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc946.ghc""",
325326
repl_ghci_args = test_repl_ghci_args,
326327
repository = "@nixpkgs_default",
327328
version = test_ghc_version,

rules_haskell_tests/shell.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{ pkgs ? import ./nixpkgs { }, docTools ? true, ghcVersion ? "9.2.8" }:
1+
{ pkgs ? import ./nixpkgs { }, docTools ? true, ghcVersion ? "9.4.6" }:
22

33
with pkgs;
44
mkShell {

rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ rules_haskell_dependencies()
1515
load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
1616

1717
haskell_register_ghc_nixpkgs(
18-
attribute_path = "haskell.compiler.ghc928",
18+
attribute_path = "haskell.compiler.ghc946",
1919
repository = "@rules_haskell//nixpkgs:default.nix",
20-
version = "9.2.8",
20+
version = "9.4.6",
2121
)
2222

2323
load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
2424

25-
rules_haskell_toolchains(version = "9.2.8")
25+
rules_haskell_toolchains(version = "9.4.6")
2626

2727
load(
2828
"@rules_nixpkgs_core//:nixpkgs.bzl",

rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ rules_haskell_dependencies()
1515
load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
1616

1717
haskell_register_ghc_nixpkgs(
18-
attribute_path = "haskell.compiler.ghc928",
18+
attribute_path = "haskell.compiler.ghc946",
1919
repository = "@rules_haskell//nixpkgs:default.nix",
20-
version = "9.2.8",
20+
version = "9.4.6",
2121
)
2222

2323
load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
2424

25-
rules_haskell_toolchains(version = "9.2.8")
25+
rules_haskell_toolchains(version = "9.4.6")
2626

2727
load(
2828
"@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",

rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ rules_haskell_dependencies()
1010
load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
1111

1212
haskell_register_ghc_nixpkgs(
13-
attribute_path = "haskell.compiler.ghc928",
13+
attribute_path = "haskell.compiler.ghc946",
1414
repository = "@rules_haskell//nixpkgs:default.nix",
15-
version = "9.2.8",
15+
version = "9.4.6",
1616
)
1717

1818
load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
1919

20-
rules_haskell_toolchains(version = "9.2.8")
20+
rules_haskell_toolchains(version = "9.4.6")
2121

2222
load(
2323
"@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",

0 commit comments

Comments
 (0)