public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rust-analyzer: fix update script and avoid updating nodePackages if possible

Browse Source
This commit is contained in:
oxalica
2020-07-14 19:02:04 +08:00
parent 1facbd61b1
commit 1cb300ac2a
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/tools/rust/rust-analyzer/update.sh
+11 -8
View File
@@ -49,13 +49,16 @@ sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \
build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps" build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
# We need devDependencies to build vsix. # We need devDependencies to build vsix.
jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \ jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
>"$build_deps/package.json" >"$build_deps/package.json.new"
# FIXME: Lock the version of @type/vscode, the latest one (1.43.0) will cause build failure. if cmp --quiet "$build_deps"/package.json{.new,}; then
vscode_lock_ver="$(jq '.dependencies."@types/vscode".version' --raw-output "$node_src/package-lock.json")" echo "package.json not changed, skip updating nodePackages"
jq '.dependencies."@types/vscode" = "'$vscode_lock_ver'"' "$build_deps/package.json" >"$build_deps/package.json.new" rm "$build_deps"/package.json.new
mv "$build_deps"/package.json{.new,} else
echo "package.json changed, updating nodePackages"
mv "$build_deps"/package.json{.new,}
pushd "../../../node-packages" pushd "../../../node-packages"
./generate.sh ./generate.sh
popd popd
fi