Merge branch 'master' into cb/cleanup-optional-version

.bazelrc.common

@@ -15,7 +15,6 @@ common --config common
 startup --host_jvm_args=-Djdk.tls.client.protocols=TLSv1.2
 
 common --incompatible_require_linker_input_cc_api
-common --incompatible_struct_has_no_methods
 common --incompatible_disallow_empty_glob=true
 
 # test environment does not propagate locales by default some tests reads files

WORKSPACE

@@ -44,10 +44,10 @@ rules_proto_toolchains()
 # For buildifier
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996",
+    sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
     ],
 )
 

haskell/private/ghc_bindist_generated.json

@@ -379,6 +379,28 @@
             "3d67397aa2c4c09fec05ad612453f8d906930dabb4c35c2327b82b8b07d8455a"
         ]
     },
+    "9.6.5": {
+        "linux_amd64": [
+            "https://downloads.haskell.org/~ghc/9.6.5/ghc-9.6.5-x86_64-deb9-linux.tar.xz",
+            "d37024b8f300098025b3612e210366fcfafd717de3eac9bc29c29f3c280bb6a1"
+        ],
+        "linux_arm64": [
+            "https://downloads.haskell.org/~ghc/9.6.5/ghc-9.6.5-aarch64-deb10-linux.tar.xz",
+            "fc4e2df394b9d6f48bdb0abaabad1c97825264cbe4e75e7463fc794cb3f87047"
+        ],
+        "darwin_amd64": [
+            "https://downloads.haskell.org/~ghc/9.6.5/ghc-9.6.5-x86_64-apple-darwin.tar.xz",
+            "db766b22a92cc0a388d16f4ed0f624da81f80a0ce7b28db9cbf186cbfddd7953"
+        ],
+        "darwin_arm64": [
+            "https://downloads.haskell.org/~ghc/9.6.5/ghc-9.6.5-aarch64-apple-darwin.tar.xz",
+            "758756e4eeb143f72f445e6dcb9ab3d6ec71bc67eca9545684133f3746e1d711"
+        ],
+        "windows_amd64": [
+            "https://downloads.haskell.org/~ghc/9.6.5/ghc-9.6.5-x86_64-unknown-mingw32.tar.xz",
+            "8f9c98198483a32f1b7f76679b40f1a3cc3bc76184ea109dceebc9f01fe21530"
+        ]
+    },
     "9.8.1": {
         "linux_amd64": [
             "https://downloads.haskell.org/~ghc/9.8.1/ghc-9.8.1-x86_64-deb9-linux.tar.xz",

haskell/repositories.bzl

@@ -131,9 +131,9 @@ def rules_haskell_dependencies():
     maybe(
         http_archive,
         name = "aspect_rules_js",
-        sha256 = "d9ceb89e97bb5ad53b278148e01a77a3e9100db272ce4ebdcd59889d26b9076e",
-        strip_prefix = "rules_js-1.34.0",
-        url = "https://github.com/aspect-build/rules_js/releases/download/v1.34.0/rules_js-v1.34.0.tar.gz",
+        sha256 = "d6dddd224b27d456820d19b9c23a7bcbe75660a6c040d83e31ba3da4fb1f6888",
+        strip_prefix = "rules_js-1.41.0",
+        url = "https://github.com/aspect-build/rules_js/releases/download/v1.41.0/rules_js-v1.41.0.tar.gz",
     )
 
     rules_haskell_dependencies_bzlmod()

rules_haskell_tests/MODULE.bazel

@@ -61,19 +61,19 @@ bazel_dep(
 )
 bazel_dep(
     name = "rules_java",
-    version = "6.1.0",
+    version = "6.5.2",
 )
 bazel_dep(
     name = "rules_nodejs",
     version = "5.8.3",
 )
 bazel_dep(
     name = "aspect_rules_js",
-    version = "1.34.0",
+    version = "1.40.1",
 )
 bazel_dep(
     name = "aspect_bazel_lib",
-    version = "1.38.1",
+    version = "1.42.2",
 )
 bazel_dep(
     name = "rules_proto",
@@ -199,7 +199,7 @@ local_path_override(
 # Go setup for buildifieR
 bazel_dep(
     name = "rules_go",
-    version = "0.39.1",
+    version = "0.46.0",
     repo_name = "io_bazel_rules_go",
 )
 

rules_haskell_tests/WORKSPACE

@@ -28,9 +28,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # For testing if bzlmod is enabled
 http_archive(
     name = "aspect_bazel_lib",
-    sha256 = "262e3d6693cdc16dd43880785cdae13c64e6a3f63f75b1993c716295093d117f",
-    strip_prefix = "bazel-lib-1.38.1",
-    url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.38.1/bazel-lib-v1.38.1.tar.gz",
+    sha256 = "f9a0bb072aef719859aae5ad37722e97812ffffb263fd56a36cd8614a2e5d199",
+    strip_prefix = "bazel-lib-1.42.2",
+    url = "https://github.com/aspect-build/bazel-lib/releases/download/v1.42.2/bazel-lib-v1.42.2.tar.gz",
 )
 
 load("@os_info//:os_info.bzl", "is_nix_shell", "is_windows")
@@ -60,10 +60,10 @@ rules_proto_toolchains()
 # For buildifier
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "6dc2da7ab4cf5d7bfc7c949776b1b7c733f05e56edc4bcd9022bb249d2e2a996",
+    sha256 = "80a98277ad1311dacd837f9b16db62887702e9f1d1c4c9f796d0121a46c8e184",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.39.1/rules_go-v0.39.1.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.46.0/rules_go-v0.46.0.zip",
     ],
 )
 

rules_haskell_tests/non_module_deps.bzl

@@ -31,9 +31,9 @@ def repositories(*, bzlmod):  # @unused
     # module rules_bazel_integration_test requires bazel >= 6.1.0
     http_archive(
         name = "rules_bazel_integration_test",
-        sha256 = "6e65d497c68f5794349bfa004369e144063686ce1ebd0227717cd23285be45ef",
+        sha256 = "fe43a0ef76323813c912b7256a5f01f87f2697528b107627b70da58c50b1988a",
         urls = [
-            "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.20.0/rules_bazel_integration_test.v0.20.0.tar.gz",
+            "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.23.0/rules_bazel_integration_test.v0.23.0.tar.gz",
         ],
     )