Skip to content

nix: update rust-toolchain in shell #1007

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.

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

Merged
merged 3 commits into from
Nov 24, 2023
Merged

Conversation

phip1611
Copy link
Member

This changes the rust-toolchain from rustup to rust-bin.fromRustupToolchainFile coming from https://github.com/oxalica/rust-overlay. This supersedes #994.

TL;DR: nix-shell --pure --run "rustc --version" is now 1.73.

Checklist

  • Sensible git history (for example, squash "typo" or "fix" commits). See the Rewriting History guide for help.
  • Update the changelog (if necessary)

@phip1611 phip1611 changed the title nix: update rust-toolchain nix: update rust-toolchain in shell Nov 14, 2023
@phip1611
Copy link
Member Author

Please leave some comments @RaitoBezarius - what do you think?

@phip1611 phip1611 self-assigned this Nov 14, 2023
@@ -1,2 +1,5 @@
[toolchain]
channel = "stable"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is fine: any concerns @nicholasbishop ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine to me, but just for my own edification, why is this part of the change necessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So that rust-bin.fromRustupToolchainFile ../rust-toolchain.toml can pick the right toolchain for Nix.

@phip1611 phip1611 force-pushed the nix-shell branch 2 times, most recently from 82fcc92 to e94629d Compare November 15, 2023 13:40
Now, a nix-shell always has the latest rust stable version, compliant to our
rust-toolchain.toml file.
"+stable" is no longer available as the rustup proxy binary is no longer used.
@phip1611 phip1611 enabled auto-merge November 24, 2023 09:55
@phip1611 phip1611 added this pull request to the merge queue Nov 24, 2023
Merged via the queue into rust-osdev:main with commit 4d9fdaf Nov 24, 2023
@phip1611 phip1611 deleted the nix-shell branch July 14, 2024 06:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants