diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix index 0c42097b509c..f3def1b463f5 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix @@ -20,20 +20,20 @@ let # Use the plugin version as in vscode marketplace, updated by update script. inherit (vsix) version; - releaseTag = "2025-02-17"; + releaseTag = "2025-08-25"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rust-analyzer"; - rev = releaseTag; - hash = "sha256-i76MMFSkCr4kDwurK8CACwZq7qEgVEgIzkOr2kiuAKk="; + tag = releaseTag; + hash = "sha256-apbJj2tsJkL2l+7Or9tJm1Mt5QPB6w/zIyDkCx8pfvk="; }; vsix = buildNpmPackage { inherit pname releaseTag; version = lib.trim (lib.readFile ./version.txt); src = "${src}/editors/code"; - npmDepsHash = "sha256-0frOGphtzO6z8neSEYfjyRYrM6zEO3wId/TACblZkxM="; + npmDepsHash = "sha256-fV4Z3jj+v56A7wbIEYhVAPVuAMqMds5xSe3OetWAsbw="; buildInputs = [ pkgsBuildBuild.libsecret ]; diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh index 3ccf27d81f81..176cf4dcf48a 100755 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh @@ -21,10 +21,12 @@ if [[ "$(nix-instantiate --eval --strict -E "(builtins.compareVersions \"$req_vs exit 1 fi -extension_ver=$(curl "https://github.com/$owner/$repo/releases/download/$ver/rust-analyzer-linux-x64.vsix" -L | +vsix_url="https://github.com/$owner/$repo/releases/download/$ver/rust-analyzer-linux-x64.vsix" +extension_ver=$(curl $vsix_url -L | bsdtar -xf - --to-stdout extension/package.json | # Use bsdtar to extract vsix(zip). jq --raw-output '.version') -echo -n $extension_ver > version.txt +echo $extension_ver > version.txt echo "Extension version: $extension_ver" echo "Remember to also update the releaseTag and hash in default.nix!" +echo "The releaseTag should be set to $ver" diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/version.txt b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/version.txt index 00f4e21a2312..f421491429fe 100644 --- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/version.txt +++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/version.txt @@ -1 +1 @@ -0.3.2308 +0.3.2593