From 3f5120e6be56e812f4a4e63b3e86264095cd1c41 Mon Sep 17 00:00:00 2001 From: oxalica Date: Fri, 30 Apr 2021 04:09:36 +0800 Subject: [PATCH] Tweak docs --- README.md | 4 +--- rust-overlay.nix | 15 +++++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 5c48f454ad4..691a7f7207d 100644 --- a/README.md +++ b/README.md @@ -153,7 +153,6 @@ Running `nix develop` will create a shell with the default nightly Rust toolchai stable = { # The latest stable toolchain. latest = { - # [Experimental] # Profiles, predefined component sets. # See: https://rust-lang.github.io/rustup/concepts/profiles.html minimal = «derivation»; # Only `cargo`, `rustc` and `rust-std`. @@ -211,8 +210,7 @@ Some examples (assume `nixpkgs` had the overlay applied): - Latest stable/beta/nightly rust with almost all components (provided the same as `mozilla-overlay`): `nixpkgs.rust-bin.{stable,beta,nightly}.latest.rust` -- *\[Experimental\]* - Latest stable/beta/nightly rust with `default` or `minimal` profile (provided the same as default behavior of `rustup install`). +- Latest stable/beta/nightly rust with `default` or `minimal` profile (provided the same as default behavior of `rustup install`). `nixpkgs.rust-bin.{stable,beta,nightly}.latest.{default,minimal}` Note: `default` profile on `nightly` may not always be available due to absense of required components. diff --git a/rust-overlay.nix b/rust-overlay.nix index 2ce2b210867..e3403ab3c9e 100644 --- a/rust-overlay.nix +++ b/rust-overlay.nix @@ -559,22 +559,21 @@ let in { # For each channel: - # rust-bin.stable.latest.cargo - # rust-bin.stable.latest.rust # Aggregate all others. (recommended) + # rust-bin.stable.latest.{minimal,default,complete} # Profiles. + # rust-bin.stable.latest.rust # Pre-aggregate from upstream. + # rust-bin.stable.latest.cargo # Components... # rust-bin.stable.latest.rustc - # rust-bin.stable.latest.rust-analysis # rust-bin.stable.latest.rust-docs - # rust-bin.stable.latest.rust-src - # rust-bin.stable.latest.rust-std + # ... # # For a specific version of stable: - # rust-bin.stable."1.47.0".rust + # rust-bin.stable."1.47.0".default # # For a specific date of beta: - # rust-bin.beta."2021-01-01".rust + # rust-bin.beta."2021-01-01".default # # For a specific date of nightly: - # rust-bin.nightly."2020-01-01".rust + # rust-bin.nightly."2020-01-01".default rust-bin = with builtins; (super.rust-bin or {}) // mapAttrs (channel: mapAttrs (version: toolchainFromManifest)) super.rust-bin.manifests //