Bump trivially bumpable deps (TraceMachina#877)

- Bump flake
- Bump trivially bumpable rust deps
- Fix new clippy clamp lint in S3 store
- Bump Clang/LLVM to 18.1.3
- Unify nix llvmStdenv implementation for darwin and linux
- Regenerate LRE toolchains

Fixes CVE-2024-32650

Cargo.toml

@@ -38,13 +38,11 @@ nativelink-worker = { path = "nativelink-worker" }
 async-lock = "3.3.0"
 axum = "0.6.20"
 
-# The cc crate must be pinned to be compatible with the zig-cc toolchain.
-cc = "1.0.83"
 clap = { version = "4.5.4", features = ["derive"] }
 console-subscriber = { version = "0.2.0" }
 futures = "0.3.30"
 hyper = { version = "0.14.28" }
-mimalloc = "0.1.39"
+mimalloc = "0.1.41"
 parking_lot = "0.12.1"
 prometheus-client = "0.21.2"
 rustls-pemfile = "2.1.2"

MODULE.bazel

@@ -24,15 +24,15 @@ rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
     edition = "2021",
     sha256s = {
-        "2024-04-03/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "0b2164f91906a2fde9b3a518c4d5652c5265ef0b5ba7b1b3573884f16ee02508",
-        "2024-04-03/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "905e3714f811d0efb1f0836c12c1db424de3d194259fa01b853dad30a37f1abe",
-        "2024-04-03/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "aff8ab9422a234d48c7dd65b752c1443678387f61c22f273f4a723895ab4ab69",
-        "2024-04-03/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "4e183c1baabd75198c870d59357cc1992cbd2184fae08edb36a541774eaa15dc",
-        "2024-04-03/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "aaa22601f3106224ecf35ec67ad0e6481838b6ec4cae506f11c5bbf79e94cb65",
+        "2024-04-24/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "1a17b0a4405856c4429e8e2bad781da781f1ccc989a51228a8c9f227c4756c5a",
+        "2024-04-24/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "945f07dbf503d6761e578f135b53544220bdd56688e5b99c8c0701541af840eb",
+        "2024-04-24/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "eaa40532a3a17f8f472b033d74a0c80a6bf955189303ca0ea3f878f8ac207506",
+        "2024-04-24/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "4a95e405021f93b7a99104e6633a4ea61d8d68c302e02298269a6fa2bdb55955",
+        "2024-04-24/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "a2a00829a6511cfcdb18db6cb533c4b95b1a2b663716116faa32b34e5c90dc1f",
     },
     versions = [
         "1.77.2",
-        "nightly/2024-04-03",
+        "nightly/2024-04-24",
     ],
 )
 
@@ -64,7 +64,7 @@ crate.from_cargo(
 )
 use_repo(crate, "crates")
 
-bazel_dep(name = "protobuf", version = "23.1")
+bazel_dep(name = "protobuf", version = "26.0")
 
 # Local remote execution.
 bazel_dep(name = "local-remote-execution", version = "0.0.0")

flake.nix

@@ -47,7 +47,7 @@
         ...
       }: let
         stable-rust-version = "1.77.2";
-        nightly-rust-version = "2024-04-03";
+        nightly-rust-version = "2024-04-24";
 
         # TODO(aaronmondal): Make musl builds work on Darwin.
         # See: https://github.com/TraceMachina/nativelink/issues/751

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

@@ -111,24 +111,24 @@ cc_toolchain_config(
     coverage_link_flags = ["--coverage"],
     cpu = "k8",
     cxx_builtin_include_directories = [
-        "/nix/store/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/include",
-        "/nix/store/gzxqm8dyfirbysqjhh78ivam62ll0m87-glibc-2.39-5-dev/include",
-        "/nix/store/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/share",
-        "/nix/store/2f8iy8mibi3iiia3hc0n5js7q3qgn507-libcxx-17.0.6-dev/include/c++/v1",
+        "/nix/store/5b4is024ajpfphzx5fvf5wqqy3i3y45r-clang-wrapper-18.1.3/resource-root/include",
+        "/nix/store/ij144ma6vs8acil8r9hgr8xkb1dp9azg-glibc-2.39-5-dev/include",
+        "/nix/store/5b4is024ajpfphzx5fvf5wqqy3i3y45r-clang-wrapper-18.1.3/resource-root/share",
+        "/nix/store/p0siwwr4pfh6d9026ygvagvp43gyck69-libcxx-18.1.3-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/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin",
-        "-B/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin",
+        "-B/nix/store/p8ck07vfxiszzqpcz0p2l0afb6nmlxmx-customClang/bin",
+        "-B/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin",
         "-Wl,-no-as-needed",
         "-Wl,-z,relro,-z,now",
-        "-L/nix/store/q28x84h4npmmwycq44481sir5m9jnv96-libcxx-17.0.6/lib",
-        "-L/nix/store/m5zjncsr1nb8c9wwvbg4d7lhhph94l9a-libunwind-17.0.6/lib",
+        "-L/nix/store/nz81p4pd2f415pay3f2fr2lh5m2ac66m-libcxx-17.0.6/lib",
+        "-L/nix/store/c11zca00dnnh6hwjz04rvvhhgnnvks4m-libunwind-17.0.6/lib",
         "-lc++",
-        "-Wl,-rpath,/nix/store/q28x84h4npmmwycq44481sir5m9jnv96-libcxx-17.0.6/lib,-rpath,/nix/store/m5zjncsr1nb8c9wwvbg4d7lhhph94l9a-libunwind-17.0.6/lib,-rpath,/nix/store/ddwyrxif62r8n6xclvskjyy6szdhvj60-glibc-2.39-5/lib",
+        "-Wl,-rpath,/nix/store/nz81p4pd2f415pay3f2fr2lh5m2ac66m-libcxx-17.0.6/lib,-rpath,/nix/store/c11zca00dnnh6hwjz04rvvhhgnnvks4m-libunwind-17.0.6/lib,-rpath,/nix/store/35pq4hr29c3sl79lgfwgsvd9nwzyp4am-glibc-2.39-5/lib",
     ],
     link_libs = [
         "-Wl,--push-state,-as-needed",
@@ -151,18 +151,18 @@ cc_toolchain_config(
     target_libc = "glibc_2.35",
     target_system_name = "local",
     tool_paths = {
-        "ar": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/ar",
-        "ld": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/ld",
+        "ar": "/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin/ar",
+        "ld": "/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin/ld",
         "llvm-cov": "None",
         "llvm-profdata": "None",
         "cpp": "/usr/bin/cpp",
-        "gcc": "/nix/store/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin/customClang",
-        "dwp": "/nix/store/6jbxa2ar5x6mqx3s67cjrdm8514xw38n-binutils-wrapper-2.41/bin/dwp",
+        "gcc": "/nix/store/p8ck07vfxiszzqpcz0p2l0afb6nmlxmx-customClang/bin/customClang",
+        "dwp": "/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin/dwp",
         "gcov": "None",
-        "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",
+        "nm": "/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin/nm",
+        "objcopy": "/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin/objcopy",
+        "objdump": "/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin/objdump",
+        "strip": "/nix/store/lr2xhk791gy0lfwk4g5954kd8yfqsbsl-binutils-wrapper-2.41/bin/strip",
     },
     toolchain_identifier = "local",
     unfiltered_compile_flags = [

local-remote-execution/generated-cc/cc/builtin_include_directory_paths

@@ -1,11 +1,11 @@
 This file is generated by cc_configure and contains builtin include directories
-that /nix/store/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin/customClang reported. This file is a dependency of every compilation action and
+that /nix/store/p8ck07vfxiszzqpcz0p2l0afb6nmlxmx-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/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/include
-/nix/store/gzxqm8dyfirbysqjhh78ivam62ll0m87-glibc-2.39-5-dev/include
-/nix/store/cxr9ii655p3yadd2c8mcy78ay2kfrwyh-clang-wrapper-17.0.6/resource-root/share
-/nix/store/2f8iy8mibi3iiia3hc0n5js7q3qgn507-libcxx-17.0.6-dev/include/c++/v1
+/nix/store/5b4is024ajpfphzx5fvf5wqqy3i3y45r-clang-wrapper-18.1.3/resource-root/include
+/nix/store/ij144ma6vs8acil8r9hgr8xkb1dp9azg-glibc-2.39-5-dev/include
+/nix/store/5b4is024ajpfphzx5fvf5wqqy3i3y45r-clang-wrapper-18.1.3/resource-root/share
+/nix/store/p0siwwr4pfh6d9026ygvagvp43gyck69-libcxx-18.1.3-dev/include/c++/v1
 /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk

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

@@ -1,4 +1,4 @@
-#!/nix/store/il8bar5wz5mhdqh8a1g42ri0x38xrmd6-bash/bin/bash
+#!/nix/store/m9scpf8xb49vj3x4jcfx5f6xcmjkdd3c-bash/bin/bash
 #
 # Copyright 2015 The Bazel Authors. All rights reserved.
 #
@@ -22,4 +22,4 @@ set -eu
 
 
 # Call the C++ compiler
-/nix/store/3rj0biin6rff6dndvzdjk17vkkskp0w7-customClang/bin/customClang "$@"
+/nix/store/p8ck07vfxiszzqpcz0p2l0afb6nmlxmx-customClang/bin/customClang "$@"