Skip to content

Commit

Permalink
vscode-extensions.rust-lang.rust-analyzer: move to buildNpmPackage
Browse files Browse the repository at this point in the history
The existing node2nix-based build was broken with #382557. I could not
salvage it, however apparently it is considered the deprecated way of
building node packages in nixpkgs.

This commit moves rust-analyzer’s vsix build to buildNpmPackage.

Fixes: #382845
Part-Of: #229475
  • Loading branch information
DarkKirb committed Feb 20, 2025
1 parent 9175a7b commit b7ddfc9
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 62 deletions.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
{
pkgsBuildBuild,
lib,
fetchFromGitHub,
vscode-utils,
jq,
rust-analyzer,
nodePackages,
buildNpmPackage,
moreutils,
esbuild,
pkg-config,
Expand All @@ -30,46 +31,41 @@ let
hash = "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=";
};

build-deps =
nodePackages."rust-analyzer-build-deps-../../applications/editors/vscode/extensions/rust-lang.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 {
vsix = buildNpmPackage {
inherit pname releaseTag;
version = lib.trim (lib.readFile ./version.txt);
src = "${src}/editors/code";
outputs = [
"vsix"
"out"
npmDepsHash = "sha256-EtkgnNOAKDQP7BDHI667SPu73tYrz1Hq6TmeeObXnf4=";
buildInputs = [
pkgsBuildBuild.libsecret
];

inherit releaseTag;

nativeBuildInputs =
[
jq
moreutils
esbuild
# Required by `keytar`, which is a dependency of `vsce`.
pkg-config
libsecret
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
darwin.apple_sdk.frameworks.AppKit
darwin.apple_sdk.frameworks.Security
];

# Follows https://github.com/rust-lang/rust-analyzer/blob/41949748a6123fd6061eb984a47f4fe780525e63/xtask/src/dist.rs#L39-L65
postRebuild = ''
installPhase = ''
jq '
.version = $ENV.version |
.releaseTag = $ENV.releaseTag |
.enableProposedApi = false |
walk(del(.["$generated-start"]?) | del(.["$generated-end"]?))
' package.json | sponge package.json
mkdir -p $vsix
npx vsce package -o $vsix/${pname}.zip
mkdir -p $out
npx vsce package -o $out/${pname}.zip
'';
};

in
vscode-utils.buildVscodeExtension {
inherit version vsix pname;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
set -euo pipefail
cd "$(dirname "$0")"
nixpkgs=../../../../../../
node_packages="$nixpkgs/pkgs/development/node-packages"
owner=rust-lang
repo=rust-analyzer
ver=$(
Expand All @@ -25,27 +24,7 @@ fi
extension_ver=$(curl "https://github.com/$owner/$repo/releases/download/$ver/rust-analyzer-linux-x64.vsix" -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 version: $extension_ver"

# We need devDependencies to build vsix.
# `esbuild` is a binary package an is already in nixpkgs so we omit it here.
jq '{ name, version: $ver, dependencies: (.dependencies + .devDependencies | del(.esbuild)) }' "$node_src/package.json" \
--arg ver "$extension_ver" \
>"build-deps/package.json.new"

old_deps="$(jq '.dependencies' build-deps/package.json)"
new_deps="$(jq '.dependencies' build-deps/package.json.new)"
if [[ "$old_deps" == "$new_deps" ]]; then
echo "package.json dependencies not changed, do simple version change"

sed -E '/^ "rust-analyzer-build-deps/,+3 s/version = ".*"/version = "'"$extension_ver"'"/' \
--in-place "$node_packages"/node-packages.nix
mv build-deps/package.json{.new,}
else
echo "package.json dependencies changed, updating nodePackages"
mv build-deps/package.json{.new,}

./"$node_packages"/generate.sh
fi

echo "Remember to also update the releaseTag and hash in default.nix!"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0.3.2029

0 comments on commit b7ddfc9

Please sign in to comment.