Skip to content

Commit 7308e45

Browse files
authored
Bump flake (TraceMachina#1671)
Notably, this bumps Rust to 1.86.0 and LLVM to 20.1.1.
1 parent 144d289 commit 7308e45

File tree

35 files changed

+3985
-2867
lines changed

35 files changed

+3985
-2867
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resolver = "2"
55
name = "nativelink"
66
version = "0.6.0"
77
edition = "2021"
8-
rust-version = "1.85.0"
8+
rust-version = "1.86.0"
99

1010
[profile.release]
1111
lto = true

MODULE.bazel

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ python.toolchain(
2020
)
2121
use_repo(python, python = "python_versions")
2222

23-
bazel_dep(name = "rules_rust", version = "0.59.1")
23+
bazel_dep(name = "rules_rust", version = "0.59.2")
2424
archive_override(
2525
module_name = "rules_rust",
26-
integrity = "sha256-N37buXa2l1U9N3VmNH3Qv/xd8PxX6TsdLBCM9F497Ac=",
26+
integrity = "sha256-CeF7R8AVBGVjGqMZ8nQnYKQ+3tqy6cAS+R0K4u/wImg=",
2727
patch_strip = 1,
2828
patches = ["//tools:rules_rust-musl-platforms.diff"],
2929
urls = [
30-
"https://github.com/bazelbuild/rules_rust/releases/download/0.59.1/rules_rust-0.59.1.tar.gz",
30+
"https://github.com/bazelbuild/rules_rust/releases/download/0.59.2/rules_rust-0.59.2.tar.gz",
3131
],
3232
)
3333

@@ -79,29 +79,31 @@ rust.toolchain(
7979
edition = "2021",
8080

8181
# These should always follow the versions from LRE.
82-
rust_analyzer_version = "nightly/2025-01-15",
83-
rustfmt_version = "nightly/2025-01-15",
82+
rust_analyzer_version = "nightly/2025-04-03",
83+
rustfmt_version = "nightly/2025-04-03",
8484
sha256s = {
85-
"2025-01-15/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "f970a04baeee340116fed7e9c64b11b6fa557b339f23c4ef05bac0d2d32966f9",
86-
"2025-01-15/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "0ff237a58fe2c060f636cdd22e3be363cb7c242e4118fbffc54b0df3915aa358",
87-
"2025-01-15/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "3884a607d4cc75f3e7c9475dc206f864868f17a45c1c1d9b37669119102d3391",
88-
"2025-01-15/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "f477cc00da908f55f122a0dd6efd45c981ae147570bd5d7e5ceca3a2ee1414e1",
89-
"2025-01-15/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "690ff845ba85d5a4126f89385e26597fc8ff4d02ab77cc7c7ecc84ccbefe9b5e",
90-
"2025-01-15/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "692a58a03666823def6e88a8aa8048b5f09276642ffd0f766cd3634e19125928",
91-
"cargo-1.85.0-aarch64-apple-darwin.tar.xz": "d67766fb2e62214b3ee3faf01dcddddcb48e8d0483c2bb3475a16cb96210afed",
92-
"cargo-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "0aff33b57b0e0b102d762a2b53042846c1ca346cff4b7bd96b5c03c9e8e51d81",
93-
"clippy-1.85.0-aarch64-apple-darwin.tar.xz": "62038ee7a541e78ebb34172eac2b8e458e00ecdf4f83bfbe204044c70d9a5e9c",
94-
"clippy-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "0dc3ca1708a6c9eed05d0802364377572b79ff079815b7bcbe8e3991f77c4117",
95-
"llvm-tools-1.85.0-aarch64-apple-darwin.tar.xz": "2652b489590805718981db100a7d4f27611510b3ac46b588a433cb61dcce2402",
96-
"llvm-tools-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "01d5f0f8b3aeb1c7bd4c3ebbf0b30a8be02481f8dfb3fcbf950627460d0d4b5e",
97-
"rust-std-1.85.0-aarch64-apple-darwin.tar.xz": "7da1367209de00e3fb315c0e76658e3605ee2559892d29851a3159ae7ea1ddc5",
98-
"rust-std-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "285e105d25ebdf501341238d4c0594ecdda50ec9078f45095f793a736b1f1ac2",
99-
"rustc-1.85.0-aarch64-apple-darwin.tar.xz": "2a03e227b57a49d80b43473b6fa2d56ad661ece0d8ffd81f639cd31600d3823e",
100-
"rustc-1.85.0-x86_64-unknown-linux-gnu.tar.xz": "7436f13797475082cd87aa65547449e01659d6a810b4cd5f8aedc48bb9f89dfb",
85+
"2025-04-03/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "adfe5bd8fb807bfd8fee2ede9d88853837ba9dcf14dd701edeb33a8c9d84a6f2",
86+
"2025-04-03/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "06839db5cd1810032a3115211b558b257c75f8459645265e310f0c518c9ad2d8",
87+
"2025-04-03/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "e2adf4c25541e7abf7e0c4e6586c94ac662fb9ae3e78b1f7310789bfc1cb5860",
88+
"2025-04-03/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "6b3b7dc16ccb0204bcc2fc381ffe69d1eaddf326583c11d24699797ebd0778c6",
89+
"2025-04-03/rustc-nightly-aarch64-apple-darwin.tar.xz": "6538a7232af263e84a4aac73d6858b6e9b44478bd48f16b1c53c027ab0278ad1",
90+
"2025-04-03/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "2418663236236373c3d278e6e602ef5ad3158b9cebd5c1095f7916dbd9c9b891",
91+
"2025-04-03/rustfmt-nightly-aarch64-apple-darwin.tar.xz": "52e7e729422369382a32a29ab3b208dfe79027d83416e136c100ab31bed74caf",
92+
"2025-04-03/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "f8876b429b1ad9dfd5ece1e47947b39b20a0ecc56b1c76a614c4af5797152d86",
93+
"cargo-1.86.0-aarch64-apple-darwin.tar.xz": "3cb13873d48c3e1e4cc684d42c245226a11fba52af6b047c3346ed654e7a05c0",
94+
"cargo-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "c5c1590f7e9246ad9f4f97cfe26ffa92707b52a769726596a9ef81565ebd908b",
95+
"clippy-1.86.0-aarch64-apple-darwin.tar.xz": "239fa3a604b124f0312f2af08537874a1227dba63385484b468cca62e7c4f2f2",
96+
"clippy-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "02aaff2c1407d2da8dba19aa4970dd873e311902b120a66cbcdbe51eb8836edf",
97+
"llvm-tools-1.86.0-aarch64-apple-darwin.tar.xz": "04d3618c686845853585f036e3211eb9e18f2d290f4610a7a78bdc1fcce1ebd9",
98+
"llvm-tools-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "282145ab7a63c98b625856f44b905b4dc726b497246b824632a5790debe95a78",
99+
"rust-std-1.86.0-aarch64-apple-darwin.tar.xz": "0fb121fb3b8fa9027d79ff598500a7e5cd086ddbc3557482ed3fdda00832c61b",
100+
"rust-std-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "67be7184ea388d8ce0feaf7fdea46f1775cfc2970930264343b3089898501d37",
101+
"rustc-1.86.0-aarch64-apple-darwin.tar.xz": "23b8f52102249a47ab5bc859d54c9a3cb588a3259ba3f00f557d50edeca4fde9",
102+
"rustc-1.86.0-x86_64-unknown-linux-gnu.tar.xz": "4438b809ce4a083af31ed17aeeedcc8fc60ccffc0625bef1926620751b6989d7",
101103
},
102104
versions = [
103-
"1.85.0",
104-
"nightly/2025-01-15",
105+
"1.86.0",
106+
"nightly/2025-04-03",
105107
],
106108
)
107109
use_repo(rust, "rust_toolchains")

flake.lock

Lines changed: 18 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
linkerPath =
9090
if isLinuxBuild && isLinuxTarget
9191
then "${pkgs.mold}/bin/ld.mold"
92-
else "${pkgs.llvmPackages_19.lld}/bin/ld.lld";
92+
else "${pkgs.llvmPackages_20.lld}/bin/ld.lld";
9393

9494
linkerEnvVar = "CARGO_TARGET_${pkgs.lib.toUpper (pkgs.lib.replaceStrings ["-"] ["_"] targetArch)}_LINKER";
9595
in
@@ -110,7 +110,7 @@
110110
(
111111
if isLinuxBuild
112112
then [pkgs.mold]
113-
else [pkgs.llvmPackages_19.lld]
113+
else [pkgs.llvmPackages_20.lld]
114114
)
115115
++ pkgs.lib.optionals p.stdenv.targetPlatform.isDarwin [
116116
p.darwin.apple_sdk.frameworks.Security
@@ -424,7 +424,7 @@
424424
pkgs.kind
425425
pkgs.tektoncd-cli
426426
pkgs.pulumi
427-
pkgs.pulumiPackages.pulumi-language-go
427+
pkgs.pulumiPackages.pulumi-go
428428
pkgs.fluxcd
429429
pkgs.go
430430
pkgs.kustomize

local-remote-execution/generated-cc/cc/BUILD

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,10 @@ cc_toolchain_config(
122122
coverage_link_flags = ["--coverage"],
123123
cpu = "k8",
124124
cxx_builtin_include_directories = [
125-
"/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/include",
126-
"/nix/store/5djq7mrpqv8kzn2xi22y5d8ww7rsix82-glibc-2.40-66-dev/include",
127-
"/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/share",
128-
"/nix/store/47jmi5pvn8xh447nz99n3nicy9fi831v-libcxx-19.1.7-dev/include/c++/v1",
125+
"/nix/store/ix9klsvak30jhakj38a39158fxj1fp69-clang-wrapper-20.1.1/resource-root/include",
126+
"/nix/store/71xyq87gpb2qrwn314p0sf2n002lgd91-glibc-2.40-66-dev/include",
127+
"/nix/store/ix9klsvak30jhakj38a39158fxj1fp69-clang-wrapper-20.1.1/resource-root/share",
128+
"/nix/store/d6a0l905kxjpzgvcynkg1k3pd0zij56l-libcxx-20.1.1-dev/include/c++/v1",
129129
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
130130
],
131131
cxx_flags = ["-std=c++14"],
@@ -136,8 +136,8 @@ cc_toolchain_config(
136136
]},
137137
host_system_name = "x86_64-unknown-linux-gnu",
138138
link_flags = [
139-
"-fuse-ld=/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ld.mold",
140-
"-B/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin",
139+
"-fuse-ld=/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/ld.mold",
140+
"-B/nix/store/6hch3rx1g4xqhpjc6p5chjpx53pwr5ii-customClang/bin",
141141
"-Wl,-no-as-needed",
142142
"-Wl,-z,relro,-z,now",
143143
],
@@ -162,19 +162,19 @@ cc_toolchain_config(
162162
target_libc = "glibc_2.35",
163163
target_system_name = "local",
164164
tool_paths = {
165-
"ar": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ar",
166-
"ld": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/ld",
165+
"ar": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/ar",
166+
"ld": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/ld",
167167
"llvm-cov": "None",
168168
"llvm-profdata": "None",
169169
"cpp": "/usr/bin/cpp",
170-
"gcc": "/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang",
171-
"dwp": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/dwp",
170+
"gcc": "/nix/store/6hch3rx1g4xqhpjc6p5chjpx53pwr5ii-customClang/bin/customClang",
171+
"dwp": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/dwp",
172172
"gcov": "None",
173-
"nm": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/nm",
174-
"objcopy": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/objcopy",
175-
"objdump": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/objdump",
176-
"strip": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/strip",
177-
"c++filt": "/nix/store/fj1xilxbnb4bll73hw273vx999n22rwi-llvm-binutils-wrapper-19.1.7/bin/c++filt",
173+
"nm": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/nm",
174+
"objcopy": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/objcopy",
175+
"objdump": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/objdump",
176+
"strip": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/strip",
177+
"c++filt": "/nix/store/llp39hihpfs5xn8sqvhvlxy21hn9f5js-llvm-binutils-wrapper-20.1.1/bin/c++filt",
178178
"parse_headers": "cc_wrapper.sh",
179179
"validate_static_library": "validate_static_library.sh",
180180
},
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
This file is generated by cc_configure and contains builtin include directories
2-
that /nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang reported. This file is a dependency of every compilation action and
2+
that /nix/store/6hch3rx1g4xqhpjc6p5chjpx53pwr5ii-customClang/bin/customClang reported. This file is a dependency of every compilation action and
33
changes to it will be reflected in the action cache key. When some of these
44
paths change, Bazel will make sure to rerun the action, even though none of
55
declared action inputs or the action commandline changes.
66

7-
/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/include
8-
/nix/store/5djq7mrpqv8kzn2xi22y5d8ww7rsix82-glibc-2.40-66-dev/include
9-
/nix/store/i45c42749c7rkbv4idawbr9m4phi2c6h-clang-wrapper-19.1.7/resource-root/share
10-
/nix/store/47jmi5pvn8xh447nz99n3nicy9fi831v-libcxx-19.1.7-dev/include/c++/v1
7+
/nix/store/ix9klsvak30jhakj38a39158fxj1fp69-clang-wrapper-20.1.1/resource-root/include
8+
/nix/store/71xyq87gpb2qrwn314p0sf2n002lgd91-glibc-2.40-66-dev/include
9+
/nix/store/ix9klsvak30jhakj38a39158fxj1fp69-clang-wrapper-20.1.1/resource-root/share
10+
/nix/store/d6a0l905kxjpzgvcynkg1k3pd0zij56l-libcxx-20.1.1-dev/include/c++/v1
1111
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk

local-remote-execution/generated-cc/cc/cc_wrapper.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/nix/store/9qqbpbs3rkkiifi3yfq4ghcbc4p2n906-bash/bin/bash
1+
#!/nix/store/685ias1hj742z69rjchxb9h9h0gal6zc-bash/bin/bash
22
#
33
# Copyright 2015 The Bazel Authors. All rights reserved.
44
#
@@ -46,7 +46,7 @@ done
4646

4747

4848
# Call the C++ compiler
49-
/nix/store/6dysvsc6y6yq3dii7lbixbkan6pmi58x-customClang/bin/customClang "$@"
49+
/nix/store/6hch3rx1g4xqhpjc6p5chjpx53pwr5ii-customClang/bin/customClang "$@"
5050

5151
# Generate an empty file if header processing succeeded.
5252
if [[ "${OUTPUT}" == *.h.processed ]]; then

0 commit comments

Comments
 (0)