Skip to content

Commit 4d331f7

Browse files
authored
Bump toolchains (TraceMachina#1356)
- Bump most Bazel modules - Update Bazel 7.2.1 -> 7.3.1 - Use correct llvm bintools - Bump flake and fix toolchain issues - Regenerate LRE toolchains - Adjust web deps (notably playwright) - Fix deprecated go linter - Fix out-of-sync nativelink version - Update Rust 1.79.0 -> 1.81.0 - Disable deno for x86_64-darwin as it's no longer supported.
1 parent b770b13 commit 4d331f7

26 files changed

+2816
-3263
lines changed

.bazelversion

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.2.1
1+
7.3.1

.golangci.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ linters:
55
# Deprecated.
66
- execinquery
77
- gomnd
8+
- exportloopref
89

910
# Allow all packages for now.
1011
- depguard

Cargo.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ resolver = "2"
33

44
[package]
55
name = "nativelink"
6-
version = "0.5.1"
6+
version = "0.5.3"
77
edition = "2021"
8-
rust-version = "1.79.0"
8+
rust-version = "1.81.0"
99

1010
[profile.release]
1111
lto = true

MODULE.bazel

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module(
66

77
bazel_dep(name = "rules_cc", version = "0.0.9")
88
bazel_dep(name = "platforms", version = "0.0.10")
9-
bazel_dep(name = "rules_python", version = "0.34.0")
9+
bazel_dep(name = "rules_python", version = "0.36.0")
1010

1111
python = use_extension("@rules_python//python/extensions:python.bzl", "python")
1212
python.toolchain(
@@ -18,7 +18,7 @@ python.toolchain(
1818
)
1919
use_repo(python, python = "python_versions")
2020

21-
bazel_dep(name = "rules_rust", version = "0.48.0")
21+
bazel_dep(name = "rules_rust", version = "0.51.0")
2222

2323
rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
2424
rust.toolchain(
@@ -46,7 +46,7 @@ rust.toolchain(
4646
"2024-07-24/rust-std-nightly-aarch64-apple-darwin.tar.xz": "ea8afa34a2010b7ed371ad260af837cf89d02fb24783ed9cee75685781247fde",
4747
},
4848
versions = [
49-
"1.79.0",
49+
"1.81.0",
5050
"nightly/2024-07-24",
5151
],
5252
)
@@ -57,7 +57,7 @@ rust_host_tools = use_extension(
5757
)
5858
rust_host_tools.host_tools(
5959
edition = "2021",
60-
version = "1.79.0",
60+
version = "1.81.0",
6161
)
6262

6363
use_repo(rust, "rust_toolchains")
@@ -85,13 +85,13 @@ rust_analyzer = use_extension(
8585
)
8686
rust_analyzer.rust_analyzer_dependencies()
8787

88-
bazel_dep(name = "protobuf", version = "27.2", repo_name = "com_google_protobuf")
89-
bazel_dep(name = "toolchains_protoc", version = "0.3.1")
88+
bazel_dep(name = "protobuf", version = "27.5", repo_name = "com_google_protobuf")
89+
bazel_dep(name = "toolchains_protoc", version = "0.3.3")
9090

9191
protoc = use_extension("@toolchains_protoc//protoc:extensions.bzl", "protoc")
9292
protoc.toolchain(
9393
google_protobuf = "com_google_protobuf",
94-
version = "v27.1",
94+
version = "v28.0",
9595
)
9696

9797
# Local remote execution.

flake.lock

+22-27
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
};
1616
crane = {
1717
url = "github:ipetkov/crane";
18-
inputs.nixpkgs.follows = "nixpkgs";
1918
};
2019
nix2container = {
2120
url = "github:nlewo/nix2container";
@@ -49,7 +48,7 @@
4948
system,
5049
...
5150
}: let
52-
stable-rust-version = "1.79.0";
51+
stable-rust-version = "1.81.0";
5352
nightly-rust-version = "2024-07-24";
5453

5554
# TODO(aaronmondal): Make musl builds work on Darwin.
@@ -338,11 +337,8 @@
338337
name = "nixpkgs-patched";
339338
src = self.inputs.nixpkgs;
340339
patches = [
341-
./tools/nixpkgs_all-packages.diff
342340
./tools/nixpkgs_link_libunwind_and_libcxx.diff
343341
./tools/nixpkgs_disable_ratehammering_pulumi_tests.diff
344-
./tools/nixpkgs_bun.diff
345-
./tools/nixpkgs_playwright_driver.diff
346342
];
347343
};
348344
in
@@ -460,7 +456,6 @@
460456

461457
## Web
462458
pkgs.bun # got patched to the newest version (v.1.1.25)
463-
pkgs.deno
464459
pkgs.lychee
465460
pkgs.nodejs_22 # For pagefind search
466461
pkgs.playwright-driver
@@ -473,7 +468,12 @@
473468
native-cli
474469
docs
475470
]
476-
++ maybeDarwinDeps;
471+
++ maybeDarwinDeps
472+
++ pkgs.lib.optionals (pkgs.stdenv.system != "x86_64-darwin") [
473+
# Old darwin systems are incompatible with deno.
474+
pkgs.deno
475+
];
476+
477477
shellHook = ''
478478
# Generate the .pre-commit-config.yaml symlink when entering the
479479
# development shell.

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -111,18 +111,18 @@ cc_toolchain_config(
111111
coverage_link_flags = ["--coverage"],
112112
cpu = "k8",
113113
cxx_builtin_include_directories = [
114-
"/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/include",
115-
"/nix/store/09lv9r3dx6ql0lzpdv8w2b1r6b358481-glibc-2.39-52-dev/include",
116-
"/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/share",
117-
"/nix/store/kacxs7yfq39sl3sqf3gzksipqhyg3gcp-libcxx-18.1.8-dev/include/c++/v1",
114+
"/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/include",
115+
"/nix/store/wlavaybjbzgllhq11lib6qgr7rm8imgp-glibc-2.39-52-dev/include",
116+
"/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/share",
117+
"/nix/store/lgy959d2i3psg6a85pv2vx4bwmva4m0r-libcxx-18.1.8-dev/include/c++/v1",
118118
"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk",
119119
],
120120
cxx_flags = ["-std=c++14"],
121121
dbg_compile_flags = ["-g"],
122122
host_system_name = "x86_64-unknown-linux-gnu",
123123
link_flags = [
124-
"-fuse-ld=/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/bin/ld.mold",
125-
"-B/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin",
124+
"-fuse-ld=/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/ld.mold",
125+
"-B/nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-customClang/bin",
126126
"-Wl,-no-as-needed",
127127
"-Wl,-z,relro,-z,now",
128128
],
@@ -147,18 +147,18 @@ cc_toolchain_config(
147147
target_libc = "glibc_2.35",
148148
target_system_name = "local",
149149
tool_paths = {
150-
"ar": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/ar",
151-
"ld": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/ld",
150+
"ar": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/ar",
151+
"ld": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/ld",
152152
"llvm-cov": "None",
153153
"llvm-profdata": "None",
154154
"cpp": "/usr/bin/cpp",
155-
"gcc": "/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang",
156-
"dwp": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/dwp",
155+
"gcc": "/nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-customClang/bin/customClang",
156+
"dwp": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/dwp",
157157
"gcov": "None",
158-
"nm": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/nm",
159-
"objcopy": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/objcopy",
160-
"objdump": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/objdump",
161-
"strip": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/strip",
158+
"nm": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/nm",
159+
"objcopy": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/objcopy",
160+
"objdump": "/nix/store/p05cf5z3nycmxkq14jfp5vl23v46aidy-llvm-binutils-wrapper-18.1.8/bin/objdump",
161+
"strip": "/usr/bin/strip",
162162
},
163163
toolchain_identifier = "local",
164164
unfiltered_compile_flags = [
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/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang reported. This file is a dependency of every compilation action and
2+
that /nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-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/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/include
8-
/nix/store/09lv9r3dx6ql0lzpdv8w2b1r6b358481-glibc-2.39-52-dev/include
9-
/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/share
10-
/nix/store/kacxs7yfq39sl3sqf3gzksipqhyg3gcp-libcxx-18.1.8-dev/include/c++/v1
7+
/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/include
8+
/nix/store/wlavaybjbzgllhq11lib6qgr7rm8imgp-glibc-2.39-52-dev/include
9+
/nix/store/k60snilqpm9cys8h55hib7yzwa0xcxgn-clang-wrapper-18.1.8/resource-root/share
10+
/nix/store/lgy959d2i3psg6a85pv2vx4bwmva4m0r-libcxx-18.1.8-dev/include/c++/v1
1111
/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/nix/store/f6m3rfxfrv73a5g9kz0gpcsj9qb0905a-bash/bin/bash
1+
#!/nix/store/832dnfv9ffw5744ncjfcn7z9y85450sn-bash/bin/bash
22
#
33
# Copyright 2015 The Bazel Authors. All rights reserved.
44
#
@@ -22,4 +22,4 @@ set -eu
2222

2323

2424
# Call the C++ compiler
25-
/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang "$@"
25+
/nix/store/pk06lmp6wwn35xmvn9d7fr78qg6k9qxw-customClang/bin/customClang "$@"

0 commit comments

Comments
 (0)