diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-10-10 20:27:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-10 20:27:08 +0200 |
| commit | a4939246a5111eb10b2142005e6c0a599d7d92f4 (patch) | |
| tree | 0092fa5367e12b57c4b6f97a167cb3e46ea40c19 /pkgs/misc | |
| parent | 42feac9955bbe996266acf32417e02e66442c0ef (diff) | |
| parent | 60b4a5ea82b2551717bcc16a10245fea25980a7b (diff) | |
| download | nixpkgs-a4939246a5111eb10b2142005e6c0a599d7d92f4.tar nixpkgs-a4939246a5111eb10b2142005e6c0a599d7d92f4.tar.gz nixpkgs-a4939246a5111eb10b2142005e6c0a599d7d92f4.tar.bz2 nixpkgs-a4939246a5111eb10b2142005e6c0a599d7d92f4.tar.lz nixpkgs-a4939246a5111eb10b2142005e6c0a599d7d92f4.tar.xz nixpkgs-a4939246a5111eb10b2142005e6c0a599d7d92f4.tar.zst nixpkgs-a4939246a5111eb10b2142005e6c0a599d7d92f4.zip | |
Merge pull request #141140 from oxalica/vscode-lldb
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json | 2 | ||||
| -rw-r--r-- | pkgs/misc/vscode-extensions/vscode-lldb/default.nix | 6 | ||||
| -rwxr-xr-x | pkgs/misc/vscode-extensions/vscode-lldb/update.sh | 17 |
3 files changed, 17 insertions, 8 deletions
diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index ed08833f958..1998d1e46a3 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "vscode-lldb", - "version": "1.6.7", + "version": "1.6.8", "dependencies": { "string-argv": "^0.3.1", "yaml": "^1.10.0", diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 93bb0e570dd..3a01058c99c 100644 --- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix @@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.6.7"; + version = "1.6.8"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-9rqdqpxUWcUV9RnZOTxg+zMW7wlTXZVkoKYHuv/lE7c="; + sha256 = "sha256-/2iyWJfNjvk5n7KwWIu2gc24/21KWibU6IAPN/tJ8Q4="; }; lldb = callPackage ./lldb.nix {}; @@ -25,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-KeZpjMCBdOJTLj8pA5WWi3EMyhhWw/+aik4IJqIs/mk="; + cargoSha256 = "sha256-rG+Qw8ac9cCgCjfLFXLlohLk+zV5s1OaqzU0/nXiqgU="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh index 34bb5dbc33d..2fe0cc5cf29 100755 --- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -19,17 +19,26 @@ repo=vscode-lldb version="$1" sed -E 's/\bversion = ".*?"/version = "'$version'"/' --in-place "$nixFile" -srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version" --fetchSubmodules) +srcHash=$(nix-prefetch fetchFromGitHub --owner vadimcn --repo vscode-lldb --rev "v$version") sed -E 's#\bsha256 = ".*?"#sha256 = "'$srcHash'"#' --in-place "$nixFile" cargoHash=$(nix-prefetch "{ sha256 }: (import $nixpkgs {}).vscode-extensions.vadimcn.vscode-lldb.adapter.cargoDeps.overrideAttrs (_: { outputHash = sha256; })") sed -E 's#\bcargoSha256 = ".*?"#cargoSha256 = "'$cargoHash'"#' --in-place "$nixFile" src="$(nix-build $nixpkgs -A vscode-extensions.vadimcn.vscode-lldb.src --no-out-link)" +oldDeps="$(jq '.dependencies' build-deps/package.json)" +newDeps="$(jq '.dependencies + .devDependencies' "$src/package.json")" jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) }' \ --arg version "$version" \ "$src/package.json" \ > build-deps/package.json -# Regenerate nodePackages. -cd "$nixpkgs/pkgs/development/node-packages" -exec ./generate.sh +if [[ "$oldDeps" == "$newDeps" ]]; then + echo "Dependencies not changed" + sed '/"vscode-lldb-build-deps-/,+3 s/version = ".*"/version = "'"$version"'"/' \ + --in-place "$nixpkgs/pkgs/development/node-packages/node-packages.nix" +else + echo "Dependencies changed" + # Regenerate nodePackages. + cd "$nixpkgs/pkgs/development/node-packages" + exec ./generate.sh +fi |