Skip to content

Commit

Permalink
Update Rust version to 1.77.2 (TraceMachina#857)
Browse files Browse the repository at this point in the history
- Bump rules_rust to make the new Rust version available in Bazel
- Bump the flake to make the new Rust version available in Nix
- Sync toolchains with the updated flake lockfile

Addresses CVE-2024-24576.
  • Loading branch information
aaronmondal authored Apr 17, 2024
1 parent 9db29ef commit b2b83df
Show file tree
Hide file tree
Showing 9 changed files with 256 additions and 250 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ resolver = "2"
name = "nativelink"
version = "0.3.0"
edition = "2021"
rust-version = "1.77"
rust-version = "1.77.2"

[profile.release]
lto = true
Expand Down
14 changes: 10 additions & 4 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ zig_toolchains = use_extension(
)
use_repo(zig_toolchains, "zig_sdk")

bazel_dep(name = "rules_rust", version = "0.41.1")
bazel_dep(name = "rules_rust", version = "0.42.1")

rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
rust.toolchain(
Expand All @@ -39,14 +39,20 @@ rust.toolchain(
"2024-04-03/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "aaa22601f3106224ecf35ec67ad0e6481838b6ec4cae506f11c5bbf79e94cb65",
},
versions = [
"1.77.0",
"1.77.2",
"nightly/2024-04-03",
],
)
rust.host_tools(

rust_host_tools = use_extension(
"@rules_rust//rust:extension.bzl",
"rust_host_tools",
)
rust_host_tools.host_tools(
edition = "2021",
version = "1.77.0",
version = "1.77.2",
)

use_repo(rust, "rust_toolchains")

crate = use_extension("@rules_rust//crate_universe:extension.bzl", "crate")
Expand Down
30 changes: 15 additions & 15 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
system,
...
}: let
stable-rust-version = "1.77.0";
stable-rust-version = "1.77.2";
nightly-rust-version = "2024-04-03";

# TODO(aaronmondal): Make musl builds work on Darwin.
Expand Down
24 changes: 12 additions & 12 deletions local-remote-execution/generated-cc/cc/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ cc_toolchain_config(
coverage_link_flags = ["--coverage"],
cpu = "k8",
cxx_builtin_include_directories = [
"/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/include",
"/nix/store/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/include",
"/nix/store/gzxqm8dyfirbysqjhh78ivam62ll0m87-glibc-2.39-5-dev/include",
"/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/share",
"/nix/store/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/share",
"/nix/store/2f8iy8mibi3iiia3hc0n5js7q3qgn507-libcxx-17.0.6-dev/include/c++/v1",
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
],
cxx_flags = ["-std=c++14"],
dbg_compile_flags = ["-g"],
host_system_name = "x86_64-unknown-linux-gnu",
link_flags = [
"-B/nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-customClang/bin",
"-B/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin",
"-B/nix/store/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin",
"-B/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin",
"-Wl,-no-as-needed",
"-Wl,-z,relro,-z,now",
"-L/nix/store/q28x84h4npmmwycq44481sir5m9jnv96-libcxx-17.0.6/lib",
Expand Down Expand Up @@ -151,18 +151,18 @@ cc_toolchain_config(
target_libc = "glibc_2.35",
target_system_name = "local",
tool_paths = {
"ar": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/ar",
"ld": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/ld",
"ar": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/ar",
"ld": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/ld",
"llvm-cov": "None",
"llvm-profdata": "None",
"cpp": "/usr/bin/cpp",
"gcc": "/nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-customClang/bin/customClang",
"dwp": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/dwp",
"gcc": "/nix/store/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin/customClang",
"dwp": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/dwp",
"gcov": "None",
"nm": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/nm",
"objcopy": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/objcopy",
"objdump": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/objdump",
"strip": "/nix/store/5jml72v19dbbh6as05ivqxr6wpz8sxaf-binutils-wrapper-2.41/bin/strip",
"nm": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/nm",
"objcopy": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/objcopy",
"objdump": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/objdump",
"strip": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/strip",
},
toolchain_identifier = "local",
unfiltered_compile_flags = [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
This file is generated by cc_configure and contains builtin include directories
that /nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-customClang/bin/customClang reported. This file is a dependency of every compilation action and
that /nix/store/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin/customClang reported. This file is a dependency of every compilation action and
changes to it will be reflected in the action cache key. When some of these
paths change, Bazel will make sure to rerun the action, even though none of
declared action inputs or the action commandline changes.

/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/include
/nix/store/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/include
/nix/store/gzxqm8dyfirbysqjhh78ivam62ll0m87-glibc-2.39-5-dev/include
/nix/store/cpi0yf4yzc3sbzp9811r2m2kq4x5r505-clang-wrapper-17.0.6/resource-root/share
/nix/store/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/share
/nix/store/2f8iy8mibi3iiia3hc0n5js7q3qgn507-libcxx-17.0.6-dev/include/c++/v1
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
4 changes: 2 additions & 2 deletions local-remote-execution/generated-cc/cc/cc_wrapper.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/nix/store/d6whrqnkcsqkb2lz21cp5lpc1k15i5j0-bash/bin/bash
#!/nix/store/il8bar5wz5mhdqh8a1g42ri0x38xrmd6-bash/bin/bash
#
# Copyright 2015 The Bazel Authors. All rights reserved.
#
Expand All @@ -22,4 +22,4 @@ set -eu


# Call the C++ compiler
/nix/store/qlc1ljb5gahlb35j9ih849qhzivz884j-customClang/bin/customClang "$@"
/nix/store/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin/customClang "$@"
Loading

0 comments on commit b2b83df

Please sign in to comment.