Upgrade toolchains (TraceMachina#1191)

- Bump flake - Regenerate LRE toolchains - Update native-cli pulumi build - Bump nightly Rust and fix exposed issues - Fix a misplaced aarch64-linux system configuration in flake (typo fix, doesn't add support for any new targets)
blakehatch · Jul 26, 2024 · 97135e9 · 97135e9
1 parent 5798761
commit 97135e9
Show file tree

Hide file tree

Showing 21 changed files with 2,853 additions and 2,905 deletions.
diff --git a/.bazelrc b/.bazelrc
@@ -44,7 +44,8 @@ build --aspects=@rules_rust//rust:defs.bzl%rustfmt_aspect
 build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
 
 # TODO(aaronmondal): Extend these flags until we can run with clippy::pedantic.
-build --@rules_rust//:clippy_flags=-Dwarnings,-Dclippy::uninlined_format_args,-Dclippy::manual_string_new
+# TODO(aaronmondal): Fix dependency_on_unit_never_type_fallback.
+build --@rules_rust//:clippy_flags=-Dwarnings,-Adependency_on_unit_never_type_fallback,-Dclippy::uninlined_format_args,-Dclippy::manual_string_new
 build --@rules_rust//:clippy.toml=//:clippy.toml
 
 test --@rules_rust//:rustfmt.toml=//:.rustfmt.toml

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -18,35 +18,36 @@ python.toolchain(
 )
 use_repo(python, python = "python_versions")
 
-bazel_dep(name = "rules_rust", version = "0.47.1")
+bazel_dep(name = "rules_rust", version = "0.48.0")
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(
     edition = "2021",
-    rust_analyzer_version = "nightly/2024-05-10",
-    rustfmt_version = "nightly/2024-05-10",
+    rust_analyzer_version = "nightly/2024-07-24",
+    rustfmt_version = "nightly/2024-07-24",
     sha256s = {
-        "2024-05-10/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "34c251c59c99d68d13144ca00f7dd1af47227640ffdd00c6966342535a6c6f6b",
-        "2024-05-10/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "cf705952dd0f4e8d9f6fd69bb3810370e7d8ac78cb96419a2883eee8f182c7fb",
-        "2024-05-10/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "a96ec1120436493e018df070625e46764987d60e7293533fdbfdbca16967c81a",
-        "2024-05-10/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "bc134e14df374e7dc86fa726de75c7d145bc68be9476af5d395252345e41a45f",
-        "2024-05-10/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "878dacc66ead1a12ebc1c9996d4d4be40b8931b8dd6de55433d872f88399fe7d",
-        "2024-05-10/rustc-nightly-x86_64-apple-darwin.tar.xz": "8832320e438a1702571630e12d73194c964c8d21c8fe621cc8bed4ae0ce97625",
-        "2024-05-10/clippy-nightly-x86_64-apple-darwin.tar.xz": "80657ff2c67fe37469940e5983ec868c566b017bc1620f11a6a65e5f029ac42e",
-        "2024-05-10/cargo-nightly-x86_64-apple-darwin.tar.xz": "7390b4d229d9d3a8108c632939426021c12d63ae2681554386a344dd44c50e83",
-        "2024-05-10/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "b69cd7d16d6fcd78c26a5e78fb9a56fa4116f49d4ece7282253dd9b8fc276b04",
-        "2024-05-10/rust-std-nightly-x86_64-apple-darwin.tar.xz": "0e5f07efa6660c48ceaff776aa4616992a985b5d41247f79304fdaec231e63d2",
-        "2024-05-10/rustc-nightly-aarch64-apple-darwin.tar.xz": "9979984e5f0aa6797ecdc7e414eefe5a0b604b94e8c35e4caa04f9ecfc496e72",
-        "2024-05-10/clippy-nightly-aarch64-apple-darwin.tar.xz": "8915c30cf77cc8a418c42c8a6a8e355b9e3e9ea1278667467af68a779fcf7799",
-        "2024-05-10/cargo-nightly-aarch64-apple-darwin.tar.xz": "12a68a5fec1616d5c7d78cd202b04a12cf21018b688116aed002b2c1b77f54f1",
-        "2024-05-10/rustfmt-nightly-aarch64-apple-darwin.tar.xz": "4055cac34969da2dc652f8070508de73cc03ac578dd6d57e42303dae0a1a9c56",
-        "2024-05-10/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "e28f47ee89e195bde588fb1a8a799ade56264c7dfc676455596814642c3ed9f5",
-        "2024-05-10/rust-std-nightly-aarch64-apple-darwin.tar.xz": "60447211f476992fb3fd53f08ab11966fa6f4aca4afa218787b5f425a49af3dc",
-        "2024-05-10/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "9a2ced2ec03995ef2c0579c7e3205defbcab27e545caad9466c19a01a3751988",
+        "2024-07-24/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "76cdce7fc08e4aed1429675409b2a149ffbb787fb7d185db12a15d2bb65167e5",
+        "2024-07-24/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "d687aac8b1ee766150b5caec5e65e9d5a50d3ec2e87b1f43febf5cef9943dbb7",
+        "2024-07-24/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "b5281d4f15ef66142391ef7b43a1d406c66a5f6ad65e8c89e65cd0fd69e12600",
+        "2024-07-24/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "3c975c51b8420b6a1bcf0405e65364a1592ab2d24a9574008e1d1a899c0c8086",
+        "2024-07-24/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "7a2feb5e82f83f30b994117a562db1af59c1c675fe090a963bd2aecd319e300f",
+        "2024-07-24/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "b317c632f208c4b3d69e356264d5b74602147a2edef014cad340eaffbe0db0e5",
+        "2024-07-24/rustc-nightly-x86_64-apple-darwin.tar.xz": "bb7cf8790bd9ba1612d931485b5dac85d697c60fd3adec2011fd4ca418852bf6",
+        "2024-07-24/clippy-nightly-x86_64-apple-darwin.tar.xz": "c2c30e6b97f3d20ec535f22dd28a934e7e250bad0d465ae936f6bd1c774e9883",
+        "2024-07-24/cargo-nightly-x86_64-apple-darwin.tar.xz": "eb4b98b95bc0c1504a685b31689e9604e194c5d4378f4d2fc0e0f0fcb86757db",
+        "2024-07-24/rustfmt-nightly-x86_64-apple-darwin.tar.xz": "2e51c84d05c3b94754dae9440f8a5ae86ddcd277dad05e179ebbf2f9d301961f",
+        "2024-07-24/llvm-tools-nightly-x86_64-apple-darwin.tar.xz": "228d61577183ab5a839e659e234fffe7aea5c8022f7a361efa738b166e50ade6",
+        "2024-07-24/rust-std-nightly-x86_64-apple-darwin.tar.xz": "cec2e9651d9ccd9f7474d96ffaabcad63b597f66785f378b119ee094503e9a20",
+        "2024-07-24/rustc-nightly-aarch64-apple-darwin.tar.xz": "3a2e89e80c6ff03aa6d1ea7dd520032dd74a632ac8d4344dfac48a152ac8d5fa",
+        "2024-07-24/clippy-nightly-aarch64-apple-darwin.tar.xz": "5528091b3af1b4d50288eced91eac1f15efc33c964b333546039a76f6c7a92f9",
+        "2024-07-24/cargo-nightly-aarch64-apple-darwin.tar.xz": "34a7fe290172416161f35707567b5b5a5e563be89229f30eac8b522df1c7a6a0",
+        "2024-07-24/rustfmt-nightly-aarch64-apple-darwin.tar.xz": "d42491f55423d24073df0d514d9df11d9f32d2c513bd7a4a1cf41e109c30e695",
+        "2024-07-24/llvm-tools-nightly-aarch64-apple-darwin.tar.xz": "3fdefeb279f7219eb814f29680dc00a207dcb4e823574c5c26b2fe44c0dbefae",
+        "2024-07-24/rust-std-nightly-aarch64-apple-darwin.tar.xz": "ea8afa34a2010b7ed371ad260af837cf89d02fb24783ed9cee75685781247fde",
     },
     versions = [
         "1.79.0",
-        "nightly/2024-05-10",
+        "nightly/2024-07-24",
     ],
 )
 

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -12,7 +12,6 @@
     rust-overlay = {
       url = "github:oxalica/rust-overlay";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
     };
     crane = {
       url = "github:ipetkov/crane";
@@ -37,7 +36,7 @@
       systems = [
         "x86_64-linux"
         "x86_64-darwin"
-        "apps.aarch64-linux.native"
+        "aarch64-linux"
         "aarch64-darwin"
       ];
       imports = [
@@ -51,7 +50,7 @@
         ...
       }: let
         stable-rust-version = "1.79.0";
-        nightly-rust-version = "2024-05-10";
+        nightly-rust-version = "2024-07-24";
 
         # TODO(aaronmondal): Make musl builds work on Darwin.
         # See: https://github.com/TraceMachina/nativelink/issues/751
@@ -143,7 +142,7 @@
 
         generate-toolchains = import ./tools/generate-toolchains.nix {inherit pkgs;};
 
-        native-cli = import ./native-cli/default.nix {inherit pkgs;};
+        native-cli = pkgs.callPackage ./native-cli/default.nix {};
 
         docs = pkgs.callPackage ./tools/docs.nix {rust = stable-rust.default;};
 
@@ -209,7 +208,6 @@
             patches = [
               ./tools/nixpkgs_link_libunwind_and_libcxx.diff
               ./tools/nixpkgs_disable_ratehammering_pulumi_tests.diff
-              ./tools/nixpkgs_trivy_0_52_2.diff
               ./tools/nixpkgs_playwright.diff
             ];
           };
@@ -283,7 +281,8 @@
               pkgs.docker-client
               pkgs.kind
               pkgs.tektoncd-cli
-              (pkgs.pulumi.withPackages (ps: [ps.pulumi-language-go]))
+              pkgs.pulumi
+              pkgs.pulumiPackages.pulumi-language-go
               pkgs.go
               pkgs.kustomize
               pkgs.nodePackages.pnpm

diff --git a/local-remote-execution/generated-cc/cc/BUILD b/local-remote-execution/generated-cc/cc/BUILD
@@ -111,18 +111,18 @@ cc_toolchain_config(
     coverage_link_flags = ["--coverage"],
     cpu = "k8",
     cxx_builtin_include_directories = [
-        "/nix/store/n4ilv8fpd7d2dasf4f3s7j3p05rv0g36-clang-wrapper-18.1.7/resource-root/include",
-        "/nix/store/fwh4fxd747m0py3ib3s5abamia9nrf90-glibc-2.39-52-dev/include",
-        "/nix/store/n4ilv8fpd7d2dasf4f3s7j3p05rv0g36-clang-wrapper-18.1.7/resource-root/share",
-        "/nix/store/kdjvg6i1k08fdvmk1lpmifhg9nd9c6qc-libcxx-18.1.7-dev/include/c++/v1",
+        "/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/include",
+        "/nix/store/09lv9r3dx6ql0lzpdv8w2b1r6b358481-glibc-2.39-52-dev/include",
+        "/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/share",
+        "/nix/store/kacxs7yfq39sl3sqf3gzksipqhyg3gcp-libcxx-18.1.8-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 = [
-        "-fuse-ld=/nix/store/n4ilv8fpd7d2dasf4f3s7j3p05rv0g36-clang-wrapper-18.1.7/bin/ld.mold",
-        "-B/nix/store/w10ln3v5kxdi4v3z5pr77iksz7fz2ivk-customClang/bin",
+        "-fuse-ld=/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/bin/ld.mold",
+        "-B/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin",
         "-Wl,-no-as-needed",
         "-Wl,-z,relro,-z,now",
     ],
@@ -147,18 +147,18 @@ cc_toolchain_config(
     target_libc = "glibc_2.35",
     target_system_name = "local",
     tool_paths = {
-        "ar": "/nix/store/5bskz9jc2csyv2j7n9bd3zbhq1s3zf2b-binutils-wrapper-2.41/bin/ar",
-        "ld": "/nix/store/5bskz9jc2csyv2j7n9bd3zbhq1s3zf2b-binutils-wrapper-2.41/bin/ld",
+        "ar": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/ar",
+        "ld": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/ld",
         "llvm-cov": "None",
         "llvm-profdata": "None",
         "cpp": "/usr/bin/cpp",
-        "gcc": "/nix/store/w10ln3v5kxdi4v3z5pr77iksz7fz2ivk-customClang/bin/customClang",
-        "dwp": "/nix/store/5bskz9jc2csyv2j7n9bd3zbhq1s3zf2b-binutils-wrapper-2.41/bin/dwp",
+        "gcc": "/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang",
+        "dwp": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/dwp",
         "gcov": "None",
-        "nm": "/nix/store/5bskz9jc2csyv2j7n9bd3zbhq1s3zf2b-binutils-wrapper-2.41/bin/nm",
-        "objcopy": "/nix/store/5bskz9jc2csyv2j7n9bd3zbhq1s3zf2b-binutils-wrapper-2.41/bin/objcopy",
-        "objdump": "/nix/store/5bskz9jc2csyv2j7n9bd3zbhq1s3zf2b-binutils-wrapper-2.41/bin/objdump",
-        "strip": "/nix/store/5bskz9jc2csyv2j7n9bd3zbhq1s3zf2b-binutils-wrapper-2.41/bin/strip",
+        "nm": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/nm",
+        "objcopy": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/objcopy",
+        "objdump": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/objdump",
+        "strip": "/nix/store/l1vv6ddnhfq6gnnqr875rwajkmhz5iw3-binutils-wrapper-2.42/bin/strip",
     },
     toolchain_identifier = "local",
     unfiltered_compile_flags = [

diff --git a/local-remote-execution/generated-cc/cc/builtin_include_directory_paths b/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/w10ln3v5kxdi4v3z5pr77iksz7fz2ivk-customClang/bin/customClang reported. This file is a dependency of every compilation action and
+that /nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-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/n4ilv8fpd7d2dasf4f3s7j3p05rv0g36-clang-wrapper-18.1.7/resource-root/include
-/nix/store/fwh4fxd747m0py3ib3s5abamia9nrf90-glibc-2.39-52-dev/include
-/nix/store/n4ilv8fpd7d2dasf4f3s7j3p05rv0g36-clang-wrapper-18.1.7/resource-root/share
-/nix/store/kdjvg6i1k08fdvmk1lpmifhg9nd9c6qc-libcxx-18.1.7-dev/include/c++/v1
+/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/include
+/nix/store/09lv9r3dx6ql0lzpdv8w2b1r6b358481-glibc-2.39-52-dev/include
+/nix/store/7kwf0r6lhqqrvj7r538m7qr23ygjfk59-clang-wrapper-18.1.8/resource-root/share
+/nix/store/kacxs7yfq39sl3sqf3gzksipqhyg3gcp-libcxx-18.1.8-dev/include/c++/v1
 /Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
diff --git a/local-remote-execution/generated-cc/cc/cc_wrapper.sh b/local-remote-execution/generated-cc/cc/cc_wrapper.sh
@@ -1,4 +1,4 @@
-#!/nix/store/6rj1j8s1gcnpic31s1i5s086x6m8aslm-bash/bin/bash
+#!/nix/store/f6m3rfxfrv73a5g9kz0gpcsj9qb0905a-bash/bin/bash
 #
 # Copyright 2015 The Bazel Authors. All rights reserved.
 #
@@ -22,4 +22,4 @@ set -eu
 
 
 # Call the C++ compiler
-/nix/store/w10ln3v5kxdi4v3z5pr77iksz7fz2ivk-customClang/bin/customClang "$@"
+/nix/store/wcjlw1vhvpb8rzri8dqapfldv14lvzvk-customClang/bin/customClang "$@"