Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

chore(nix): read Rust channel from rust-toolchain.toml (#2188)

Worktrunk Bot1cff0968bda8
diff --git a/.claude/skills/running-tend/SKILL.md b/.claude/skills/running-tend/SKILL.md
index 4da59dd40..335ad4a81 100644
--- a/.claude/skills/running-tend/SKILL.md
+++ b/.claude/skills/running-tend/SKILL.md
@@ -128,10 +128,18 @@ Files to update:
| `Cargo.toml` | `rust-version` | `"1.93"` |
| `tests/helpers/wt-perf/Cargo.toml` | `rust-version` | `"1.93"` |
| `rust-toolchain.toml` | `channel` | `"1.93.0"` |
-| `flake.nix` | MSRV comment | `1.93` |
-After bumping, run the full test suite (`cargo run -- hook pre-merge --yes`)
-and verify `cargo msrv verify` passes.
+`flake.nix` reads the channel from `rust-toolchain.toml`, so no separate bump
+is needed. After updating the toolchain, refresh `flake.lock` so the locked
+`rust-overlay` revision knows about the new version:
+
+```bash
+nix flake update
+```
+
+Commit `flake.lock` alongside the other toolchain changes. After bumping, run
+the full test suite (`cargo run -- hook pre-merge --yes`) and verify
+`cargo msrv verify` passes.
## Weekly Maintenance: Statusline Cache-Check
diff --git a/flake.nix b/flake.nix
index f237986cc..3b02cb2f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -27,8 +27,11 @@
inherit system overlays;
};
- # Use latest stable Rust (must meet MSRV of 1.93)
- rustToolchain = pkgs.rust-bin.stable.latest.default.override {
+ # Pin to the channel declared in rust-toolchain.toml so rustup and Nix
+ # stay on the same version. Extensions are dev-shell-only, so we keep
+ # them here rather than in rust-toolchain.toml (which CI also reads).
+ toolchainChannel = (builtins.fromTOML (builtins.readFile ./rust-toolchain.toml)).toolchain.channel;
+ rustToolchain = pkgs.rust-bin.stable.${toolchainChannel}.default.override {
extensions = [
"rust-src"
"rust-analyzer"