alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #138826 from oxalica/vscode-lldb

Browse source
This commit is contained in:
Sandro 2021-09-21 23:49:42 +02:00 committed by GitHub
parent 377600cefd 58371e54a9
commit 2d76be6e37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3182 additions and 2582 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5751
pkgs/development/node-packages/node-packages.nix generated
View file

File diff suppressed because it is too large Load diff

4
pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "vscode-lldb", "name": "vscode-lldb",
"version": "1.6.5", "version": "1.6.7",
"dependencies": { "dependencies": {
"string-argv": "^0.3.1", "string-argv": "^0.3.1",
"yaml": "^1.10.0", "yaml": "^1.10.0",
@ -15,7 +15,7 @@
"memory-streams": "^0.1.3", "memory-streams": "^0.1.3",
"vscode-debugprotocol": "^1.47.0", "vscode-debugprotocol": "^1.47.0",
"vscode-debugadapter-testsupport": "^1.47.0", "vscode-debugadapter-testsupport": "^1.47.0",
"vsce": "=1.88.0", "vsce": "^1.88.0",
"webpack": "^5.37.1", "webpack": "^5.37.1",
"webpack-cli": "^4.7.0", "webpack-cli": "^4.7.0",
"ts-loader": "^8.0.0" "ts-loader": "^8.0.0"

6
pkgs/misc/vscode-extensions/vscode-lldb/default.nix
View file

@ -5,7 +5,7 @@ assert lib.versionAtLeast python3.version "3.5";
let let
publisher = "vadimcn"; publisher = "vadimcn";
pname = "vscode-lldb"; pname = "vscode-lldb";
version = "1.6.5"; version = "1.6.7";
vscodeExtUniqueId = "${publisher}.${pname}"; vscodeExtUniqueId = "${publisher}.${pname}";
@ -13,7 +13,7 @@ let
owner = "vadimcn"; owner = "vadimcn";
repo = "vscode-lldb"; repo = "vscode-lldb";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k="; sha256 = "sha256-9rqdqpxUWcUV9RnZOTxg+zMW7wlTXZVkoKYHuv/lE7c=";
}; };
lldb = callPackage ./lldb.nix {}; lldb = callPackage ./lldb.nix {};
@ -25,7 +25,7 @@ let
# It will pollute the build environment of `buildRustPackage`. # It will pollute the build environment of `buildRustPackage`.
cargoPatches = [ ./reset-cargo-config.patch ]; cargoPatches = [ ./reset-cargo-config.patch ];
cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U="; cargoSha256 = "sha256-KeZpjMCBdOJTLj8pA5WWi3EMyhhWw/+aik4IJqIs/mk=";
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];

3
pkgs/misc/vscode-extensions/vscode-lldb/update.sh
View file

@ -30,9 +30,6 @@ jq '{ name, version: $version, dependencies: (.dependencies + .devDependencies)
"$src/package.json" \ "$src/package.json" \
> build-deps/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. # Regenerate nodePackages.
cd "$nixpkgs/pkgs/development/node-packages" cd "$nixpkgs/pkgs/development/node-packages"
exec ./generate.sh exec ./generate.sh