Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trying out fix to PR 393 #400

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/toolchains/rust/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# https://bazelbuild.github.io/rules_rust/#setup
http_archive(
name = "rules_rust",
sha256 = "d125fb75432dc3b20e9b5a19347b45ec607fabe75f98c6c4ba9badaab9c193ce",
sha256 = "50272c39f20a3a3507cb56dcb5c3b348bda697a7d868708449e2fa6fb893444c",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
"https://github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
"https://github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
],
# rules_rust 0.17.0 does not yet support direct
# rules_rust 0.22.0 does not yet support direct
# overriding toolchain used for build of cargo-bazel
# binary.
# On non-standard systems (viz. NixOS), that approach
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module(
name = "rules_rust",
version = "0.17.0",
version = "0.22.0",
)

bazel_dep(name = "bazel_skylib", version = "1.0.3")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"url": "https://github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
"integrity": "sha384-v3eVoRi4rdkELxzV3egjTJkc8M3UH1YmbdZ2m6Y45gpjBew4a/JU5A4TFNO8Bq3z",
"url": "https://github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
"integrity": "sha384-9HMDzRK4uOv9zg4qyT8rctHUhNfvm9bztPMH9SPjMeu/NJbK7SaI9NU0WRg0S+ny",
"patches": {
"001-rules-rust-crate-universe.patch": "sha384-3jCxEdq9CtWHQZWbIj3vvI1MDxc735phBmjj49QbnRCuIVFjMfMQRH7x6px4iKT4",
"bzlmod-compat.patch": "sha384-N2llBj7w8Y9bTSuXEhuFYxt3eJ6IZpFKP+fOG2t37WilVocXjBVvarolapFJhzU5"
Expand Down
2 changes: 1 addition & 1 deletion registry/modules/rules_rust/metadata.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"homepage": "https://bazelbuild.github.io/rules_rust/",
"maintainers": [],
"versions": ["0.17.0"],
"versions": ["0.22.0"],
"yanked_versions": []
}
2 changes: 1 addition & 1 deletion testing/rust/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ local_path_override(

bazel_dep(name = "bazel_skylib", version = "1.0.3")
bazel_dep(name = "rules_cc", version = "0.0.4")
bazel_dep(name = "rules_rust", version = "0.17.0")
bazel_dep(name = "rules_rust", version = "0.22.0")

# TODO[AH] Remove these transitive dependencies once nixpkgs_java_configure has
# become a module extension in rules_nixpkgs_java.
Expand Down
6 changes: 3 additions & 3 deletions testing/rust/WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ bazel_skylib_workspace()

http_archive(
name = "rules_rust",
sha256 = "d125fb75432dc3b20e9b5a19347b45ec607fabe75f98c6c4ba9badaab9c193ce",
sha256 = "50272c39f20a3a3507cb56dcb5c3b348bda697a7d868708449e2fa6fb893444c",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
"https://github.com/bazelbuild/rules_rust/releases/download/0.17.0/rules_rust-v0.17.0.tar.gz",
"https://mirror.bazel.build/github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
"https://github.com/bazelbuild/rules_rust/releases/download/0.22.0/rules_rust-v0.22.0.tar.gz",
],
# See note on examples/toolchains/rust/WORKSPACE.
patches = ["//:patches/001-rules-rust-crate-universe.patch"],
Expand Down
2 changes: 1 addition & 1 deletion toolchains/rust/MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ bazel_dep(name = "bazel_skylib", version = "1.0.3")
# local registry entry to map a commit to a module "version". the caller will
# also have to know this and point `--registry` at the file from right revision
# on GitHub!
bazel_dep(name = "rules_rust", version = "0.17.0")
bazel_dep(name = "rules_rust", version = "0.22.0")
1 change: 0 additions & 1 deletion toolchains/rust/rust.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ pkgs.buildEnv {{
binary_ext = "${{binary-ext}}",
staticlib_ext = "${{staticlib-ext}}",
dylib_ext = "${{dylib-ext}}",
os = "${{os}}",
exec_triple = "${{build-triple}}",
target_triple = "${{target-triple}}",
default_edition = "{default_edition}",
Expand Down
Loading