git.iko.soy/typeable/nixpkgs
on master help sign in
rust-analyzer: fix update script and avoid updating nodePackages if possible
commit1cb300ac2a31994b85eeff625f1a1d057c59d6c7 authoroxalica <oxalicc@pm.me> dateTue 23 Jun 2020, 22:08 (6 years ago) parent1facbd6
1 file changed+11−8
pkgs/development/tools/rust/rust-analyzer/update.sh+11−8
pkgs/development/tools/rust/rust-analyzer/update.sh+11−8
@@ -49,13 +49,16 @@ sed "s/cargoSha256 = \".*\"/cargoSha256 = \"$cargo_sha256\"/" \
4949build_deps="../../../../misc/vscode-extensions/rust-analyzer/build-deps"
5050# We need devDependencies to build vsix.
5151jq '{ name, version, dependencies: (.dependencies + .devDependencies) }' "$node_src/package.json" \
52− >"$build_deps/package.json"
52+ >"$build_deps/package.json.new"
5353
54−# FIXME: Lock the version of @type/vscode, the latest one (1.43.0) will cause build failure.
55−vscode_lock_ver="$(jq '.dependencies."@types/vscode".version' --raw-output "$node_src/package-lock.json")"
56−jq '.dependencies."@types/vscode" = "'$vscode_lock_ver'"' "$build_deps/package.json" >"$build_deps/package.json.new"
57−mv "$build_deps"/package.json{.new,}
54+if cmp --quiet "$build_deps"/package.json{.new,}; then
55+ echo "package.json not changed, skip updating nodePackages"
56+ rm "$build_deps"/package.json.new
57+else
58+ echo "package.json changed, updating nodePackages"
59+ mv "$build_deps"/package.json{.new,}
5860
59−pushd "../../../node-packages"
60−./generate.sh
61−popd
61+ pushd "../../../node-packages"
62+ ./generate.sh
63+ popd
64+fi