Merge pull request #1994 from tweag/upgrade-ghc-9.2.8

Upgrade default GHC to 9.2.8

Author: mergify[bot]

.github/workflows/workflow.yaml

@@ -22,7 +22,7 @@ jobs:
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.2.5
+          - 9.2.8
           - 9.4.5
         exclude:
           - module: rules_haskell_nix
@@ -122,7 +122,7 @@ jobs:
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.2.5
+          - 9.2.8
           - 9.4.5
         exclude:
           # TODO: in a MODULE.bazel file we declare version specific dependencies, would need to use stack snapshot json

WORKSPACE

@@ -149,6 +149,7 @@ load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot")
 stack_snapshot(
     name = "stackage",
     components = {
+        "c2hs": ["exe"],
         "proto-lens-protoc": [
             "lib",
             "exe",
@@ -158,6 +159,7 @@ stack_snapshot(
         "_" + str(GHC_VERSION) if GHC_VERSION else "",
     ),
     packages = [
+        "Cabal",
         # Core libraries
         "base",
         "bytestring",
@@ -167,6 +169,9 @@ stack_snapshot(
         "text",
         "vector",
         # For tests
+        "alex",
+        "c2hs",
+        "happy",
         "lens-family-core",
         "data-default-class",
         "proto-lens",
@@ -188,6 +193,9 @@ stack_snapshot(
         "type-errors": ["@Cabal//:Cabal"],
         "typed-process": ["@Cabal//:Cabal"],
         "unliftio-core": ["@Cabal//:Cabal"],
+        "alex": ["@Cabal//:Cabal"],
+        "c2hs": ["@Cabal//:Cabal"],
+        "happy": ["@Cabal//:Cabal"],
     },
     stack_snapshot_json = "//:stackage_snapshot{}.json".format(
         "_" + str(GHC_VERSION) if GHC_VERSION else "",

constants.bzl

@@ -1,2 +1,2 @@
-test_ghc_version = "9.2.5"
+test_ghc_version = "9.2.8"
 test_asterius_version = "0.0.1"

examples/MODULE.bazel

@@ -66,6 +66,11 @@ stack_snapshot.package(
             "-pkg-config",
         ],
 )
+stack_snapshot.package(
+    name = "streaming-commons",
+    extra_deps = ["@zlib.hs"],
+    setup_deps = ["@Cabal//:Cabal"],
+)
 
 [
     stack_snapshot.package(

examples/WORKSPACE

@@ -18,14 +18,14 @@ rules_haskell_dependencies()
 load("@rules_haskell//haskell:nixpkgs.bzl", "haskell_register_ghc_nixpkgs")
 
 haskell_register_ghc_nixpkgs(
-    attribute_path = "haskell.compiler.ghc925",
+    attribute_path = "haskell.compiler.ghc928",
     repository = "@rules_haskell//nixpkgs:default.nix",
-    version = "9.2.5",
+    version = "9.2.8",
 )
 
 load("@rules_haskell//haskell:toolchain.bzl", "rules_haskell_toolchains")
 
-rules_haskell_toolchains(version = "9.2.5")
+rules_haskell_toolchains(version = "9.2.8")
 
 load("@rules_nixpkgs_cc//:cc.bzl", "nixpkgs_cc_configure")
 load("@rules_nixpkgs_python//:python.bzl", "nixpkgs_python_configure")
@@ -57,7 +57,10 @@ stack_snapshot(
     components_dependencies = {
         "attoparsec": """{"lib:attoparsec": ["lib:attoparsec-internal"]}""",
     },
-    extra_deps = {"zlib": ["@zlib.hs"]},
+    extra_deps = {
+        "zlib": ["@zlib.hs"],
+        "streaming-commons": ["@zlib.hs"],
+    },
     flags = {
         # Sets the default explicitly to demonstrate the flags attribute.
         "zlib": [

haskell/cabal.bzl

@@ -2283,10 +2283,11 @@ load("@{workspace}//:packages.bzl", "packages")
 def _stack_executables_impl(repository_ctx):
     workspace = repository_ctx.attr.unmangled_repo_name
     all_components = json.decode(repository_ctx.read(repository_ctx.attr.components_json))
-    for (package, components) in all_components.items():
-        if not components["exe"]:
-            continue
-        repository_ctx.file(package + "/BUILD.bazel", executable = False, content = """\
+    executables = [package for package, components in all_components.items() if components["exe"]]
+
+    if executables:
+        for package in executables:
+            repository_ctx.file(package + "/BUILD.bazel", executable = False, content = """\
 load("@{workspace}//:packages.bzl", "packages")
 [
     alias(
@@ -2297,9 +2298,12 @@ load("@{workspace}//:packages.bzl", "packages")
     for exe in packages["{package}"].executables
 ]
 """.format(
-            workspace = workspace,
-            package = package,
-        ))
+                workspace = workspace,
+                package = package,
+            ))
+    else:
+        # a repository rule has to create a file
+        repository_ctx.file("BUILD", executable = False)
 
 _stack_executables = repository_rule(
     _stack_executables_impl,

haskell/ghc.bzl

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

nixpkgs/default.nix

@@ -1,8 +1,8 @@
 { ... }@args:
 let
-  # 2023-05-22
-  sha256 = "1lbr19fbh16n5ikgh9lzpscn83kr3w6hwx6md4k1iyxd7vx7zz0j";
-  rev = "02df300699f8e4c24b39eeb7e034403880715dc5";
+  # 2023-10-20
+  sha256 = "07dv5x236rqf5b718b7bhpqf2yaq43h6w8mrz9fcb0hxwjzsxlpg";
+  rev = "80c1aab725151632ddc2a20caeb914e76dd0673c";
 in
 import (fetchTarball {
   inherit sha256;

rules_haskell_nix/MODULE.bazel

@@ -42,9 +42,9 @@ nix_haskell_toolchains = use_extension(
 # Declare a default nix-based toolchain
 nix_haskell_toolchains.new(
     attribute_path = "",
-    nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc925.ghc""",
+    nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc928.ghc""",
     repository = "@nixpkgs_default",
-    version = "9.2.5",
+    version = "9.2.8",
 )
 use_repo(
     nix_haskell_toolchains,

rules_haskell_tests/MODULE.bazel

@@ -257,7 +257,7 @@ haskell_toolchains = use_extension(
     "haskell_toolchains",
 )
 
-test_ghc_version = "9.2.5"
+test_ghc_version = "9.2.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.ghc925.ghc""",
+    nix_file_content = """with import <nixpkgs> {}; haskell.packages.ghc928.ghc""",
     repl_ghci_args = test_repl_ghci_args,
     repository = "@nixpkgs_default",
     version = test_ghc_version,