cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

rust-analyzer-unwrapped: 2022-08-01 -> 2022-08-22

Browse source 
rust-analyzer introduced the rust-analyzer-proc-macro-srv binary a few
releases ago, output and test for that package.

The patch file in the build is replaced by using a test flag to skip
that test, this is easier to maintain.
This commit is contained in:
Benno Zeeman 2022-08-23 10:23:36 +02:00
parent 34f5c5a16a
commit f600b6ff90
No known key found for this signature in database
GPG key ID: 45C412A39EDF2B10
2 changed files with 8 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/tools/rust/rust-analyzer/default.nix
View file

@ -12,23 +12,22 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2022-08-01";
cargoSha256 = "sha256-7ZYrIFSIOlL1JojtaQBIvvlfvjZGlR40PKVjmEtMBMo=";
version = "2022-08-22";
cargoSha256 = "sha256-A1oH2He1nEmVmBBTfMsZpJNKNtIQpmNx3AE56e9Z1qk=";
src = fetchFromGitHub {
owner = "rust-lang";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-OUezy1BkIoqpkTE5wOtsjJ/Gy48Ql8EL1/t6MZzRkWw=";
sha256 = "sha256-G/IElEE6eetQcLpESXCQtuYED/uTrsdeZj8fkqC3FSM=";
};
patches = [
# Code format check requires more dependencies but don't really matter for packaging.
# So just ignore it.
./ignore-rustfmt-test.patch
];
cargoBuildFlags = [ "--bin" "rust-analyzer" "--bin" "rust-analyzer-proc-macro-srv" ];
cargoTestFlags = [ "--package" "rust-analyzer" "--package" "proc-macro-srv-cli" ];
buildAndTestSubdir = "crates/rust-analyzer";
# Code format check requires more dependencies but don't really matter for packaging.
# So just ignore it.
checkFlags = ["--skip=tidy::check_code_formatting"];
nativeBuildInputs = lib.optional useMimalloc cmake;

10
pkgs/development/tools/rust/rust-analyzer/ignore-rustfmt-test.patch
View file

@ -1,10 +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");