hopefully fix rust analyzer?

This commit is contained in:
Charlotte 🦝 Delenk 2022-05-05 16:03:27 +01:00
parent b3dc041867
commit ac3d959eea
Signed by: darkkirb
GPG key ID: AB2BD8DAF2E37122
3 changed files with 94 additions and 7 deletions

View file

@ -2,7 +2,9 @@
programs.vscode = {
enable = true;
mutableExtensionsDir = false;
extensions = pkgs.vscode-utils.extensionsFromVscodeMarketplace (import ./extensions.nix).extensions;
extensions = [
(pkgs.callPackage ../../../packages/rust-analyzer.nix { })
] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace (import ./extensions.nix).extensions;
userSettings = {
"diffEditor.codeLens" = true;
"editor.bracketPairColorization.enabled" = true;

View file

@ -83,12 +83,6 @@
version = "2.0.1";
sha256 = "12vrn40cfm789qzsrjfy96ilfxzbdbmsr2h0ghz8spaw37fqqmbd";
}
{
name = "rust-analyzer";
publisher = "matklad";
version = "0.3.1043";
sha256 = "sha256-XiW6kou598qqvch/bSp3H22fkOf3Y3BrcROW1/vyXFM=";
}
{
name = "remote-ssh";
publisher = "ms-vscode-remote";

View file

@ -0,0 +1,91 @@
{ lib
, fetchFromGitHub
, vscode-utils
, jq
, rust-analyzer
, nodePackages
, moreutils
, esbuild
, pkg-config
, libsecret
, stdenv
, darwin
, setDefaultServerPath ? true
}:
let
pname = "rust-analyzer";
publisher = "matklad";
# Use the plugin version as in vscode marketplace, updated by update script.
inherit (vsix) version;
releaseTag = "2022-05-02";
src = fetchFromGitHub {
owner = "rust-analyzer";
repo = "rust-analyzer";
rev = releaseTag;
sha256 = "sha256-5kAbd/tTc9vkr27ar44hnpXdS0vQg0OLJUMlp0FBjqA=";
};
build-deps = nodePackages."rust-analyzer-build-deps-../../applications/editors/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 = "${src}/editors/code";
outputs = [ "vsix" "out" ];
inherit releaseTag;
nativeBuildInputs = [
jq
moreutils
esbuild
# Required by `keytar`, which is a dependency of `vsce`.
pkg-config
libsecret
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Security
];
# Follows https://github.com/rust-analyzer/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
postInstall = ''
jq '
.version = $ENV.version |
.releaseTag = $ENV.releaseTag |
.enableProposedApi = false |
walk(del(.["$generated-start"]?) | del(.["$generated-end"]?))
' package.json | sponge package.json
mkdir -p $vsix
# vsce ask for continue due to missing LICENSE.md
# Should be removed after https://github.com/rust-analyzer/rust-analyzer/commit/acd5c1f19bf7246107aaae7b6fe3f676a516c6d2
echo y | npx vsce package -o $vsix/${pname}.zip
'';
};
in
vscode-utils.buildVscodeExtension {
inherit version vsix;
name = "${pname}-${version}";
src = "${vsix}/${pname}.zip";
vscodeExtUniqueId = "${publisher}.${pname}";
nativeBuildInputs = lib.optionals setDefaultServerPath [ jq moreutils ];
preInstall = lib.optionalString setDefaultServerPath ''
jq '.contributes.configuration.properties."rust-analyzer.server.path".default = $s' \
--arg s "${rust-analyzer}/bin/rust-analyzer" \
package.json | sponge package.json
'';
meta = with lib; {
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; [ ];
platforms = platforms.all;
};
}