diff options
author | Bobby Rong <rjl931189261@126.com> | 2021-12-18 23:06:39 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-18 23:06:39 +0800 |
commit | fd2cd8235a3eecd92bb97c88096d78bffc3b6f55 (patch) | |
tree | cf6c2fc1b1de4188478aaef6e1b0ada7cc317960 /pkgs/misc | |
parent | c8aed5f960e567a5c48ce1b54bb8c85722fda49d (diff) | |
parent | dfc31f4c83966325a0e1c003de6ad0bee80e8cc5 (diff) |
Merge pull request #150775 from oxalica/bump/rust-analyzer
rust-analyzer: 2021-11-29 -> 2021-12-13
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/vscode-extensions/rust-analyzer/default.nix | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix index 668d877678037..0580fc7d56ae0 100644 --- a/pkgs/misc/vscode-extensions/rust-analyzer/default.nix +++ b/pkgs/misc/vscode-extensions/rust-analyzer/default.nix @@ -1,5 +1,5 @@ -# Update script: pkgs/development/tools/rust/rust-analyzer/update.sh { lib +, fetchFromGitHub , vscode-utils , jq , rust-analyzer @@ -15,14 +15,26 @@ let pname = "rust-analyzer"; publisher = "matklad"; + # Use the plugin version as in vscode marketplace, updated by update script. + inherit (vsix) version; + + releaseTag = "2021-11-29"; + + src = fetchFromGitHub { + owner = "rust-analyzer"; + repo = "rust-analyzer"; + rev = releaseTag; + sha256 = "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw="; + }; + build-deps = nodePackages."rust-analyzer-build-deps-../../misc/vscode-extensions/rust-analyzer/build-deps"; # FIXME: Making a new derivation to link `node_modules` and run `npm run package` # will cause a build failure. vsix = build-deps.override { - src = "${rust-analyzer.src}/editors/code"; + src = "${src}/editors/code"; outputs = [ "vsix" "out" ]; - releaseTag = rust-analyzer.version; + inherit releaseTag; nativeBuildInputs = [ jq moreutils esbuild @@ -46,9 +58,6 @@ let ''; }; - # Use the plugin version as in vscode marketplace, updated by update script. - inherit (vsix) version; - in vscode-utils.buildVscodeExtension { inherit version vsix; @@ -68,7 +77,7 @@ vscode-utils.buildVscodeExtension { description = "An alternative rust language server to the RLS"; homepage = "https://github.com/rust-analyzer/rust-analyzer"; license = with licenses; [ mit asl20 ]; - maintainers = with maintainers; [ oxalica ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } |