alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #89649 from oxalica/rust-analyzer

Browse source
This commit is contained in:
Jörg Thalheim 2020-06-08 17:38:10 +01:00 committed by GitHub
parent bdae576bf1 738596d7e5
commit d903f1166b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3666 additions and 4308 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7931
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 { rust-analyzer-unwrapped = callPackage ./generic.nix rec {
rev = "2020-04-20"; rev = "2020-06-01";
version = "unstable-${rev}"; version = "unstable-${rev}";
sha256 = "00v8b6pbm5fry6bfkrfd7phn0ps8annqrw9k71m3pd26sxnn1q5f"; sha256 = "0chm47mrd4hybhvzn4cndq2ck0mj948mm181p1i1j1w0ms7zk1fg";
cargoSha256 = "0nd86gwlfjwdkcphpk8zvs95xxdm8p74wl7vcrx8fnvvfxnkpwmc"; cargoSha256 = "0yaz50f7hirlcs8bxc5dh170lch9l1gscwayan71k3pz23wkvlzs";
}; };
rust-analyzer = callPackage ./wrapper.nix {} { rust-analyzer = callPackage ./wrapper.nix {} {

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

@ -2,21 +2,25 @@
"name": "rust-analyzer", "name": "rust-analyzer",
"version": "0.4.0-dev", "version": "0.4.0-dev",
"dependencies": { "dependencies": {
"jsonc-parser": "^2.2.1",
"node-fetch": "^2.6.0", "node-fetch": "^2.6.0",
"vscode-languageclient": "7.0.0-next.1", "vscode-languageclient": "7.0.0-next.1",
"@rollup/plugin-commonjs": "^11.0.2", "@rollup/plugin-commonjs": "^12.0.0",
"@rollup/plugin-node-resolve": "^7.1.1", "@rollup/plugin-node-resolve": "^8.0.0",
"@types/node": "^12.12.34", "@types/glob": "^7.1.1",
"@types/node-fetch": "^2.5.5", "@types/mocha": "^7.0.2",
"@types/vscode": "1.44.0", "@types/node": "^14.0.5",
"@typescript-eslint/eslint-plugin": "^2.27.0", "@types/node-fetch": "^2.5.7",
"@typescript-eslint/parser": "^2.27.0", "@types/vscode": "1.45.0",
"eslint": "^6.8.0", "@typescript-eslint/eslint-plugin": "^3.0.0",
"rollup": "^2.3.3", "@typescript-eslint/parser": "^3.0.0",
"tslib": "^1.11.1", "eslint": "^7.0.0",
"typescript": "^3.8.3", "glob": "^7.1.6",
"mocha": "^7.1.2",
"rollup": "^2.10.7",
"tslib": "^2.0.0",
"typescript": "^3.9.3",
"typescript-formatter": "^7.2.2", "typescript-formatter": "^7.2.2",
"vsce": "^1.75.0" "vsce": "^1.75.0",
"vscode-test": "^1.3.0"
} }
} }

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

@ -32,12 +32,11 @@ in vscode-utils.buildVscodeExtension {
nativeBuildInputs = lib.optional setDefaultServerPath jq; nativeBuildInputs = lib.optional setDefaultServerPath jq;
postFixup = lib.optionalString setDefaultServerPath '' preInstall = lib.optionalString setDefaultServerPath ''
package_json="$out/${publisher}.${pname}/package.json"
jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \ jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \
--arg s "${rust-analyzer}/bin/rust-analyzer" \ --arg s "${rust-analyzer}/bin/rust-analyzer" \
$package_json >$package_json.new package.json >package.json.new
mv $package_json.new $package_json mv package.json.new package.json
''; '';
meta = with lib; { meta = with lib; {