nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 03:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rust-analyzer: 2021-10-25 -> 2021-11-29

Browse Source
This commit is contained in:
Bastian Köcher 2021-11-30 21:54:05 +01:00
parent 39b1caa278
commit 71d446eb25
No known key found for this signature in database
GPG Key ID: 3944BE3F0A559837
2 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pkgs/development/tools/rust/rust-analyzer/default.nix
View File

@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, rustPlatform
, CoreServices
, cmake
@ -12,14 +11,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2021-10-25";
cargoSha256 = "sha256-PCQxXNpv4krdLBhyINoZT5QxV2hCqXpp1mqs0dUu4Ag=";
version = "2021-11-29";
cargoSha256 = "sha256-UgYR0e3Pt3lcbkSDnizlwtwjnqTaqGlXRgR724U4rSU=";
src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-3AMRwtEmITIvUdR/NINQTPatkjhmS1dQsbbsefIDYAE=";
sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=";
};
patches = [
@ -28,32 +27,6 @@ rustPlatform.buildRustPackage rec {
./ignore-git-and-rustfmt-tests.patch
];
# Revert edition 2021 related code since we have rust 1.55.0 in nixpkgs currently.
# Remove them when we have rust >= 1.56.0
# They change Cargo.toml so go `cargoPatches`.
cargoPatches = [
(fetchpatch {
url = "https://github.com/rust-analyzer/rust-analyzer/commit/f0ad6fa68bf98d317518bb75da01b7bb7abe98d3.patch";
revert = true;
sha256 = "sha256-ksX2j1Pgtd+M+FmXTEljm1nUxJwcY8GDQ9784Lb1uM4=";
})
(fetchpatch {
url = "https://github.com/rust-analyzer/rust-analyzer/commit/8457ae34bdbca117b2ef73787b214161440e21f9.patch";
revert = true;
sha256 = "sha256-w1Py1bvZ2/tDQDZVMNmPRo6i6uA4H3YYZY4rXlo0iqg=";
})
(fetchpatch {
url = "https://github.com/rust-analyzer/rust-analyzer/commit/ca44b6892e3e66765355d4e645f74df3d184c03b.patch";
revert = true;
sha256 = "sha256-N1TWlLxEg6oxFkns1ieVVvLAkrHq2WOr1tbkNvZvDFg=";
})
(fetchpatch {
url = "https://github.com/rust-analyzer/rust-analyzer/commit/1294bfce865c556184c9327af4a8953ca940aec8.patch";
revert = true;
sha256 = "sha256-65eZxAjsuUln6lzSihIP26x15PELLDL4yk9wiVzJ0hE=";
})
];
buildAndTestSubdir = "crates/rust-analyzer";
nativeBuildInputs = lib.optional useMimalloc cmake;
@ -84,8 +57,8 @@ rustPlatform.buildRustPackage rec {
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "An experimental modular compiler frontend for the Rust language";
homepage = "https://github.com/rust-analyzer/rust-analyzer";
description = "A modular compiler frontend for the Rust language";
homepage = "https://rust-analyzer.github.io";
license = with licenses; [ mit asl20 ];
maintainers = with maintainers; [ oxalica ];
};

4
pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
View File

@ -1,6 +1,6 @@
{
"name": "rust-analyzer",
"version": "0.2.792",
"version": "0.2.834",
"dependencies": {
"https-proxy-agent": "^5.0.0",
"node-fetch": "^2.6.1",
@ -20,7 +20,7 @@
"tslib": "^2.3.0",
"typescript": "^4.3.5",
"typescript-formatter": "^7.2.2",
"vsce": "=1.95.1",
"vsce": "^1.95.1",
"vscode-test": "^1.5.1"
}
}