diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 04:10:57 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-06-10 04:10:57 +0200 |
| commit | acb53e069824a0ae92e81239963e79e5e3088fb8 (patch) | |
| tree | eb9a5b332350c412ef9d53ab99ed43f014c7ddcd /pkgs/misc | |
| parent | 8576d24b2ac27a216b6e32b167c258ae4f8bfe69 (diff) | |
| parent | c637cbe99208d1fcffc50579f5dbfe0ee0cb5c67 (diff) | |
| download | nixlib-acb53e069824a0ae92e81239963e79e5e3088fb8.tar nixlib-acb53e069824a0ae92e81239963e79e5e3088fb8.tar.gz nixlib-acb53e069824a0ae92e81239963e79e5e3088fb8.tar.bz2 nixlib-acb53e069824a0ae92e81239963e79e5e3088fb8.tar.lz nixlib-acb53e069824a0ae92e81239963e79e5e3088fb8.tar.xz nixlib-acb53e069824a0ae92e81239963e79e5e3088fb8.tar.zst nixlib-acb53e069824a0ae92e81239963e79e5e3088fb8.zip | |
Merge branch 'staging-next' into staging
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json | 30 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 7 |
2 files changed, 20 insertions, 17 deletions
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json b/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json index d42da3bbc5bd..f6414e643cc4 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json +++ b/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": "^12.0.0", + "@rollup/plugin-node-resolve": "^8.0.0", + "@types/glob": "^7.1.1", + "@types/mocha": "^7.0.2", + "@types/node": "^14.0.5", + "@types/node-fetch": "^2.5.7", + "@types/vscode": "1.45.0", + "@typescript-eslint/eslint-plugin": "^3.0.0", + "@typescript-eslint/parser": "^3.0.0", + "eslint": "^7.0.0", + "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", - "vsce": "^1.75.0" + "vsce": "^1.75.0", + "vscode-test": "^1.3.0" } } diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 9f49f4c8eef0..d19027fa5762 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/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; { |