Merge master into staging-next

2021-03-14 12:21:07 +00:00
parent b3148b9731 f7574a5c8f
commit 8c04f70ddd
27 changed files with 154 additions and 57 deletions
@@ -747,7 +747,7 @@ with import "${src.out}/rust-overlay.nix" pkgs pkgs;
 stdenv.mkDerivation {
  name = "rust-env";
  buildInputs = [
-    # Note: to use use stable, just replace `nightly` with `stable`
+    # Note: to use stable, just replace `nightly` with `stable`
    latest.rustChannels.nightly.rust

    # Add some extra dependencies from `pkgs`