cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #108596 from oxalica/rust-analyzer

Browse source
This commit is contained in:
Sandro 2021-01-07 02:48:11 +01:00 committed by GitHub
commit 0cfa3979b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 652 additions and 603 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1217
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

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

@ -2,10 +2,10 @@
{
rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2020-11-09";
rev = "2021-01-04";
version = "unstable-${rev}";
sha256 = "sha256-SX9dvx2JtYZBxA3+dHQKX/jrjbAMy37/SAybDjlYcSs=";
cargoSha256 = "sha256-+td+wMmI+MyGz9oPC+SPO2TmAV0+3lOORNY7xf6s3vI=";
sha256 = "sha256-VRnmx5SfmdMIVQjixWBSaMioqFUlo9VOIKsPvC5t3t4=";
cargoSha256 = "sha256-X63FjFpfwjvQayw4X6Sqfyh4FHsc3flE3OtQpzqowjc=";
};
rust-analyzer = callPackage ./wrapper.nix {} {

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

@ -26,7 +26,7 @@ sha256=$(nix-prefetch -f "$nixpkgs" rust-analyzer-unwrapped.src --rev "$rev")
# Clear cargoSha256 to avoid inconsistency.
sed -e "s#rev = \".*\"#rev = \"$rev\"#" \
-e "s#sha256 = \".*\"#sha256 = \"$sha256\"#" \
-e "s#cargoSha256 = \".*\"#cargoSha256 = \"\"#" \
-e "s#cargoSha256 = \".*\"#cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"#" \
--in-place ./default.nix
node_src="$(nix-build "$nixpkgs" -A rust-analyzer.src --no-out-link)/editors/code"

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

@ -3,24 +3,24 @@
"version": "0.4.0-dev",
"dependencies": {
"node-fetch": "^2.6.1",
"vscode-languageclient": "7.0.0-next.12",
"@rollup/plugin-commonjs": "^13.0.2",
"@rollup/plugin-node-resolve": "^8.4.0",
"vscode-languageclient": "7.0.0",
"@rollup/plugin-commonjs": "^17.0.0",
"@rollup/plugin-node-resolve": "^11.0.0",
"@types/glob": "^7.1.3",
"@types/mocha": "^7.0.2",
"@types/node": "~12.7.0",
"@types/mocha": "^8.0.4",
"@types/node": "~12.12.6",
"@types/node-fetch": "^2.5.7",
"@types/vscode": "^1.47.1",
"@typescript-eslint/eslint-plugin": "^3.10.1",
"@typescript-eslint/parser": "^3.10.1",
"eslint": "^7.8.0",
"@types/vscode": "^1.52.0",
"@typescript-eslint/eslint-plugin": "^4.9.0",
"@typescript-eslint/parser": "^4.9.0",
"eslint": "^7.15.0",
"glob": "^7.1.6",
"mocha": "^8.1.3",
"rollup": "^2.26.9",
"tslib": "^2.0.1",
"typescript": "^3.9.7",
"mocha": "^8.2.1",
"rollup": "^2.34.2",
"tslib": "^2.0.3",
"typescript": "^4.1.2",
"typescript-formatter": "^7.2.2",
"vsce": "^1.79.5",
"vscode-test": "^1.4.0"
"vsce": "^1.81.1",
"vscode-test": "^1.4.1"
}
}