diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:20:04 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-07-13 23:21:06 +0000 |
commit | a42c1d6d62656dcf9bd85de620f2e200a5ad22d8 (patch) | |
tree | 7d481fea9872f62a034452612be17f4494159baa /nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer | |
parent | 55f69a6b0e53c1c4b3e0396937c53bf5662b5519 (diff) | |
parent | 9480bae337095fd24f61380bce3174fdfe926a00 (diff) | |
download | nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.gz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.bz2 nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.lz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.xz nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.tar.zst nixlib-a42c1d6d62656dcf9bd85de620f2e200a5ad22d8.zip |
Merge commit '9480bae337095fd24f61380bce3174fdfe926a00'
This is the last nixos-unstable release before 13b2903169f, which I'm a bit nervous about. So I want the update including that one to be as small as possible, hence going to this one first.
Diffstat (limited to 'nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer')
-rw-r--r-- | nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/build-deps/package.json | 30 | ||||
-rw-r--r-- | nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 7 |
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 d42da3bbc5bd..f6414e643cc4 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": "^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/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 9f49f4c8eef0..d19027fa5762 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; { |