Skip to content

Commit a738d0c

Browse files
committed
Fix issues that raise errors in projects depending on Oak as a bzlmod
Tested by running `bazel mod graph` in the codelab, and resolving any errors that I could. * Some old labels that were copied over from WORKSPACE prefix targets with `@`, but that break in bzlmod. * Fix some version in MODULE.bazel to prevent warnings about version matching. * Make nixpkgs a dev_depedency since it doesn't seem to work very well, and we dont' need to expose any of that functionality to users. BUG=328734824 Change-Id: I520c25503c52a465e808833c8224e6f86a6a6964
1 parent 58d6e94 commit a738d0c

File tree

4 files changed

+2166
-76
lines changed

4 files changed

+2166
-76
lines changed

MODULE.bazel

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@ bazel_dep(name = "boringssl", version = "0.20250415.0")
6060
bazel_dep(name = "protobuf", version = "30.0", repo_name = "com_google_protobuf")
6161

6262
# https://github.com/google/googletest
63-
bazel_dep(name = "googletest", version = "1.16.0", repo_name = "com_google_googletest")
63+
bazel_dep(name = "googletest", version = "1.17.0", repo_name = "com_google_googletest")
6464

6565
# https://github.com/google/re2
66-
bazel_dep(name = "re2", version = "2024-07-02", repo_name = "com_google_re2")
66+
bazel_dep(name = "re2", version = "2025-11-05", repo_name = "com_google_re2")
6767

6868
# https://github.com/abseil/abseil-cpp
69-
bazel_dep(name = "abseil-cpp", version = "20250127.1", repo_name = "com_google_absl")
69+
bazel_dep(name = "abseil-cpp", version = "20250512.1", repo_name = "com_google_absl")
7070

7171
# https://github.com/bazelbuild/rules_pkg
7272
bazel_dep(name = "rules_pkg", version = "1.0.1")
@@ -78,7 +78,7 @@ bazel_dep(name = "google_benchmark", version = "1.9.1", repo_name = "com_github_
7878
bazel_dep(name = "tink_cc", version = "2.4.0", repo_name = "com_github_tink_crypto_tink_cc")
7979

8080
# https://github.com/bazel-contrib/rules_python
81-
bazel_dep(name = "rules_python", version = "1.4.1", dev_dependency = True)
81+
bazel_dep(name = "rules_python", version = "1.5.1", dev_dependency = True)
8282
bazel_dep(name = "oak_linter", version = "0.1", dev_dependency = True)
8383
local_path_override(
8484
module_name = "oak_linter",
@@ -113,7 +113,7 @@ bazel_dep(name = "rules_kotlin", version = "2.1.4")
113113

114114
bazel_dep(name = "rules_nixpkgs_core", version = "0.13.0")
115115

116-
nix_repos = use_extension("//bazel/nix:extensions.bzl", "nix_repos")
116+
nix_repos = use_extension("//bazel/nix:extensions.bzl", "nix_repos", dev_dependency = True)
117117
use_repo(nix_repos, "nix_linux_kernel", "nix_vanilla_linux_kernel")
118118

119119
##### OCI
@@ -235,27 +235,27 @@ bazel_dep(name = "rules_foreign_cc", version = "0.15.0")
235235
# https://android.googlesource.com/platform/external/libcppbor
236236
git_repository(
237237
name = "libcppbor",
238-
build_file = "@//:third_party/google/libcppbor/BUILD",
238+
build_file = "//:third_party/google/libcppbor/BUILD",
239239
# Head commit on 202505-09
240240
commit = "b1b998be4ec447f3086e7fd6a7f78eaec66a1c45",
241241
patches = [
242-
"@//:third_party/google/libcppbor/remove_macro.patch",
243-
"@//:third_party/google/libcppbor/limits.patch",
242+
"//:third_party/google/libcppbor/remove_macro.patch",
243+
"//:third_party/google/libcppbor/limits.patch",
244244
],
245245
remote = "https://android.googlesource.com/platform/external/libcppbor",
246246
)
247247

248248
http_archive(
249249
name = "cose_lib",
250-
build_file = "@//:third_party/BUILD.cose_lib",
250+
build_file = "//:third_party/BUILD.cose_lib",
251251
sha256 = "e41a068b573bb07ed2a50cb3c39ae10995977cad82e24a7873223277e7fdb4e5",
252252
strip_prefix = "cose-lib-2023.09.08",
253253
url = "https://github.com/android/cose-lib/archive/refs/tags/v2023.09.08.tar.gz",
254254
)
255255

256256
http_archive(
257257
name = "e2fsprogs",
258-
build_file = "@//:third_party/BUILD.e2fsprogs",
258+
build_file = "//:third_party/BUILD.e2fsprogs",
259259
sha256 = "144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db",
260260
strip_prefix = "e2fsprogs-1.47.0",
261261
urls = ["https://mirrors.edge.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.47.0/e2fsprogs-1.47.0.tar.xz"],

0 commit comments

Comments
 (0)