Merge branch 'master' into mp/bazel-7-cc_shared_library

Author: mergify[bot]

WORKSPACE

@@ -46,10 +46,10 @@ rules_proto_toolchains()
 # For buildifier
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26",
+    sha256 = "d93ef02f1e72c82d8bb3d5169519b36167b33cf68c252525e3b9d3d5dd143de7",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
     ],
 )
 

haskell/repl.bzl

@@ -212,7 +212,7 @@ def _merge_HaskellReplLoadInfoMulti(root_info, load_infos):
         java_deps = depset(transitive = java_deps),
     )
 
-def _merge_HaskellReplDepInfo(dep_infos):
+def _merge_HaskellReplDepInfo(dep_infos, dep_infos_for_package_dbs = []):
     package_ids = depset()
     package_databases = depset()
     interface_dirs = depset()
@@ -230,6 +230,9 @@ def _merge_HaskellReplDepInfo(dep_infos):
         cc_shared_library_infos.extend(dep_info.cc_shared_library_infos)
         runfiles.append(dep_info.runfiles)
 
+    for dep_info in dep_infos_for_package_dbs:
+        package_databases = depset(transitive = [package_databases, dep_info.package_databases])
+
     return HaskellReplDepInfo(
         direct_package_ids = [],
         package_ids = package_ids,
@@ -434,7 +437,12 @@ def _create_HaskellMultiReplInfo(from_source, from_binary, collect_info):
             for label in deps_list
             if label in dep_infos and not sets.contains(local_labels, label)
         ]
-        merged_dep_info = _merge_HaskellReplDepInfo(dep_infos_to_merge)
+        dep_infos_for_package_dbs = [
+            dep_infos[label]
+            for label in deps_list
+            if label in dep_infos and sets.contains(local_labels, label)
+        ]
+        merged_dep_info = _merge_HaskellReplDepInfo(dep_infos_to_merge, dep_infos_for_package_dbs)
         if dep_info and not load_as_source:
             dep_info_with_self = _merge_HaskellReplDepInfo([dep_info, merged_dep_info])
         else:

haskell/repositories.bzl

@@ -161,10 +161,10 @@ def rules_haskell_dependencies():
         http_archive,
         name = "rules_pkg",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz",
-            "https://github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz",
+            "https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz",
+            "https://github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz",
         ],
-        sha256 = "d250924a2ecc5176808fc4c25d5cf5e9e79e6346d79d5ab1c493e289e722d1d0",
+        sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef",
     )
 
     # For --incompatible_disable_starlark_host_transitions support (default in bazel 7)

rules_haskell_tests/MODULE.bazel

@@ -73,7 +73,7 @@ bazel_dep(
 )
 bazel_dep(
     name = "aspect_bazel_lib",
-    version = "2.7.8",
+    version = "2.8.1",
 )
 bazel_dep(
     name = "rules_proto",
@@ -201,7 +201,7 @@ local_path_override(
 # Go setup for buildifieR
 bazel_dep(
     name = "rules_go",
-    version = "0.48.1",
+    version = "0.49.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 = "714cf8ce95a198bab0a6a3adaffea99e929d2f01bf6d4a59a2e6d6af72b4818c",
-    strip_prefix = "bazel-lib-2.7.8",
-    url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.8/bazel-lib-v2.7.8.tar.gz",
+    sha256 = "688354ee6beeba7194243d73eb0992b9a12e8edeeeec5b6544f4b531a3112237",
+    strip_prefix = "bazel-lib-2.8.1",
+    url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.8.1/bazel-lib-v2.8.1.tar.gz",
 )
 
 # bazel dependencies
@@ -61,10 +61,10 @@ rules_proto_toolchains()
 # For buildifier
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26",
+    sha256 = "d93ef02f1e72c82d8bb3d5169519b36167b33cf68c252525e3b9d3d5dd143de7",
     urls = [
-        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
-        "https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
+        "https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
+        "https://github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.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 = "fe43a0ef76323813c912b7256a5f01f87f2697528b107627b70da58c50b1988a",
+        sha256 = "b079b84278435441023f03de1a72baff9e4e4fe2cb1092ed4c9b60dc8b42e732",
         urls = [
-            "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.23.0/rules_bazel_integration_test.v0.23.0.tar.gz",
+            "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.25.0/rules_bazel_integration_test.v0.25.0.tar.gz",
         ],
     )