Skip to content
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

Jump to bottom

rust: improve nightly module displayVersion #337

Merged
merged 2 commits into from
May 23, 2024
Merged

rust: improve nightly module displayVersion #337

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d082d77
rust: improve nightly module displayVersion
cdmistman May 23, 2024
12a1ba2
Merge branch 'main' into cad/better-nightly-display-version
cdmistman May 23, 2024
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
5 changes: 4 additions & 1 deletion pkgs/modules/rust/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,14 @@ let
pkgs.fenix.targets.wasm32-wasi.${fenix-channel-name}.rust-std
pkgs.fenix.targets.wasm32-unknown-unknown.${fenix-channel-name}.rust-std
];

# TODO: fenix doesn't give the rustc stable version :(
displayVersion = if fenix-channel-name == "stable" then "stable" else channel.cargo.version;
airportyh marked this conversation as resolved.
Show resolved Hide resolved
in
{
id = "rust-${rust-channel-name}";
name = "Rust Tools (${rust-channel-name})";
displayVersion = rust-channel-name;
inherit displayVersion;
description = ''
Rust development tools. Includes Rust compiler, Cargo, Rust analyzer.
'';
Expand Down
Loading