Merge branch 'master' into philipp/reexport_depset

Author: mergify[bot]

.github/workflows/workflow.yaml

@@ -26,7 +26,7 @@ jobs:
           buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
           bazelrc_path: .bazelrc.auth
       - uses: ./.github/actions/set_tcp_keepalive_time
-      - uses: extractions/netrc@v1
+      - uses: extractions/netrc@v2
         with:
           machine: api.github.com
           password: ${{ secrets.GITHUB_TOKEN }}
@@ -47,16 +47,16 @@ jobs:
         module: [rules_haskell, rules_haskell_nix, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.2.8
           - 9.4.6
           - 9.6.2
+          - 9.8.1
         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.2.8
+          - ghc: 9.8.1
             bzlmod: true
           - ghc: 9.6.2
             bzlmod: true
@@ -82,7 +82,7 @@ jobs:
           buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
           bazelrc_path: .bazelrc.auth
       - uses: ./.github/actions/set_tcp_keepalive_time
-      - uses: extractions/netrc@v1
+      - uses: extractions/netrc@v2
         with:
           machine: api.github.com
           password: ${{ secrets.GITHUB_TOKEN }}
@@ -143,19 +143,21 @@ jobs:
         module: [rules_haskell, rules_haskell_tests]
         bzlmod: [true, false]
         ghc:
-          - 9.2.8
           - 9.4.6
           - 9.6.2
+          - 9.8.1
         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.2.8
+          - ghc: 9.8.1
             bzlmod: true
           - ghc: 9.6.2
             bzlmod: true
           # currently proto-lens-protoc fails with an access violation on Windows
           - ghc: 9.6.2
             os: windows-latest
+          - ghc: 9.8.1
+            os: windows-latest
     env:
       GHC_VERSION: ${{ matrix.ghc }}
     runs-on: ${{ matrix.os }}
@@ -175,7 +177,7 @@ jobs:
           buildbuddy_api_key: ${{ secrets.BUILDBUDDY_API_KEY }}
           bazelrc_path: .bazelrc.auth
       - uses: ./.github/actions/set_tcp_keepalive_time
-      - uses: extractions/netrc@v1
+      - uses: extractions/netrc@v2
         with:
           machine: api.github.com
           password: ${{ secrets.GITHUB_TOKEN }}

WORKSPACE

@@ -4,6 +4,7 @@ load("//haskell:private/ghc_ci.bzl", "ghc_version")
 
 ghc_version(name = "rules_haskell_ghc_version")
 
+load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
 load("//haskell:repositories.bzl", "rules_haskell_dependencies")
 
 rules_haskell_dependencies()
@@ -179,7 +180,7 @@ stack_snapshot(
         "proto-lens-runtime",
         "lens-family",
     ],
-    setup_deps = {} if GHC_VERSION and GHC_VERSION.startswith("9.6.") else {
+    setup_deps = {} if GHC_VERSION and is_at_least("9.6", GHC_VERSION) else {
         # See https://github.com/tweag/rules_haskell/issues/1871
         "HUnit": ["@Cabal//:Cabal"],
         "bifunctors": ["@Cabal//:Cabal"],

extensions/rules_haskell_dependencies.bzl

@@ -6,6 +6,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
 load("@rules_haskell//tools:os_info.bzl", "os_info")
 load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
+load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
 
 def _empty_repo_impl(rctx):
     fail(rctx.attr.error_msg)
@@ -38,7 +39,8 @@ def repositories(*, bzlmod):  # @unused
 
     # TODO: Remove when tests are run with a ghc version containing Cabal >= 3.10
     # See https://github.com/tweag/rules_haskell/issues/1871
-    if GHC_VERSION and GHC_VERSION.startswith("9.6."):
+
+    if GHC_VERSION and is_at_least("9.6", GHC_VERSION):
         _empty_repo(
             name = "Cabal",
             error_msg = "When using GHC >= 9.6, do not depend on @Cabal, as https://github.com/tweag/rules_haskell/issues/1871 is fixed.",

haskell/private/ghc_bindist_generated.json

@@ -400,5 +400,27 @@
             "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-unknown-mingw32.tar.xz",
             "eb74654419cb646e9d2e362b57f2f81bc9f5231bceb543b14cb0341aedb07fa3"
         ]
+    },
+    "9.8.2": {
+        "linux_amd64": [
+            "https://downloads.haskell.org/~ghc/9.8.2/ghc-9.8.2-x86_64-deb9-linux.tar.xz",
+            "9ff735b0b9dcb0c48cc32d6df7826b6ee9b2fdf1f1e056f015bab9e79fc86c11"
+        ],
+        "linux_arm64": [
+            "https://downloads.haskell.org/~ghc/9.8.2/ghc-9.8.2-aarch64-deb10-linux.tar.xz",
+            "9a3776fd8dc02f95b751f0e44823d6727dea2c212857e2c5c5f6a38a034d1575"
+        ],
+        "darwin_amd64": [
+            "https://downloads.haskell.org/~ghc/9.8.2/ghc-9.8.2-x86_64-apple-darwin.tar.xz",
+            "64e8cca6310443cd6de8255edcf391d937829792e701167f7e5fb234f7150078"
+        ],
+        "darwin_arm64": [
+            "https://downloads.haskell.org/~ghc/9.8.2/ghc-9.8.2-aarch64-apple-darwin.tar.xz",
+            "67be089dedbe599d911efd8f82e4f9a19225761a3872be74dfd4b5a557fb8e1a"
+        ],
+        "windows_amd64": [
+            "https://downloads.haskell.org/~ghc/9.8.2/ghc-9.8.2-x86_64-unknown-mingw32.tar.xz",
+            "f7d496b850686ea5fbfcecc722ec399ec7acb8d06ebec23bb4dcb9338f430764"
+        ]
     }
 }

haskell/private/versions.bzl

@@ -51,7 +51,7 @@ def _parse_bazel_version(bazel_version):
     """
     return [int(_parse_version_chunk(x)) for x in bazel_version.split(".")]
 
-def _is_at_least(threshold, version):
+def is_at_least(threshold, version):
     """Check that a version is higher or equals to a threshold.
     Args:
       threshold: the minimum version string
@@ -64,7 +64,7 @@ def _is_at_least(threshold, version):
     # Needed for check_bazel_version below.
     return _parse_bazel_version(version) >= _parse_bazel_version(threshold)
 
-def _is_at_most(threshold, version):
+def is_at_most(threshold, version):
     """Check that a version is lower or equals to a threshold.
     Args:
       threshold: the maximum version string
@@ -103,7 +103,7 @@ def check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, baz
         else:
             bazel_version = native.bazel_version
 
-    if not _is_at_least(
+    if not is_at_least(
         threshold = minimum_bazel_version,
         version = bazel_version,
     ):
@@ -113,7 +113,7 @@ def check_bazel_version(minimum_bazel_version, maximum_bazel_version = None, baz
         ))
 
     if maximum_bazel_version:
-        if not _is_at_most(
+        if not is_at_most(
             threshold = maximum_bazel_version,
             version = bazel_version,
         ):

rules_haskell_tests/WORKSPACE

@@ -6,6 +6,7 @@ local_repository(
 )
 
 load("@rules_haskell//haskell:private/ghc_ci.bzl", "ghc_version")
+load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
 
 ghc_version(name = "rules_haskell_ghc_version")
 
@@ -297,7 +298,7 @@ stack_snapshot(
             "typed-process": ["@Cabal//:Cabal"],
             "unliftio-core": ["@Cabal//:Cabal"],
         }.items()
-        if [d for d in deps if d != "@Cabal//:Cabal"] or not GHC_VERSION or not GHC_VERSION.startswith("9.6.")
+        if [d for d in deps if d != "@Cabal//:Cabal"] or not GHC_VERSION or not is_at_least("9.6", GHC_VERSION)
     },
     stack_snapshot_json = "//:stackage_snapshot{}.json".format(
         "_" + str(GHC_VERSION) if GHC_VERSION else "",