Upgrade default GHC version to 9.2.8

tweag · Oct 23, 2023 · 104bed7 · 104bed7
1 parent 7e79fb1
commit 104bed7
Show file tree

Hide file tree

Showing 18 changed files with 39 additions and 39 deletions.
diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml
@@ -22,7 +22,7 @@ jobs:
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [bzlmod, workspace]
         ghc:
-          - 9.2.5
+          - 9.2.8
           - 9.4.5
         exclude:
           - module: rules_haskell_nix
@@ -123,7 +123,7 @@ jobs:
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [bzlmod, workspace]
         ghc:
-          - 9.2.5
+          - 9.2.8
           - 9.4.5
     env:
       GHC_VERSION: ${{ matrix.ghc }}

diff --git a/constants.bzl b/constants.bzl
@@ -1,2 +1,2 @@
-test_ghc_version = "9.2.5"
+test_ghc_version = "9.2.8"
 test_asterius_version = "0.0.1"
diff --git a/examples/WORKSPACE b/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")

diff --git a/haskell/ghc.bzl b/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"
diff --git a/rules_haskell_nix/MODULE.bazel b/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,

diff --git a/rules_haskell_tests/MODULE.bazel b/rules_haskell_tests/MODULE.bazel
@@ -259,7 +259,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
@@ -330,7 +330,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,

diff --git a/rules_haskell_tests/ghcide-stack-snapshot.yaml b/rules_haskell_tests/ghcide-stack-snapshot.yaml
@@ -1,4 +1,4 @@
-resolver: lts-20.3
+resolver: lts-20.26
 packages:
 - co-log-core-0.3.2.0
 - ghcide-1.8.0.0
@@ -28,7 +28,7 @@ drop-packages:
 - Win32
 
 
-# stackage lts-20.3/ghc 9.2.5 only contains Win32-2.12.0.1
+# stackage lts-20.26/ghc 9.2.8 only contains Win32-2.12.0.1
 flags:
   ansi-terminal:
     Win32-2-13-1: false
diff --git a/rules_haskell_tests/stackage-pinning-test.yaml b/rules_haskell_tests/stackage-pinning-test.yaml
@@ -1,4 +1,4 @@
-resolver: "lts-20.3"
+resolver: "lts-20.26"
 packages:
   - github: hspec/hspec
     # NOTE Keep in sync with resolver version
@@ -26,7 +26,7 @@ packages:
 drop-packages:
   - Win32
 
-# stackage lts-20.3/ghc 9.2.5 only contains Win32-2.12.0.1
+# stackage lts-20.26/ghc 9.2.8 only contains Win32-2.12.0.1
 flags:
   ansi-terminal:
     Win32-2-13-1: false
diff --git a/rules_haskell_tests/tests/BUILD.bazel b/rules_haskell_tests/tests/BUILD.bazel
@@ -209,7 +209,7 @@ rule_test(
     generates = [
         "haddock/ghc-boot-th-{}".format(TEST_GHC_VERSION),
     ] + {
-        "9.2.5": [
+        "9.2.8": [
             "haddock/array-0.5.4.0",
             "haddock/base-4.16.4.0",
             "haddock/deepseq-1.4.6.1",

diff --git a/...ell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE b/...ell_tests/tests/haskell_module/repl/haskell_module_repl_cross_library_deps_test/WORKSPACE
@@ -17,14 +17,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_core//:nixpkgs.bzl",

diff --git a/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE b/rules_haskell_tests/tests/haskell_module/repl/haskell_module_repl_test/WORKSPACE
@@ -17,14 +17,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(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",

diff --git a/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_bin_repl_test/WORKSPACE
@@ -11,14 +11,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(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",

diff --git a/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE b/rules_haskell_tests/tests/repl-targets/hs_lib_repl_test/WORKSPACE
@@ -17,14 +17,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(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",

diff --git a/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE b/rules_haskell_tests/tests/stack-snapshot-deps/hs_override_stack_test/WORKSPACE
@@ -10,14 +10,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(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",

diff --git a/shell.nix b/shell.nix
@@ -1,4 +1,4 @@
-{ pkgs ? import ./nixpkgs { }, docTools ? true, ghcVersion ? "9.2.5" }:
+{ pkgs ? import ./nixpkgs { }, docTools ? true, ghcVersion ? "9.2.8" }:
 
 with pkgs;
 mkShell {

diff --git a/stackage_snapshot.yaml b/stackage_snapshot.yaml
@@ -5,7 +5,7 @@
 # but with versions <= 2.13.2.0 we encounter the following issue:
 # https://github.com/haskell/win32/issues/193
 
-resolver: lts-20.3
+resolver: lts-20.26
 
 drop-packages:
   - Win32
@@ -16,7 +16,7 @@ packages:
   subdirs:
   - Cabal
 
-# stackage lts-20.3/ghc 9.2.5 only contain Win32-2.12.0.1
+# stackage lts-20.26/ghc 9.2.8 only contain Win32-2.12.0.1
 flags:
   ansi-terminal:
     Win32-2-13-1: false
diff --git a/start b/start
@@ -6,8 +6,8 @@
 set -eu
 
 # If the environment variable `GHC_VERSION` is not set yet,
-# we use the default version (currently "9.2.5").
-GHC_VERSION=${GHC_VERSION:="9.2.5"}
+# we use the default version (currently "9.2.8").
+GHC_VERSION=${GHC_VERSION:="9.2.8"}
 
 readonly MIN_BAZEL_MAJOR=6
 readonly MIN_BAZEL_MINOR=0

diff --git a/tutorial/WORKSPACE b/tutorial/WORKSPACE
@@ -13,14 +13,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(
     "@io_tweag_rules_nixpkgs//nixpkgs:nixpkgs.bzl",