vscode-extensions.rust-lang.rust-analyzer: fix build and bump version (#383049) (7a753239) · Commits · nix / nixpkgs

pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/build-deps/package.json

deleted100644 → 0

+0 −24

Original line number	Diff line number	Diff line
		{
		"name": "rust-analyzer",
		"version": "0.3.2029",
		"dependencies": {
		"@hpcc-js/wasm": "^2.13.0",
		"anser": "^2.1.1",
		"d3": "^7.8.5",
		"d3-graphviz": "^5.0.2",
		"vscode-languageclient": "^8.1.0",
		"@tsconfig/strictest": "^2.0.1",
		"@types/node": "~16.11.7",
		"@types/vscode": "~1.78.1",
		"@typescript-eslint/eslint-plugin": "^6.0.0",
		"@typescript-eslint/parser": "^6.0.0",
		"@vscode/test-electron": "^2.3.8",
		"@vscode/vsce": "^2.19.0",
		"eslint": "^8.44.0",
		"eslint-config-prettier": "^8.8.0",
		"ovsx": "^0.8.2",
		"prettier": "^3.0.0",
		"tslib": "^2.6.0",
		"typescript": "^5.1.6"
		}
		}

pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix

+14 −18

Original line number	Diff line number	Diff line
		{
		pkgsBuildBuild,
		lib,
		fetchFromGitHub,
		vscode-utils,
		jq,
		rust-analyzer,
		nodePackages,
		buildNpmPackage,
		moreutils,
		esbuild,
		pkg-config,
		@@ -21,28 +22,23 @@ let
		# Use the plugin version as in vscode marketplace, updated by update script.
		inherit (vsix) version;

		releaseTag = "2024-07-08";
		releaseTag = "2025-02-17";

		src = fetchFromGitHub {
		owner = "rust-lang";
		repo = "rust-analyzer";
		rev = releaseTag;
		hash = "sha256-STmaV9Zu74QtkGGrbr9uMhskwagfCjJqOAYapXabiuk=";
		hash = "sha256-i76MMFSkCr4kDwurK8CACwZq7qEgVEgIzkOr2kiuAKk=";
		};

		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-0frOGphtzO6z8neSEYfjyRYrM6zEO3wId/TACblZkxM=";
		buildInputs = [
		pkgsBuildBuild.libsecret
		];

		inherit releaseTag;

		nativeBuildInputs =
		[
		jq
		@@ -50,7 +46,6 @@ let
		esbuild
		# Required by `keytar`, which is a dependency of `vsce`.
		pkg-config
		libsecret
		]
		++ lib.optionals stdenv.hostPlatform.isDarwin [
		darwin.apple_sdk.frameworks.AppKit
		@@ -58,7 +53,7 @@ let
		];

		# 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 \|
		@@ -66,10 +61,11 @@ let
		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;

pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/update.sh

+1 −22

Original line number	Diff line number	Diff line
		@@ -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=$(
		@@ -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!"

pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/version.txt

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		0.3.2308

Admin message