Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
worktrunk-bot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions .claude/skills/running-tend/SKILL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.

## README Date Check

Expand Down
7 changes: 5 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading