Merge pull request #337 from replit/cad/better-nightly-display-version

rust: improve nightly module displayVersion
replit · May 23, 2024 · 65bceed · 65bceed
2 parents cc3b721 + 12a1ba2
commit 65bceed
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/pkgs/modules/rust/default.nix b/pkgs/modules/rust/default.nix
@@ -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;
 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.
   '';