vscode-extensions.vadimcn.vscode-lldb: 1.6.7 -> 1.6.8
This commit is contained in:
parent
d8db07defa
commit
60b4a5ea82
4 changed files with 18 additions and 9 deletions
2
pkgs/development/node-packages/node-packages.nix
generated
2
pkgs/development/node-packages/node-packages.nix
generated
|
@ -122512,7 +122512,7 @@ in
|
|||
"vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage {
|
||||
name = "vscode-lldb";
|
||||
packageName = "vscode-lldb";
|
||||
version = "1.6.7";
|
||||
version = "1.6.8";
|
||||
src = ../../misc/vscode-extensions/vscode-lldb/build-deps;
|
||||
dependencies = [
|
||||
sources."@discoveryjs/json-ext-0.5.5"
|
||||
|
|
|
@ -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",
|
||||
|
|
|
@ -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 ];
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue