-
Notifications
You must be signed in to change notification settings - Fork 396
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
chore: bump nix rust to match rust-toolchain.toml
#867
Conversation
third-party/nix/release.nix
Outdated
@@ -3,7 +3,7 @@ | |||
|
|||
let | |||
pkgs = import <nixpkgs> { overlays = [ moz_overlay ]; }; | |||
channel = pkgs.rustChannelOf { date = "2022-08-05"; channel = "nightly"; }; | |||
channel = pkgs.rustChannelOf { date = "2023-01-10"; channel = "nightly"; }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe if you just put it like this:
pkgs.rustChannelOf { };
it will pick up the one defined in the toolchain file.
Not sure if there's a nicer way to define this - perhaps removing channel
and rust-nightly
altogether?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe this will help?
https://github.com/mozilla/nixpkgs-mozilla#using-in-nix-expressions
(nixpkgs.rustChannelOf { rustToolchain = ./rust-toolchain.toml; }).rust
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If it works, sure.
Let's just avoid having to maintain this file.
(we don't use nix
in CI anymore)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@ashutoshvarma can you apply your suggested change? 🙂
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, that didn't work unfortunately, mozilla/nixpkgs-mozilla#287
I've switched moz-overlay with rust-overlay and it works!
@ashutoshvarma please sign all the commits & force push the new branch. I'd suggest having auto sign for all commits you do. |
52ed5c9
to
851c46c
Compare
@Dinonard commits signed! |
Great, feel free to merge! 🙂 |
Pull Request Summary
Bumping Rust channel in Nix env.
When using Nix to build runtime with command
nix-shell -I nixpkgs=channel:nixos-21.05 third-party/nix/shell.nix --run "cargo build --release"
was failing due to old rustc version (although it should pick the correct one from rust-toolchain file). Builds fine after bumping rust in nix env.Check list