diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-09-27 16:00:58 +0000 |
| commit | c504e5d19d940926b3ddcf62c983d66f49f3cbb2 (patch) | |
| tree | ec955e58bcac2cb93b9f8c10786b23f61d40cd7e /nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb | |
| parent | 72789cefce7b17419815f600fbd18238d89afcc9 (diff) | |
| parent | 1737f98af6667560e3e4f930312f9b5002649d04 (diff) | |
| download | nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.gz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.bz2 nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.lz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.xz nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.tar.zst nixlib-c504e5d19d940926b3ddcf62c983d66f49f3cbb2.zip | |
Merge commit '1737f98af6667560e3e4f930312f9b5002649d04'
Conflicts: nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix nixpkgs/pkgs/development/node-packages/default.nix nixpkgs/pkgs/development/python-modules/priority/deadline.patch
Diffstat (limited to 'nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb')
3 files changed, 5 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json index 86d7b1aa6fa4..ed08833f958b 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json @@ -1,6 +1,6 @@ { "name": "vscode-lldb", - "version": "1.6.5", + "version": "1.6.7", "dependencies": { "string-argv": "^0.3.1", "yaml": "^1.10.0", @@ -15,7 +15,7 @@ "memory-streams": "^0.1.3", "vscode-debugprotocol": "^1.47.0", "vscode-debugadapter-testsupport": "^1.47.0", - "vsce": "=1.88.0", + "vsce": "^1.88.0", "webpack": "^5.37.1", "webpack-cli": "^4.7.0", "ts-loader": "^8.0.0" diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix index 819650bdb01a..93bb0e570dd0 100644 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/default.nix +++ b/nixpkgs/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.5"; + version = "1.6.7"; vscodeExtUniqueId = "${publisher}.${pname}"; @@ -13,7 +13,7 @@ let owner = "vadimcn"; repo = "vscode-lldb"; rev = "v${version}"; - sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k="; + sha256 = "sha256-9rqdqpxUWcUV9RnZOTxg+zMW7wlTXZVkoKYHuv/lE7c="; }; lldb = callPackage ./lldb.nix {}; @@ -25,7 +25,7 @@ let # It will pollute the build environment of `buildRustPackage`. cargoPatches = [ ./reset-cargo-config.patch ]; - cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U="; + cargoSha256 = "sha256-KeZpjMCBdOJTLj8pA5WWi3EMyhhWw/+aik4IJqIs/mk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh index 8511ea3b12ed..34bb5dbc33d5 100755 --- a/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh +++ b/nixpkgs/pkgs/misc/vscode-extensions/vscode-lldb/update.sh @@ -30,9 +30,6 @@ jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies) "$src/package.json" \ > build-deps/package.json -# FIXME: vsce@1.93.0 breaks the build. -sed 's/"vsce": ".*"/"vsce": "=1.88.0"/' --in-place build-deps/package.json - # Regenerate nodePackages. cd "$nixpkgs/pkgs/development/node-packages" exec ./generate.sh |