diff options
Diffstat (limited to 'pkgs/development/tools/rust/rust-analyzer/generic.nix')
| -rw-r--r-- | pkgs/development/tools/rust/rust-analyzer/generic.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/development/tools/rust/rust-analyzer/generic.nix b/pkgs/development/tools/rust/rust-analyzer/generic.nix index 20fb38b66b70..b25f74b90f66 100644 --- a/pkgs/development/tools/rust/rust-analyzer/generic.nix +++ b/pkgs/development/tools/rust/rust-analyzer/generic.nix @@ -16,15 +16,16 @@ rustPlatform.buildRustPackage { inherit rev sha256; }; - # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 + # FIXME: Temporary fixes for our rust 1.45.0 cargoPatches = [ - ./downgrade-smol_str.patch + ./downgrade-smol_str.patch # Requires rustc 1.46.0 ]; patches = [ - # FIXME: Temporary fix for our rust 1.45.0 since rust-analyzer requires 1.46.0 - ./no-loop-in-const-fn.patch - ./no-option-zip.patch + ./no-track_env_var.patch # Requires rustc 1.47.0 + ./no-match-unsizing-in-const-fn.patch # Requires rustc 1.46.0 + ./no-loop-in-const-fn.patch # Requires rustc 1.46.0 + ./no-option-zip.patch # Requires rustc 1.46.0 ]; buildAndTestSubdir = "crates/rust-analyzer"; |