Merge pull request #2277 from tweag/cb/upgrade-ghc-versions

Update GHC versions

Author: mergify[bot]

.github/workflows/workflow.yaml

@@ -47,16 +47,16 @@ jobs:
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.4.6
+          - 9.4.8
           - 9.6.5
-          - 9.8.1
+          - 9.8.2
         exclude:
           - module: rules_haskell_nix
 
             bzlmod: false
           # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
           #       and stack config per GHC version
-          - ghc: 9.8.1
+          - ghc: 9.8.2
             bzlmod: true
           - ghc: 9.6.5
             bzlmod: true
@@ -143,20 +143,20 @@ jobs:
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.4.6
+          - 9.4.8
           - 9.6.5
-          - 9.8.1
+          - 9.8.2
         exclude:
           # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json
           #       and stack config per GHC version
-          - ghc: 9.8.1
+          - ghc: 9.8.2
             bzlmod: true
           - ghc: 9.6.5
             bzlmod: true
-          # currently proto-lens-protoc fails with an access violation on Windows
+          # currently proto-lens-protoc (read: protoc-gen-haskell) fails with an access violation on Windows
           - ghc: 9.6.5
             os: windows-latest
-          - ghc: 9.8.1
+          - ghc: 9.8.2
             os: windows-latest
     env:
       GHC_VERSION: ${{ matrix.ghc }}

constants.bzl

@@ -1,2 +1,2 @@
-test_ghc_version = "9.4.6"
+test_ghc_version = "9.4.8"
 test_asterius_version = "0.0.1"

examples/WORKSPACE

@@ -16,15 +16,17 @@ rules_haskell_dependencies()
 
 load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 
+GHC_VERSION = "9.4.8"
+
 haskell_register_ghc_nixpkgs(
-    attribute_path = "haskell.compiler.ghc946",
+    attribute_path = "haskell.compiler.ghc{}".format(GHC_VERSION.replace(".", "")),
     repository = "@rules_haskell//nixpkgs:default.nix",
-    version = "9.4.6",
+    version = GHC_VERSION,
 )
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = "9.4.6")
+rules_haskell_toolchains(version = GHC_VERSION)
 
 load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")

haskell/ghc.bzl

@@ -2,4 +2,4 @@
 # (see stackage.org).
 
 # Currently, we are using GHC 9.2.x as default.
-DEFAULT_GHC_VERSION = "9.4.6"
+DEFAULT_GHC_VERSION = "9.4.8"

rules_haskell_nix/MODULE.bazel

@@ -39,12 +39,14 @@ nix_haskell_toolchains = use_extension(
     "nix_haskell_toolchains",
 )
 
+GHC_VERSION = "9.4.8"
+
 # Declare a default nix-based toolchain
 nix_haskell_toolchains.new(
     attribute_path = "",
-    nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc946.ghc""",
+    nix_file_content = "with import <nixpkgs> {{}}; haskell.packages.ghc{}.ghc".format(GHC_VERSION.replace(".", "")),
     repository = "@nixpkgs_default",
-    version = "9.4.6",
+    version = GHC_VERSION,
 )
 use_repo(
     nix_haskell_toolchains,

rules_haskell_tests/MODULE.bazel

@@ -257,7 +257,7 @@ haskell_toolchains = use_extension(
     "haskell_toolchains",
 )
 
-test_ghc_version = "9.4.6"
+test_ghc_version = "9.4.8"
 
 test_ghcopts = [
     "-XStandaloneDeriving",  # Flag used at compile time
@@ -328,7 +328,7 @@ nix_haskell_toolchains.new(
     cabalopts = test_cabalopts,
     ghcopts = test_ghcopts,
     haddock_flags = test_haddock_flags,
-    nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc946.ghc""",
+    nix_file_content = "with import <nixpkgs> {{}}; haskell.packages.ghc{}.ghc".format(test_ghc_version.replace(".", "")),
     repl_ghci_args = test_repl_ghci_args,
     repository = "@nixpkgs_default",
     version = test_ghc_version,

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

@@ -1 +1 @@
-ghcide-stack-snapshot_9.4.6.yaml
+ghcide-stack-snapshot_9.4.8.yaml

rules_haskell_tests/ghcide-snapshot_9.8.2.json

@@ -1,4 +1,4 @@
-resolver: lts-21.11
+resolver: lts-21.25
 
 packages:
 - algebraic-graphs-0.6
@@ -32,7 +32,7 @@ drop-packages:
 - Win32
 
 
-# stackage lts-21.11/ghc 9.4.6 only contains Win32-2.12.0.1
+# stackage lts-21.25/ghc 9.4.8 only contains Win32-2.12.0.1
 flags:
   ansi-terminal:
     Win32-2-13-1: false