mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 08:28:20 +00:00
Code Issues Wiki Activity

rust-analyzer: 2021-08-09 -> 2021-08-16

Browse source 
Note that upstream replaced `rollup` with `esbuild` now.
This commit is contained in:
oxalica 2021-08-16 15:24:02 +08:00 committed by Raphael Megzari
parent 57b6c8c5b2
commit 6353f88074
4 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,14 +7,14 @@
rustPlatform.buildRustPackage rec {
pname = "rust-analyzer-unwrapped";
version = "2021-08-09";
cargoSha256 = "sha256-r01riAztIlwxRjvqQXofmqv5875nqQ0Qb9KALvKy4u8=";
version = "2021-08-16";
cargoSha256 = "sha256-nTO6NmY0pqVud7kpOltHBOkaLlwfIdCrchV0o93FeVk=";
src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
rev = version;
sha256 = "sha256-l9F/cznYHxBdnb3NerIXzOMrzRnxdka0vExzUtKkBfw=";
sha256 = "sha256-FD1AwRiSTbj10+ielHBRkDTC7wyBBSatAlzyEow5CNE=";
};
buildAndTestSubdir = "crates/rust-analyzer";

6
pkgs/development/tools/rust/rust-analyzer/update.sh
View file

@ -53,13 +53,11 @@ echo "Extension version: $extension_ver"
build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
# We need devDependencies to build vsix.
jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
# `esbuild` is a binary package an is already in nixpkgs so we omit it here.
jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \
--arg ver "$extension_ver" \
>"$build_deps/package.json.new"
# FIXME: rollup@2.55.0 breaks the build: https://github.com/rollup/rollup/issues/4195
sed 's/"rollup": ".*"/"rollup": "=2.51.1"/' --in-place "$build_deps/package.json.new"
old_deps="$(jq '.dependencies' "$build_deps"/package.json)"
new_deps="$(jq '.dependencies' "$build_deps"/package.json.new)"
if [[ "$old_deps" == "$new_deps" ]]; then

7
pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
View file

@ -1,12 +1,12 @@
{
"name": "rust-analyzer",
"version": "0.2.702",
"version": "0.2.710",
"dependencies": {
"https-proxy-agent": "^5.0.0",
"node-fetch": "^2.6.1",
"vscode-languageclient": "^7.1.0-next.5",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^13.0.0",
"d3": "^7.0.0",
"d3-graphviz": "^4.0.0",
"@types/glob": "^7.1.4",
"@types/mocha": "^8.2.3",
"@types/node": "~14.17.5",
@ -17,7 +17,6 @@
"eslint": "^7.30.0",
"glob": "^7.1.6",
"mocha": "^9.0.2",
"rollup": "=2.51.1",
"tslib": "^2.3.0",
"typescript": "^4.3.5",
"typescript-formatter": "^7.2.2",

5
pkgs/misc/vscode-extensions/rust-analyzer/default.nix
View file

@ -4,8 +4,9 @@
, jq
, rust-analyzer
, nodePackages
, setDefaultServerPath ? true
, moreutils
, esbuild
, setDefaultServerPath ? true
}:
let
@ -21,7 +22,7 @@ let
releaseTag = rust-analyzer.version;
nativeBuildInputs = [ jq moreutils ];
nativeBuildInputs = [ jq moreutils esbuild ];
# Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
postInstall = ''