Skip to content

Commit

Permalink
[build] 02-07-25 focused deps update
Browse files Browse the repository at this point in the history
Addendum to #3487:
- rules_rust update has been unblocked downstream
- Fetch rules_cc explicitly, we use it for cc_ast_dump() and need to do so with
  Bazel 8 anyway.
  • Loading branch information
fhanau committed Feb 7, 2025
1 parent b51f49e commit 305153f
Show file tree
Hide file tree
Showing 11 changed files with 192 additions and 39 deletions.
7 changes: 7 additions & 0 deletions build/deps/build_deps.jsonc
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@
"type": "crate",
"build_file": "//deps/rust:BUILD.cxxbridge-cmd"
},
{
"name": "rules_cc",
"type": "github_release",
"owner": "bazelbuild",
"repo": "rules_cc",
"file_regex": "^rules_cc-"
},
{
"name": "aspect_rules_esbuild",
"type": "github_release",
Expand Down
2 changes: 2 additions & 0 deletions build/deps/gen/build_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ load("@//build/deps:gen/dep_cxxbridge_cmd.bzl", "dep_cxxbridge_cmd")
load("@//build/deps:gen/dep_ruff_darwin_arm64.bzl", "dep_ruff_darwin_arm64")
load("@//build/deps:gen/dep_ruff_linux_amd64.bzl", "dep_ruff_linux_amd64")
load("@//build/deps:gen/dep_ruff_linux_arm64.bzl", "dep_ruff_linux_arm64")
load("@//build/deps:gen/dep_rules_cc.bzl", "dep_rules_cc")
load("@//build/deps:gen/dep_rules_nodejs.bzl", "dep_rules_nodejs")
load("@//build/deps:gen/dep_rules_pkg.bzl", "dep_rules_pkg")
load("@//build/deps:gen/dep_rules_python.bzl", "dep_rules_python")
Expand All @@ -40,6 +41,7 @@ def deps_gen():
dep_cargo_bazel_macos_arm64()
dep_cargo_bazel_win_x64()
dep_cxxbridge_cmd()
dep_rules_cc()
dep_aspect_rules_esbuild()
dep_rules_pkg()
dep_rules_nodejs()
Expand Down
6 changes: 3 additions & 3 deletions build/deps/gen/dep_cargo_bazel_linux_arm64.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

load("@//:build/http.bzl", "http_file")

TAG_NAME = "0.56.0"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-aarch64-unknown-linux-gnu"
SHA256 = "f3a35b137221d4627ba0ed62f775c4d3cbb45b6db839ae47f2ebfd48abe44a91"
TAG_NAME = "0.57.1"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.57.1/cargo-bazel-aarch64-unknown-linux-gnu"
SHA256 = "1d687a7e30ee16def6cf80a24c57a5b04fbe6ef44a730e27b6d73790d5b87671"

def dep_cargo_bazel_linux_arm64():
http_file(
Expand Down
6 changes: 3 additions & 3 deletions build/deps/gen/dep_cargo_bazel_linux_x64.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

load("@//:build/http.bzl", "http_file")

TAG_NAME = "0.56.0"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-x86_64-unknown-linux-gnu"
SHA256 = "53418ae5457040e84009f7c69b070e1f12f10a9a3a3ef4f5d0829c66e5438ba1"
TAG_NAME = "0.57.1"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.57.1/cargo-bazel-x86_64-unknown-linux-gnu"
SHA256 = "536e2ea4b030e38231f2012c63a87443f89c6860a7022ab4c928594b65a5cfa1"

def dep_cargo_bazel_linux_x64():
http_file(
Expand Down
6 changes: 3 additions & 3 deletions build/deps/gen/dep_cargo_bazel_macos_arm64.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

load("@//:build/http.bzl", "http_file")

TAG_NAME = "0.56.0"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-aarch64-apple-darwin"
SHA256 = "5143e347ec45e0fcc249f1de44f0dce227062579ad364a0b269b39f0ce49f1d8"
TAG_NAME = "0.57.1"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.57.1/cargo-bazel-aarch64-apple-darwin"
SHA256 = "5b2800f68233596f8d6b4d13e8046e1a5e5b2f85bf9b7dcac4e09d1364d37fcb"

def dep_cargo_bazel_macos_arm64():
http_file(
Expand Down
6 changes: 3 additions & 3 deletions build/deps/gen/dep_cargo_bazel_macos_x64.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

load("@//:build/http.bzl", "http_file")

TAG_NAME = "0.56.0"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-x86_64-apple-darwin"
SHA256 = "9e8a92674771982f68031d0cc516ba08b34dd736c4f818d51349547f2136d012"
TAG_NAME = "0.57.1"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.57.1/cargo-bazel-x86_64-apple-darwin"
SHA256 = "3e53c5922b38e2924a6cf256ce403d0812aa0ba6a090be3756cd14180f7a74d8"

def dep_cargo_bazel_macos_x64():
http_file(
Expand Down
6 changes: 3 additions & 3 deletions build/deps/gen/dep_cargo_bazel_win_x64.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

load("@//:build/http.bzl", "http_file")

TAG_NAME = "0.56.0"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/cargo-bazel-x86_64-pc-windows-msvc.exe"
SHA256 = "5c62a1c42b71af6c2765dc5f9518eba22ed28276a65f7accf5a2bca0c5cfaf74"
TAG_NAME = "0.57.1"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.57.1/cargo-bazel-x86_64-pc-windows-msvc.exe"
SHA256 = "a37a9dabeb93e7c7b65e3175856e9e8e05f18e0a11b91cc9652920b4052c74ae"

def dep_cargo_bazel_win_x64():
http_file(
Expand Down
18 changes: 18 additions & 0 deletions build/deps/gen/dep_rules_cc.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# WARNING: THIS FILE IS AUTOGENERATED BY update-deps.py DO NOT EDIT

load("@//:build/http.bzl", "http_archive")

TAG_NAME = "0.1.1"
URL = "https://github.com/bazelbuild/rules_cc/releases/download/0.1.1/rules_cc-0.1.1.tar.gz"
STRIP_PREFIX = "rules_cc-0.1.1"
SHA256 = "712d77868b3152dd618c4d64faaddefcc5965f90f5de6e6dd1d5ddcd0be82d42"
TYPE = "tgz"

def dep_rules_cc():
http_archive(
name = "rules_cc",
url = URL,
strip_prefix = STRIP_PREFIX,
type = TYPE,
sha256 = SHA256,
)
6 changes: 3 additions & 3 deletions build/deps/gen/dep_rules_rust.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

load("@//:build/http.bzl", "http_archive")

TAG_NAME = "0.56.0"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.56.0/rules_rust-0.56.0.tar.gz"
TAG_NAME = "0.57.1"
URL = "https://github.com/bazelbuild/rules_rust/releases/download/0.57.1/rules_rust-0.57.1.tar.gz"
STRIP_PREFIX = ""
SHA256 = "f1306aac0b258b790df01ad9abc6abb0df0b65416c74b4ef27f4aab298780a64"
SHA256 = "e2a3abd3a11683a05305bbfd33cc494df79b36413d54c057b1ad7b4590f4ef52"
TYPE = "tgz"

def dep_rules_rust():
Expand Down
126 changes: 126 additions & 0 deletions deps/rust/crates/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -31,42 +31,84 @@ filegroup(
)

# Workspace Member Dependencies
alias(
name = "anyhow-1.0.95",
actual = "@crates_vendor__anyhow-1.0.95//:anyhow",
tags = ["manual"],
)

alias(
name = "anyhow",
actual = "@crates_vendor__anyhow-1.0.95//:anyhow",
tags = ["manual"],
)

alias(
name = "capnp-0.20.3",
actual = "@crates_vendor__capnp-0.20.3//:capnp",
tags = ["manual"],
)

alias(
name = "capnp",
actual = "@crates_vendor__capnp-0.20.3//:capnp",
tags = ["manual"],
)

alias(
name = "capnpc-0.20.1",
actual = "@crates_vendor__capnpc-0.20.1//:capnpc",
tags = ["manual"],
)

alias(
name = "capnpc",
actual = "@crates_vendor__capnpc-0.20.1//:capnpc",
tags = ["manual"],
)

alias(
name = "clang-ast-0.1.29",
actual = "@crates_vendor__clang-ast-0.1.29//:clang_ast",
tags = ["manual"],
)

alias(
name = "clang-ast",
actual = "@crates_vendor__clang-ast-0.1.29//:clang_ast",
tags = ["manual"],
)

alias(
name = "clap-4.5.28",
actual = "@crates_vendor__clap-4.5.28//:clap",
tags = ["manual"],
)

alias(
name = "clap",
actual = "@crates_vendor__clap-4.5.28//:clap",
tags = ["manual"],
)

alias(
name = "codespan-reporting-0.11.1",
actual = "@crates_vendor__codespan-reporting-0.11.1//:codespan_reporting",
tags = ["manual"],
)

alias(
name = "codespan-reporting",
actual = "@crates_vendor__codespan-reporting-0.11.1//:codespan_reporting",
tags = ["manual"],
)

alias(
name = "cxx-1.0.138",
actual = "@crates_vendor__cxx-1.0.138//:cxx",
tags = ["manual"],
)

alias(
name = "cxx",
actual = "@crates_vendor__cxx-1.0.138//:cxx",
Expand All @@ -79,84 +121,168 @@ alias(
tags = ["manual"],
)

alias(
name = "flate2-1.0.35",
actual = "@crates_vendor__flate2-1.0.35//:flate2",
tags = ["manual"],
)

alias(
name = "flate2",
actual = "@crates_vendor__flate2-1.0.35//:flate2",
tags = ["manual"],
)

alias(
name = "lol_html_c_api-1.1.2",
actual = "@crates_vendor__lol_html_c_api-1.1.2//:lolhtml",
tags = ["manual"],
)

alias(
name = "lol_html_c_api",
actual = "@crates_vendor__lol_html_c_api-1.1.2//:lolhtml",
tags = ["manual"],
)

alias(
name = "nix-0.29.0",
actual = "@crates_vendor__nix-0.29.0//:nix",
tags = ["manual"],
)

alias(
name = "nix",
actual = "@crates_vendor__nix-0.29.0//:nix",
tags = ["manual"],
)

alias(
name = "pico-args-0.5.0",
actual = "@crates_vendor__pico-args-0.5.0//:pico_args",
tags = ["manual"],
)

alias(
name = "pico-args",
actual = "@crates_vendor__pico-args-0.5.0//:pico_args",
tags = ["manual"],
)

alias(
name = "proc-macro2-1.0.93",
actual = "@crates_vendor__proc-macro2-1.0.93//:proc_macro2",
tags = ["manual"],
)

alias(
name = "proc-macro2",
actual = "@crates_vendor__proc-macro2-1.0.93//:proc_macro2",
tags = ["manual"],
)

alias(
name = "quote-1.0.38",
actual = "@crates_vendor__quote-1.0.38//:quote",
tags = ["manual"],
)

alias(
name = "quote",
actual = "@crates_vendor__quote-1.0.38//:quote",
tags = ["manual"],
)

alias(
name = "ruff_python_ast-0.0.0",
actual = "@crates_vendor__ruff_python_ast-0.0.0//:ruff_python_ast",
tags = ["manual"],
)

alias(
name = "ruff_python_ast",
actual = "@crates_vendor__ruff_python_ast-0.0.0//:ruff_python_ast",
tags = ["manual"],
)

alias(
name = "ruff_python_parser-0.0.0",
actual = "@crates_vendor__ruff_python_parser-0.0.0//:ruff_python_parser",
tags = ["manual"],
)

alias(
name = "ruff_python_parser",
actual = "@crates_vendor__ruff_python_parser-0.0.0//:ruff_python_parser",
tags = ["manual"],
)

alias(
name = "serde-1.0.217",
actual = "@crates_vendor__serde-1.0.217//:serde",
tags = ["manual"],
)

alias(
name = "serde",
actual = "@crates_vendor__serde-1.0.217//:serde",
tags = ["manual"],
)

alias(
name = "serde_json-1.0.138",
actual = "@crates_vendor__serde_json-1.0.138//:serde_json",
tags = ["manual"],
)

alias(
name = "serde_json",
actual = "@crates_vendor__serde_json-1.0.138//:serde_json",
tags = ["manual"],
)

alias(
name = "syn-2.0.98",
actual = "@crates_vendor__syn-2.0.98//:syn",
tags = ["manual"],
)

alias(
name = "syn",
actual = "@crates_vendor__syn-2.0.98//:syn",
tags = ["manual"],
)

alias(
name = "thiserror-2.0.11",
actual = "@crates_vendor__thiserror-2.0.11//:thiserror",
tags = ["manual"],
)

alias(
name = "thiserror",
actual = "@crates_vendor__thiserror-2.0.11//:thiserror",
tags = ["manual"],
)

alias(
name = "tokio-1.43.0",
actual = "@crates_vendor__tokio-1.43.0//:tokio",
tags = ["manual"],
)

alias(
name = "tokio",
actual = "@crates_vendor__tokio-1.43.0//:tokio",
tags = ["manual"],
)

alias(
name = "tracing-0.1.41",
actual = "@crates_vendor__tracing-0.1.41//:tracing",
tags = ["manual"],
)

alias(
name = "tracing",
actual = "@crates_vendor__tracing-0.1.41//:tracing",
Expand Down
Loading

0 comments on commit 305153f

Please sign in to comment.