Skip to content

Commit 9aed8d3

Browse files
palfreypalfrey
committed
2025-11-11 flake update
1 parent f679946 commit 9aed8d3

File tree

14 files changed

+143
-133
lines changed

14 files changed

+143
-133
lines changed

‎.github/workflows/lre.yaml‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
11
# ---
2-
# name: Local Remote Execution
2+
name: Local Remote Execution
33

4-
# on:
5-
# push:
6-
# branches: [main]
7-
# paths-ignore:
8-
# - '.github/styles/**'
9-
# - 'web/**'
10-
# pull_request:
11-
# branches: [main]
12-
# paths-ignore:
13-
# - '.github/styles/**'
14-
# - 'web/**'
4+
on:
5+
push:
6+
branches: [main]
7+
paths-ignore:
8+
- '.github/styles/**'
9+
- 'web/**'
10+
pull_request:
11+
branches: [main]
12+
paths-ignore:
13+
- '.github/styles/**'
14+
- 'web/**'
1515

16-
# permissions: read-all
16+
permissions: read-all
1717

18-
# concurrency:
19-
# group: ${{ github.workflow }}-${{ github.ref }}
20-
# cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.ref }}
20+
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
2121

22-
# jobs:
23-
# local:
24-
# strategy:
25-
# fail-fast: false
26-
# matrix:
27-
# os: [ubuntu-24.04, macos-15]
28-
# toolchain: [lre-cc, lre-rs]
29-
# exclude:
30-
# - os: macos-15
31-
# toolchain: lre-cc
32-
# name: Local / ${{ matrix.toolchain }} / ${{ matrix.os }}
33-
# runs-on: ${{ matrix.os }}
34-
# timeout-minutes: 45
35-
# steps:
36-
# - name: Checkout
37-
# uses: >- # v4.2.2
38-
# actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
22+
jobs:
23+
local:
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
os: [ubuntu-24.04, macos-15]
28+
toolchain: [lre-cc, lre-rs]
29+
exclude:
30+
- os: macos-15
31+
toolchain: lre-cc
32+
name: Local / ${{ matrix.toolchain }} / ${{ matrix.os }}
33+
runs-on: ${{ matrix.os }}
34+
timeout-minutes: 45
35+
steps:
36+
- name: Checkout
37+
uses: >- # v4.2.2
38+
actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
3939
40-
# - name: Prepare Worker
41-
# uses: ./.github/actions/prepare-nix
40+
- name: Prepare Worker
41+
uses: ./.github/actions/prepare-nix
4242

43-
# - name: Build example with ${{ matrix.toolchain }} toolchain
44-
# env:
45-
# TOOLCHAIN: ${{ matrix.toolchain }}
46-
# run: >
47-
# nix develop --impure --command
48-
# bash -c "bazel run \
49-
# --verbose_failures \
50-
# @local-remote-execution//examples:${TOOLCHAIN}"
43+
- name: Build example with ${{ matrix.toolchain }} toolchain
44+
env:
45+
TOOLCHAIN: ${{ matrix.toolchain }}
46+
run: >
47+
nix develop --impure --command
48+
bash -c "bazel run \
49+
--verbose_failures \
50+
@local-remote-execution//examples:${TOOLCHAIN}"
5151
5252
# remote:
5353
# strategy:

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ resolver = "2"
99
[package]
1010
edition = "2024"
1111
name = "nativelink"
12-
rust-version = "1.87.0"
12+
rust-version = "1.89.0"
1313
version = "0.7.5"
1414

1515
[profile.release]

‎MODULE.bazel‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -75,31 +75,31 @@ rust.toolchain(
7575
edition = "2024",
7676

7777
# These should always follow the versions from LRE.
78-
rust_analyzer_version = "nightly/2025-05-21",
79-
rustfmt_version = "nightly/2025-05-21",
78+
rust_analyzer_version = "nightly/2025-11-10",
79+
rustfmt_version = "nightly/2025-11-10",
8080
sha256s = {
81-
"2025-05-21/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "e866f249dfbdf10a68b7191c025257591e8a5aa2fede1663b34c88a4f4bb8a74",
82-
"2025-05-21/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "0a312d722a94e3b9e1f7871d9a9af01d410917c2406dbf91d014c06fe79540fb",
83-
"2025-05-21/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "eee28e99ac24c27f3de969915e808c0645ee099b136e5547681110607d09d050",
84-
"2025-05-21/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "0985b6a8befea11c3f1465faac0adc8193a93512ede2fbe8afd3e6e84dd507e8",
85-
"2025-05-21/rustc-nightly-aarch64-apple-darwin.tar.xz": "f2c390199913eed60e2e0045afe96aa302e79977916deabc738dc39f2e16dc0d",
86-
"2025-05-21/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "ad97dbb43664f7dab1a32c4b22ee08ba40306e80972cb5583d7c16f2bf0a36df",
87-
"2025-05-21/rustfmt-nightly-aarch64-apple-darwin.tar.xz": "1409e65606d2db4ae6792ab9b075bf10986a0b6665dc54df575ce66a41efccdc",
88-
"2025-05-21/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "41ef09602146fe9ee9f2cdcea4341510551a80dcbdb55cb231b6b0e718a03eab",
89-
"cargo-1.87.0-aarch64-apple-darwin.tar.xz": "f8d6f554e5ed081de5c3fd23cf2f30f4012013e95fb7a5458a50d8215651fb88",
90-
"cargo-1.87.0-x86_64-unknown-linux-gnu.tar.xz": "469d5dc479835adadd728bc3587f8abf1941b3dd71f9865abd3e0783ae662555",
91-
"clippy-1.87.0-aarch64-apple-darwin.tar.xz": "eeadac2cc415890d952510bd32110da8ea14a710e997ae696212294b4401740f",
92-
"clippy-1.87.0-x86_64-unknown-linux-gnu.tar.xz": "9d440eef6811112a000acf96a062df7bcbc013fa4f8e00a7f9a4f57ef90637a1",
93-
"llvm-tools-1.87.0-aarch64-apple-darwin.tar.xz": "7efc6357a4422ca648ce027cc4c8bd7c36676bc38b1a82c17ccb2ad6dcd5d7a5",
94-
"llvm-tools-1.87.0-x86_64-unknown-linux-gnu.tar.xz": "872fdd4b3b8f6bcb01d20aae02cdd7848472386c9ba54c641d63ff82246ae935",
95-
"rust-std-1.87.0-aarch64-apple-darwin.tar.xz": "6547322b317f18b73695724ff60a7860457df1a646b4a79f89a70a13d0747375",
96-
"rust-std-1.87.0-x86_64-unknown-linux-gnu.tar.xz": "1b57253bd32b8b292c965b3a2d992a266763158494cab8555584c09360b90f77",
97-
"rustc-1.87.0-aarch64-apple-darwin.tar.xz": "175800bc89cccd8f8ee2f3a4d07bdf98c163030fd5d3dc6d5b23cf4dd0a2a4c3",
98-
"rustc-1.87.0-x86_64-unknown-linux-gnu.tar.xz": "e8395c5c5756253b76107055e093ffbc4431af7b30aeebe72ce2684b9cb53973",
81+
"2025-11-10/cargo-nightly-x86_64-unknown-linux-gnu.tar.xz": "f866f249dfbdf10a68b7191c025257591e8a5aa2fede1663b34c88a4f4bb8a74",
82+
"2025-11-10/clippy-nightly-x86_64-unknown-linux-gnu.tar.xz": "1a312d722a94e3b9e1f7871d9a9af01d410917c2406dbf91d014c06fe79540fb",
83+
"2025-11-10/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz": "fee28e99ac24c27f3de969915e808c0645ee099b136e5547681110607d09d050",
84+
"2025-11-10/rust-std-nightly-x86_64-unknown-linux-gnu.tar.xz": "1985b6a8befea11c3f1465faac0adc8193a93512ede2fbe8afd3e6e84dd507e8",
85+
"2025-11-10/rustc-nightly-aarch64-apple-darwin.tar.xz": "e2c390199913eed60e2e0045afe96aa302e79977916deabc738dc39f2e16dc0d",
86+
"2025-11-10/rustc-nightly-x86_64-unknown-linux-gnu.tar.xz": "c6b8e554d5c61b334188085a549f7dc67105e69735cdc32e9efd037a91bca65b",
87+
"2025-11-10/rustfmt-nightly-aarch64-apple-darwin.tar.xz": "2409e65606d2db4ae6792ab9b075bf10986a0b6665dc54df575ce66a41efccdc",
88+
"2025-11-10/rustfmt-nightly-x86_64-unknown-linux-gnu.tar.xz": "16f87f73093a0f00b1dd352ce905fa3843746f754bc2c5251379aeefb096ac29",
89+
"cargo-1.89.0-aarch64-apple-darwin.tar.xz": "d8d6f554e5ed081de5c3fd23cf2f30f4012013e95fb7a5458a50d8215651fb88",
90+
"cargo-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "99fc10be2aeedf2c23a484f217bfa76458494495a0eee33e280d3616bb08282d",
91+
"clippy-1.89.0-aarch64-apple-darwin.tar.xz": "feadac2cc415890d952510bd32110da8ea14a710e997ae696212294b4401740f",
92+
"clippy-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "c6c362c6cd74567022e9ba0c16f6676f8c2b73d955adcf1f6f4c51cf15e57ce8",
93+
"llvm-tools-1.89.0-aarch64-apple-darwin.tar.xz": "88fc6357a4422ca648ce027cc4c8bd7c36676bc38b1a82c17ccb2ad6dcd5d7a5",
94+
"llvm-tools-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "bb0ced899fd1ac628f26e375adabc970b415c516ec82fb7cf9ac3c63cb4d0fee",
95+
"rust-std-1.89.0-aarch64-apple-darwin.tar.xz": "5547322b317f18b73695724ff60a7860457df1a646b4a79f89a70a13d0747375",
96+
"rust-std-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "2719470dcd78b3f97d78b978c8f85a1a58d84ff11b62558294621c01bca34d49",
97+
"rustc-1.89.0-aarch64-apple-darwin.tar.xz": "075800bc89cccd8f8ee2f3a4d07bdf98c163030fd5d3dc6d5b23cf4dd0a2a4c3",
98+
"rustc-1.89.0-x86_64-unknown-linux-gnu.tar.xz": "b42c254e1349df86bd40bc28fdf386172a1a46f2eeabe3c7a08a75cf1fb60e27",
9999
},
100100
versions = [
101-
"1.87.0",
102-
"nightly/2025-05-21",
101+
"1.89.0",
102+
"nightly/2025-11-10",
103103
],
104104
)
105105
use_repo(rust, "rust_toolchains")

‎clippy.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ disallowed-methods = [
1414
{ path = "tokio::task::spawn_blocking", reason = "use `nativelink-util::task::spawn_blocking` instead" },
1515
{ path = "tokio::task::spawn_local", reason = "use one of the `nativelink-util::task` functions instead" },
1616
]
17-
msrv = "1.87.0"
17+
msrv = "1.89.0"

‎flake.lock‎

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

‎flake.nix‎

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
linkerPath =
119119
if isLinuxBuild && isLinuxTarget
120120
then "${pkgs.mold}/bin/ld.mold"
121-
else "${pkgs.llvmPackages_20.lld}/bin/ld.lld";
121+
else "${pkgs.llvmPackages.lld}/bin/ld.lld";
122122

123123
linkerEnvVar = "CARGO_TARGET_${pkgs.lib.toUpper (pkgs.lib.replaceStrings ["-"] ["_"] targetArch)}_LINKER";
124124
in
@@ -132,17 +132,17 @@
132132
buildInputs =
133133
[p.cacert]
134134
++ pkgs.lib.optionals p.stdenv.targetPlatform.isDarwin [
135-
p.darwin.apple_sdk.frameworks.Security
135+
p.darwin.apple-sdk.frameworks.Security
136136
p.libiconv
137137
];
138138
nativeBuildInputs =
139139
(
140140
if isLinuxBuild
141141
then [pkgs.mold]
142-
else [pkgs.llvmPackages_20.lld]
142+
else [pkgs.llvmPackages.lld]
143143
)
144144
++ pkgs.lib.optionals p.stdenv.targetPlatform.isDarwin [
145-
p.darwin.apple_sdk.frameworks.Security
145+
p.darwin.apple-sdk.frameworks.Security
146146
p.libiconv
147147
];
148148
CARGO_BUILD_TARGET = targetArch;
@@ -367,9 +367,9 @@
367367
nativelink-worker-buck2-toolchain = buck2-toolchain;
368368
image = nativelink-image;
369369

370-
inherit (pkgs) buildstream buildbox buck2 mongodb wait4x bazelisk;
370+
inherit (pkgs) buildstream buck2 mongodb wait4x bazelisk;
371371
buildstream-with-nativelink-test = pkgs.callPackage integration_tests/buildstream/buildstream-with-nativelink-test.nix {
372-
inherit nativelink buildstream buildbox;
372+
inherit nativelink buildstream;
373373
};
374374
mongo-with-nativelink-test = pkgs.callPackage integration_tests/mongo/mongo-with-nativelink-test.nix {
375375
inherit nativelink mongodb wait4x bazelisk;
@@ -458,6 +458,21 @@
458458
unset TMPDIR TMP
459459
exec ${pkgs.bazelisk}/bin/bazelisk "$@"
460460
'';
461+
462+
# FIXME(palfrey): workaround for https://github.com/NixOS/nixpkgs/issues/456842
463+
go_1_25_3 = pkgs.go_1_25.overrideAttrs {
464+
version = "1.25.3";
465+
src = pkgs.fetchurl {
466+
url = "https://go.dev/dl/go1.25.3.src.tar.gz";
467+
hash = "sha256-qBpLpZPQAV4QxR4mfeP/B8eskU38oDfZUX0ClRcJd5U=";
468+
};
469+
};
470+
buildGo1253Module = pkgs.buildGoModule.override {
471+
go = go_1_25_3;
472+
};
473+
cosign = pkgs.cosign.override {
474+
buildGoModule = buildGo1253Module;
475+
};
461476
in
462477
[
463478
# Development tooling
@@ -477,7 +492,7 @@
477492
pkgs.google-cloud-sdk
478493
pkgs.skopeo
479494
pkgs.dive
480-
pkgs.cosign
495+
cosign
481496
pkgs.kubectl
482497
pkgs.kubernetes-helm
483498
pkgs.cilium-cli
@@ -511,8 +526,8 @@
511526
pkgs.nativelink-tools.create-local-image
512527
]
513528
++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
514-
pkgs.darwin.apple_sdk.frameworks.CoreFoundation
515-
pkgs.darwin.apple_sdk.frameworks.Security
529+
pkgs.darwin.apple-sdk.frameworks.CoreFoundation
530+
pkgs.darwin.apple-sdk.frameworks.Security
516531
pkgs.libiconv
517532
]
518533
++ pkgs.lib.optionals (pkgs.stdenv.system != "x86_64-darwin") [

‎integration_tests/buildstream/buildstream-with-nativelink-test.nix‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{
22
nativelink,
33
buildstream,
4-
buildbox,
54
writeShellScriptBin,
65
}:
76
writeShellScriptBin "buildstream-with-nativelink-test" ''
@@ -15,8 +14,7 @@ writeShellScriptBin "buildstream-with-nativelink-test" ''
1514
1615
${nativelink}/bin/nativelink -- integration_tests/buildstream/buildstream_cas.json5 | tee -i integration_tests/buildstream/nativelink.log &
1716
18-
# TODO(palfrey): PATH is workaround for https://github.com/NixOS/nixpkgs/issues/248000#issuecomment-2934704963
19-
bst_output=$(cd integration_tests/buildstream && PATH=${buildbox}/bin:$PATH ${buildstream}/bin/bst -c buildstream.conf build hello.bst 2>&1 | tee -i buildstream.log)
17+
bst_output=$(cd integration_tests/buildstream && ${buildstream}/bin/bst -c buildstream.conf build hello.bst 2>&1 | tee -i buildstream.log)
2018
2119
case $bst_output in
2220
*"SUCCESS Build"* )

‎kubernetes/resources/flux-dev/flux-kustomizations.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ spec:
3030
prune: true
3131
force: true
3232
retryInterval: 20s
33-
# Don't set targetNamespace for this one as OLM mangages this itself.
33+
# Don't set targetNamespace for this one as OLM manages this itself.
3434
wait: true
3535
sourceRef:
3636
kind: GitRepository

‎local-remote-execution/overlays/default.nix‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
lre =
1111
{
1212
stdenv = final.callPackage ./stdenv.nix {
13-
llvmPackages = final.llvmPackages_20;
13+
inherit (final) llvmPackages;
1414
targetPackages = final;
1515
};
1616

‎local-remote-execution/overlays/rust-config.nix‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
let
2-
defaultStableVersion = "1.87.0";
3-
defaultNightlyVersion = "2025-05-21";
2+
defaultStableVersion = "1.89.0";
3+
defaultNightlyVersion = "2025-11-10";
44
in rec {
55
# This map translates execution platforms to sensible targets that can
66
# be built on such a platform. For instance, an x86_64-linux execution

0 commit comments

Comments
 (0)