diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 41a813ec105a..cb6d8305b93f 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -12,20 +12,20 @@ rustPlatform.buildRustPackage rec { pname = "rust-analyzer-unwrapped"; - version = "2022-07-11"; - cargoSha256 = "sha256-XpLXx3f+BC8+O4Df/PJ4LWuLxX14e/ga+aFu/JxVdpg="; + version = "2022-08-01"; + cargoSha256 = "sha256-7ZYrIFSIOlL1JojtaQBIvvlfvjZGlR40PKVjmEtMBMo="; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; rev = version; - sha256 = "sha256-HU1+Rql35ouZe0lx1ftCMDDwC9lqN3COudvMe+8XIx0="; + sha256 = "sha256-OUezy1BkIoqpkTE5wOtsjJ/Gy48Ql8EL1/t6MZzRkWw="; }; patches = [ - # Code format and git history check require more dependencies but don't really matter for packaging. - # So just ignore them. - ./ignore-git-and-rustfmt-tests.patch + # Code format check requires more dependencies but don't really matter for packaging. + # So just ignore it. + ./ignore-rustfmt-test.patch ]; buildAndTestSubdir = "crates/rust-analyzer"; diff --git a/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch b/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch deleted file mode 100644 index 1247e4804684..000000000000 --- a/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/crates/rust-analyzer/tests/slow-tests/tidy.rs -+++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs -@@ -6,6 +6,7 @@ use std::{ - use xshell::{cmd, pushd, pushenv, read_file}; - - #[test] -+#[ignore] - fn check_code_formatting() { - let _dir = pushd(sourcegen::project_root()).unwrap(); - let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); -@@ -138,6 +139,7 @@ fn check_cargo_toml(path: &Path, text: String) -> () { - } - - #[test] -+#[ignore] - fn check_merge_commits() { - let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..") - .read() diff --git a/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch b/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch new file mode 100644 index 000000000000..fd7e83355781 --- /dev/null +++ b/pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch @@ -0,0 +1,10 @@ +--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs ++++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs +@@ -6,6 +6,7 @@ use std::{ + use xshell::{cmd, pushd, pushenv, read_file}; + + #[test] ++#[ignore] + fn check_code_formatting() { + let _dir = pushd(sourcegen::project_root()).unwrap(); + let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); \ No newline at end of file