Adapt tests for "Cabal//:cabal" optional dependency

This dependency is not needed since ghc 9.6

Author: ylecornec

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/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 "",

rules_haskell_tests/non_module_deps_2.bzl

@@ -1,6 +1,7 @@
 """ External repositories for the CI that need to be shared between WORKSPACE and MODULE.bazel files """
 
 load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot")
+load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
 load("@os_info//:os_info.bzl", "is_linux", "is_windows")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@toolchains_libraries//:toolchain_libraries.bzl", "toolchain_libraries")
@@ -88,7 +89,7 @@ def repositories(*, bzlmod):  # @unused
                 "unliftio-core": ["@ghcide//:Cabal"],
                 "yaml": ["@ghcide//: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 = ("//:ghcide-snapshot{}.json".format(
             "_" + str(GHC_VERSION) if GHC_VERSION else "",
@@ -119,15 +120,15 @@ haskell_cabal_binary(
     verbose = False,
     visibility = ["//visibility:public"],
 )
-        """.format(setup_deps = "" if GHC_VERSION and GHC_VERSION.startswith("9.6.") else """setup_deps = ["@Cabal//:Cabal"],"""),
+        """.format(setup_deps = "" if GHC_VERSION and is_at_least("9.6", GHC_VERSION) else """setup_deps = ["@Cabal//:Cabal"],"""),
         sha256 = "9bd2f1a27e8f1b2ffdb5b2fbd3ed82b6f0e85191459a1b24ffcbef4e68a81bec",
         strip_prefix = "alex-3.2.7.1",
         urls = ["http://hackage.haskell.org/package/alex-3.2.7.1/alex-3.2.7.1.tar.gz"],
     )
 
     # 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.",
@@ -200,7 +201,7 @@ haskell_cabal_library(
                 "hspec-expectations": ["@Cabal//:Cabal"],
                 "quickcheck-io": ["@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-pinning-test_snapshot{}.json".format(
             "_" + str(GHC_VERSION) if GHC_VERSION else "",

rules_haskell_tests/tests/haskell_cabal_datafiles/compare_other_cabal_functions/without_generate_paths_module/BUILD.bazel

@@ -7,6 +7,7 @@ load(
     "haskell_binary",
     "haskell_toolchain_library",
 )
+load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
 load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
 
 package(default_testonly = 1)
@@ -21,7 +22,7 @@ haskell_cabal_library(
         "lib.cabal",
     ],
     generate_paths_module = False,
-    setup_deps = [] if GHC_VERSION and GHC_VERSION.startswith("9.6.") else ["@Cabal//:Cabal"],
+    setup_deps = [] if GHC_VERSION and is_at_least("9.6", GHC_VERSION) else ["@Cabal//:Cabal"],
     tags = ["skip_profiling"],
     version = "0.1.0.0",
     visibility = ["//visibility:public"],

tools/repositories.bzl

@@ -2,6 +2,7 @@
 
 load("@rules_haskell//haskell:cabal.bzl", "stack_snapshot")
 load("@rules_haskell_ghc_version//:ghc_version.bzl", "GHC_VERSION")
+load("@rules_haskell//haskell:private/versions.bzl", "is_at_least")
 
 def rules_haskell_worker_dependencies(**stack_kwargs):
     """
@@ -29,7 +30,7 @@ def rules_haskell_worker_dependencies(**stack_kwargs):
                 "text",
                 "vector",
             ],
-            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 {
                 "bifunctors": ["@Cabal//:Cabal"],
                 "proto-lens-runtime": ["@Cabal//:Cabal"],
                 "transformers-compat": ["@Cabal//:Cabal"],