Use modules in bzlmod mode for rules_bazel_integration_test and cgrindel_bazel_starlib

Note, rules_bazel_integration_test 0.28.0 is not yet available in the BCR, it
will be updated by renovate.

Author: avdv

rules_haskell_tests/MODULE.bazel

@@ -88,6 +88,12 @@ bazel_dep(
     name = "zlib",
     version = "1.3.1.bcr.3",
 )
+bazel_dep(
+    name = "rules_bazel_integration_test",
+    version = "0.27.0",
+    dev_dependency = True,
+)
+bazel_dep(name = "cgrindel_bazel_starlib", version = "0.21.0")
 
 ghc_version = use_extension("@rules_haskell//extensions:ghc_version.bzl", "ghc_default_version")
 use_repo(
@@ -99,12 +105,10 @@ non_module_deps = use_extension("//:non_module_deps.bzl", "non_module_deps")
 use_repo(
     non_module_deps,
     "c2hs_repo",
-    "cgrindel_bazel_starlib",
     "com_github_bazelbuild_buildtools",
     "haskell_package_repository_dummy",
     "library_repo",
     "os_info",
-    "rules_bazel_integration_test",
     "zlib.hs",
 )
 

rules_haskell_tests/WORKSPACE

@@ -68,6 +68,32 @@ http_archive(
     ],
 )
 
+http_archive(
+    name = "cgrindel_bazel_starlib",
+    sha256 = "43e375213dabe0c3928e65412ea7ec16850db93285c8c6f8b0eaa41cacd0f882",
+    urls = [
+        "https://github.com/cgrindel/bazel-starlib/releases/download/v0.21.0/bazel-starlib.v0.21.0.tar.gz",
+    ],
+)
+
+load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
+
+bazel_starlib_dependencies()
+
+# module rules_bazel_integration_test requires bazel >= 6.1.0
+http_archive(
+    name = "rules_bazel_integration_test",
+    sha256 = "44ed2cacf9dfdbfd0e2ef60022ca5ada9b11f337ecaec3c428d5003b38043589",
+    urls = [
+        "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.28.0/rules_bazel_integration_test.v0.28.0.tar.gz",
+    ],
+)
+
+load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
+
+bazel_integration_test_rules_dependencies()
+
+
 load(
     "@rules_haskell//:constants.bzl",
     _default_ghc_version = "test_ghc_version",
@@ -185,14 +211,6 @@ load("@com_github_bazelbuild_buildtools//buildifier:deps.bzl", "buildifier_depen
 
 buildifier_dependencies()
 
-load("@rules_bazel_integration_test//bazel_integration_test:deps.bzl", "bazel_integration_test_rules_dependencies")
-
-bazel_integration_test_rules_dependencies()
-
-load("@cgrindel_bazel_starlib//:deps.bzl", "bazel_starlib_dependencies")
-
-bazel_starlib_dependencies()
-
 # For profiling
 # Required to make use of `bazel build --profile`.
 

rules_haskell_tests/non_module_deps.bzl

@@ -28,23 +28,6 @@ def repositories(*, bzlmod):  # @unused
     # Some helpers for platform-dependent configuration
     os_info(name = "os_info")
 
-    # module rules_bazel_integration_test requires bazel >= 6.1.0
-    http_archive(
-        name = "rules_bazel_integration_test",
-        sha256 = "44ed2cacf9dfdbfd0e2ef60022ca5ada9b11f337ecaec3c428d5003b38043589",
-        urls = [
-            "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.28.0/rules_bazel_integration_test.v0.28.0.tar.gz",
-        ],
-    )
-
-    http_archive(
-        name = "cgrindel_bazel_starlib",
-        sha256 = "43e375213dabe0c3928e65412ea7ec16850db93285c8c6f8b0eaa41cacd0f882",
-        urls = [
-            "https://github.com/cgrindel/bazel-starlib/releases/download/v0.21.0/bazel-starlib.v0.21.0.tar.gz",
-        ],
-    )
-
     # c2hs rule in its own repository
     starlarkified_local_repository(
         name = "c2hs_repo",