summary refs log tree commit diff
path: root/pkgs/development/tools/rust/rust-analyzer/default.nix
diff options
context:
space:
mode:
authoroxalica <oxalicc@pm.me>2021-08-25 04:56:02 +0800
committeroxalica <oxalicc@pm.me>2021-08-26 02:18:53 +0800
commit4b8c79896c80031892b9a49a4c6af9c1883bdea8 (patch)
tree1d8676cd4c170cbb6c226cd13ef02a7fdca128a3 /pkgs/development/tools/rust/rust-analyzer/default.nix
parentb7efa4755c57e0e5bf035bfc5bb971cc0afd3b42 (diff)
downloadnixpkgs-4b8c79896c80031892b9a49a4c6af9c1883bdea8.tar
nixpkgs-4b8c79896c80031892b9a49a4c6af9c1883bdea8.tar.gz
nixpkgs-4b8c79896c80031892b9a49a4c6af9c1883bdea8.tar.bz2
nixpkgs-4b8c79896c80031892b9a49a4c6af9c1883bdea8.tar.lz
nixpkgs-4b8c79896c80031892b9a49a4c6af9c1883bdea8.tar.xz
nixpkgs-4b8c79896c80031892b9a49a4c6af9c1883bdea8.tar.zst
nixpkgs-4b8c79896c80031892b9a49a4c6af9c1883bdea8.zip
rust-analyzer: enable check by default
Diffstat (limited to 'pkgs/development/tools/rust/rust-analyzer/default.nix')
-rw-r--r--pkgs/development/tools/rust/rust-analyzer/default.nix10
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix
index 9df4d9075aa..394b743ec80 100644
--- a/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -1,8 +1,7 @@
 { lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
 , libiconv
 , useMimalloc ? false
-# FIXME: Test doesn't pass under rustc 1.52.1 due to different escaping of `'` in string.
-, doCheck ? false
+, doCheck ? true
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -17,9 +16,16 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ=";
   };
 
+  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
+  ];
+
   buildAndTestSubdir = "crates/rust-analyzer";
 
   cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
+  cargoTestFlags = lib.optional useMimalloc "--features=mimalloc";
 
   nativeBuildInputs = lib.optional useMimalloc cmake;