pyrox.dev
Merge pull request #147373 from bkchr/rust-analyzer-2021-11-22
rust-analyzer: 2021-10-25 -> 2021-11-29
authored by Bobby Rong and committed by GitHub 76b2fabd 15f2cda3
+5
-32
pkgs/development/tools/rust/rust-analyzer/default.nix
+5
-32
pkgs/development/tools/rust/rust-analyzer/default.nix
···
1
{ lib
2
, stdenv
3
, fetchFromGitHub
4
-
, fetchpatch
5
, rustPlatform
6
, CoreServices
7
, cmake
···
12
13
rustPlatform.buildRustPackage rec {
14
pname = "rust-analyzer-unwrapped";
15
-
version = "2021-10-25";
16
-
cargoSha256 = "sha256-PCQxXNpv4krdLBhyINoZT5QxV2hCqXpp1mqs0dUu4Ag=";
17
18
src = fetchFromGitHub {
19
owner = "rust-analyzer";
20
repo = "rust-analyzer";
21
rev = version;
22
-
sha256 = "sha256-3AMRwtEmITIvUdR/NINQTPatkjhmS1dQsbbsefIDYAE=";
23
};
24
25
patches = [
···
28
./ignore-git-and-rustfmt-tests.patch
29
];
30
31
-
# Revert edition 2021 related code since we have rust 1.55.0 in nixpkgs currently.
32
-
# Remove them when we have rust >= 1.56.0
33
-
# They change Cargo.toml so go `cargoPatches`.
34
-
cargoPatches = [
35
-
(fetchpatch {
36
-
url = "https://github.com/rust-analyzer/rust-analyzer/commit/f0ad6fa68bf98d317518bb75da01b7bb7abe98d3.patch";
37
-
revert = true;
38
-
sha256 = "sha256-ksX2j1Pgtd+M+FmXTEljm1nUxJwcY8GDQ9784Lb1uM4=";
39
-
})
40
-
(fetchpatch {
41
-
url = "https://github.com/rust-analyzer/rust-analyzer/commit/8457ae34bdbca117b2ef73787b214161440e21f9.patch";
42
-
revert = true;
43
-
sha256 = "sha256-w1Py1bvZ2/tDQDZVMNmPRo6i6uA4H3YYZY4rXlo0iqg=";
44
-
})
45
-
(fetchpatch {
46
-
url = "https://github.com/rust-analyzer/rust-analyzer/commit/ca44b6892e3e66765355d4e645f74df3d184c03b.patch";
47
-
revert = true;
48
-
sha256 = "sha256-N1TWlLxEg6oxFkns1ieVVvLAkrHq2WOr1tbkNvZvDFg=";
49
-
})
50
-
(fetchpatch {
51
-
url = "https://github.com/rust-analyzer/rust-analyzer/commit/1294bfce865c556184c9327af4a8953ca940aec8.patch";
52
-
revert = true;
53
-
sha256 = "sha256-65eZxAjsuUln6lzSihIP26x15PELLDL4yk9wiVzJ0hE=";
54
-
})
55
-
];
56
-
57
buildAndTestSubdir = "crates/rust-analyzer";
58
59
nativeBuildInputs = lib.optional useMimalloc cmake;
···
84
passthru.updateScript = ./update.sh;
85
86
meta = with lib; {
87
-
description = "An experimental modular compiler frontend for the Rust language";
88
-
homepage = "https://github.com/rust-analyzer/rust-analyzer";
89
license = with licenses; [ mit asl20 ];
90
maintainers = with maintainers; [ oxalica ];
91
};
···
1
{ lib
2
, stdenv
3
, fetchFromGitHub
4
, rustPlatform
5
, CoreServices
6
, cmake
···
11
12
rustPlatform.buildRustPackage rec {
13
pname = "rust-analyzer-unwrapped";
14
+
version = "2021-11-29";
15
+
cargoSha256 = "sha256-UgYR0e3Pt3lcbkSDnizlwtwjnqTaqGlXRgR724U4rSU=";
16
17
src = fetchFromGitHub {
18
owner = "rust-analyzer";
19
repo = "rust-analyzer";
20
rev = version;
21
+
sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=";
22
};
23
24
patches = [
···
27
./ignore-git-and-rustfmt-tests.patch
28
];
29
30
buildAndTestSubdir = "crates/rust-analyzer";
31
32
nativeBuildInputs = lib.optional useMimalloc cmake;
···
57
passthru.updateScript = ./update.sh;
58
59
meta = with lib; {
60
+
description = "A modular compiler frontend for the Rust language";
61
+
homepage = "https://rust-analyzer.github.io";
62
license = with licenses; [ mit asl20 ];
63
maintainers = with maintainers; [ oxalica ];
64
};
+2
-2
pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+2
-2
pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json