aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer')
-rw-r--r--nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json30
-rw-r--r--nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix7
2 files changed, 20 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
index d42da3bbc5b..ac2da521c22 100644
--- a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
+++ b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json
@@ -2,21 +2,25 @@
"name": "rust-analyzer",
"version": "0.4.0-dev",
"dependencies": {
- "jsonc-parser": "^2.2.1",
"node-fetch": "^2.6.0",
"vscode-languageclient": "7.0.0-next.1",
- "@rollup/plugin-commonjs": "^11.0.2",
- "@rollup/plugin-node-resolve": "^7.1.1",
- "@types/node": "^12.12.34",
- "@types/node-fetch": "^2.5.5",
- "@types/vscode": "1.44.0",
- "@typescript-eslint/eslint-plugin": "^2.27.0",
- "@typescript-eslint/parser": "^2.27.0",
- "eslint": "^6.8.0",
- "rollup": "^2.3.3",
- "tslib": "^1.11.1",
- "typescript": "^3.8.3",
+ "@rollup/plugin-commonjs": "^13.0.0",
+ "@rollup/plugin-node-resolve": "^8.1.0",
+ "@types/glob": "^7.1.2",
+ "@types/mocha": "^7.0.2",
+ "@types/node": "~12.7.0",
+ "@types/node-fetch": "^2.5.7",
+ "@types/vscode": "^1.44.1",
+ "@typescript-eslint/eslint-plugin": "^3.4.0",
+ "@typescript-eslint/parser": "^3.4.0",
+ "eslint": "^7.3.1",
+ "glob": "^7.1.6",
+ "mocha": "^8.0.1",
+ "rollup": "^2.18.1",
+ "tslib": "^2.0.0",
+ "typescript": "^3.9.5",
"typescript-formatter": "^7.2.2",
- "vsce": "^1.75.0"
+ "vsce": "^1.75.0",
+ "vscode-test": "^1.4.0"
}
}
diff --git a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
index 9f49f4c8eef..d19027fa576 100644
--- a/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
+++ b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix
@@ -32,12 +32,11 @@ in vscode-utils.buildVscodeExtension {
nativeBuildInputs = lib.optional setDefaultServerPath jq;
- postFixup = lib.optionalString setDefaultServerPath ''
- package_json="$out/${publisher}.${pname}/package.json"
+ preInstall = lib.optionalString setDefaultServerPath ''
jq '.contributes.configuration.properties."rust-analyzer.serverPath".default = $s' \
--arg s "${rust-analyzer}/bin/rust-analyzer" \
- $package_json >$package_json.new
- mv $package_json.new $package_json
+ package.json >package.json.new
+ mv package.json.new package.json
'';
meta = with lib; {