rust-analyzer: 2021-04-19 -> 2021-05-10 (#122474)
This commit is contained in:
parent
eb80b70b67
commit
4b544285bf
@ -1,4 +1,4 @@
|
|||||||
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake
|
{ lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake, fetchpatch
|
||||||
, libiconv
|
, libiconv
|
||||||
, useMimalloc ? false
|
, useMimalloc ? false
|
||||||
, doCheck ? true
|
, doCheck ? true
|
||||||
@ -6,16 +6,32 @@
|
|||||||
|
|
||||||
rustPlatform.buildRustPackage rec {
|
rustPlatform.buildRustPackage rec {
|
||||||
pname = "rust-analyzer-unwrapped";
|
pname = "rust-analyzer-unwrapped";
|
||||||
version = "2021-04-19";
|
version = "2021-05-10";
|
||||||
cargoSha256 = "sha256-CXkI3CQ/v6RBMM2Dpp2u+qnRwba+nqzeaPSJGBiQUoY=";
|
cargoSha256 = "sha256-PUecBFdYIJFZa5IwwNnuXOkuxtyrzWhxy3C+2jv/hvU=";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "rust-analyzer";
|
owner = "rust-analyzer";
|
||||||
repo = "rust-analyzer";
|
repo = "rust-analyzer";
|
||||||
rev = version;
|
rev = version;
|
||||||
sha256 = "sha256-W/cUwZEvlUXzqQ/futeNFwDWR/cTL/RLZaW2srIs83Q=";
|
sha256 = "sha256-oz6FqRMEUUTS4X2XhpWjp2JIgl1A6wQv2OU8auwUoVM=";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Revert updates which require rust 1.52.0.
|
||||||
|
# We currently have rust 1.51.0 in nixpkgs.
|
||||||
|
# https://github.com/rust-analyzer/rust-analyzer/pull/8718
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/607d8a2f61e56fabb7a3bc5132592917fcdca970.patch";
|
||||||
|
sha256 = "sha256-g1yyq/XSwGxftnqSW1bR5UeMW4gW28f4JciGvwQ/n08=";
|
||||||
|
revert = true;
|
||||||
|
})
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/rust-analyzer/rust-analyzer/pull/8718/commits/6a16ec52aa0d91945577c99cdf421b303b59301e.patch";
|
||||||
|
sha256 = "sha256-n7Ew/0fG8zPaMFCi8FVLjQZwJSaczI/QoehC6pDLrAk=";
|
||||||
|
revert = true;
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
buildAndTestSubdir = "crates/rust-analyzer";
|
buildAndTestSubdir = "crates/rust-analyzer";
|
||||||
|
|
||||||
cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
|
cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc";
|
||||||
|
Loading…
x
Reference in New Issue
Block a user