Skip to content

Commit 46a752d

Browse files
authored
Merge branch 'master' into mp/bazel-7-cc_shared_library
2 parents fc6d7dc + 96e2314 commit 46a752d

File tree

6 files changed

+26
-18
lines changed

6 files changed

+26
-18
lines changed

WORKSPACE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ rules_proto_toolchains()
4646
# For buildifier
4747
http_archive(
4848
name = "io_bazel_rules_go",
49-
sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26",
49+
sha256 = "d93ef02f1e72c82d8bb3d5169519b36167b33cf68c252525e3b9d3d5dd143de7",
5050
urls = [
51-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
52-
"https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
51+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
52+
"https://github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
5353
],
5454
)
5555

haskell/repl.bzl

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ def _merge_HaskellReplLoadInfoMulti(root_info, load_infos):
212212
java_deps = depset(transitive = java_deps),
213213
)
214214

215-
def _merge_HaskellReplDepInfo(dep_infos):
215+
def _merge_HaskellReplDepInfo(dep_infos, dep_infos_for_package_dbs = []):
216216
package_ids = depset()
217217
package_databases = depset()
218218
interface_dirs = depset()
@@ -230,6 +230,9 @@ def _merge_HaskellReplDepInfo(dep_infos):
230230
cc_shared_library_infos.extend(dep_info.cc_shared_library_infos)
231231
runfiles.append(dep_info.runfiles)
232232

233+
for dep_info in dep_infos_for_package_dbs:
234+
package_databases = depset(transitive = [package_databases, dep_info.package_databases])
235+
233236
return HaskellReplDepInfo(
234237
direct_package_ids = [],
235238
package_ids = package_ids,
@@ -434,7 +437,12 @@ def _create_HaskellMultiReplInfo(from_source, from_binary, collect_info):
434437
for label in deps_list
435438
if label in dep_infos and not sets.contains(local_labels, label)
436439
]
437-
merged_dep_info = _merge_HaskellReplDepInfo(dep_infos_to_merge)
440+
dep_infos_for_package_dbs = [
441+
dep_infos[label]
442+
for label in deps_list
443+
if label in dep_infos and sets.contains(local_labels, label)
444+
]
445+
merged_dep_info = _merge_HaskellReplDepInfo(dep_infos_to_merge, dep_infos_for_package_dbs)
438446
if dep_info and not load_as_source:
439447
dep_info_with_self = _merge_HaskellReplDepInfo([dep_info, merged_dep_info])
440448
else:

haskell/repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ def rules_haskell_dependencies():
161161
http_archive,
162162
name = "rules_pkg",
163163
urls = [
164-
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz",
165-
"https://github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz",
164+
"https://mirror.bazel.build/github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz",
165+
"https://github.com/bazelbuild/rules_pkg/releases/download/1.0.1/rules_pkg-1.0.1.tar.gz",
166166
],
167-
sha256 = "d250924a2ecc5176808fc4c25d5cf5e9e79e6346d79d5ab1c493e289e722d1d0",
167+
sha256 = "d20c951960ed77cb7b341c2a59488534e494d5ad1d30c4818c736d57772a9fef",
168168
)
169169

170170
# For --incompatible_disable_starlark_host_transitions support (default in bazel 7)

rules_haskell_tests/MODULE.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ bazel_dep(
7373
)
7474
bazel_dep(
7575
name = "aspect_bazel_lib",
76-
version = "2.7.8",
76+
version = "2.8.1",
7777
)
7878
bazel_dep(
7979
name = "rules_proto",
@@ -201,7 +201,7 @@ local_path_override(
201201
# Go setup for buildifieR
202202
bazel_dep(
203203
name = "rules_go",
204-
version = "0.48.1",
204+
version = "0.49.0",
205205
repo_name = "io_bazel_rules_go",
206206
)
207207

rules_haskell_tests/WORKSPACE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
2828
# For testing if bzlmod is enabled
2929
http_archive(
3030
name = "aspect_bazel_lib",
31-
sha256 = "714cf8ce95a198bab0a6a3adaffea99e929d2f01bf6d4a59a2e6d6af72b4818c",
32-
strip_prefix = "bazel-lib-2.7.8",
33-
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.7.8/bazel-lib-v2.7.8.tar.gz",
31+
sha256 = "688354ee6beeba7194243d73eb0992b9a12e8edeeeec5b6544f4b531a3112237",
32+
strip_prefix = "bazel-lib-2.8.1",
33+
url = "https://github.com/aspect-build/bazel-lib/releases/download/v2.8.1/bazel-lib-v2.8.1.tar.gz",
3434
)
3535

3636
# bazel dependencies
@@ -61,10 +61,10 @@ rules_proto_toolchains()
6161
# For buildifier
6262
http_archive(
6363
name = "io_bazel_rules_go",
64-
sha256 = "b2038e2de2cace18f032249cb4bb0048abf583a36369fa98f687af1b3f880b26",
64+
sha256 = "d93ef02f1e72c82d8bb3d5169519b36167b33cf68c252525e3b9d3d5dd143de7",
6565
urls = [
66-
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
67-
"https://github.com/bazelbuild/rules_go/releases/download/v0.48.1/rules_go-v0.48.1.zip",
66+
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
67+
"https://github.com/bazelbuild/rules_go/releases/download/v0.49.0/rules_go-v0.49.0.zip",
6868
],
6969
)
7070

rules_haskell_tests/non_module_deps.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ def repositories(*, bzlmod): # @unused
3131
# module rules_bazel_integration_test requires bazel >= 6.1.0
3232
http_archive(
3333
name = "rules_bazel_integration_test",
34-
sha256 = "fe43a0ef76323813c912b7256a5f01f87f2697528b107627b70da58c50b1988a",
34+
sha256 = "b079b84278435441023f03de1a72baff9e4e4fe2cb1092ed4c9b60dc8b42e732",
3535
urls = [
36-
"https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.23.0/rules_bazel_integration_test.v0.23.0.tar.gz",
36+
"https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.25.0/rules_bazel_integration_test.v0.25.0.tar.gz",
3737
],
3838
)
3939

0 commit comments

Comments
 (0)