cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vscode-extensions.vadimcn.vscode-lldb: 1.6.3 -> 1.6.4

Browse source 
`vsce` need to be locked to 1.88.0, or build will fail.
Since currently liblldb.so and lldb-server are in different outputs of lldb
need to set `LLDB_DEBUGSERVER_PATH` to let liblldb.so find the server.
This commit is contained in:
oxalica 2021-06-01 15:25:13 +08:00
parent 741277f5b8
commit 1dc8d8f0c4
No known key found for this signature in database
GPG key ID: CED392DE0C483D00
3 changed files with 3540 additions and 4310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

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

@ -1,6 +1,6 @@
{
"name": "vscode-lldb",
"version": "1.6.3",
"version": "1.6.4",
"dependencies": {
"string-argv": "^0.3.1",
"yaml": "^1.10.0",
@ -9,16 +9,15 @@
"@types/node": "^8.10.50",
"@types/mocha": "^7.0.1",
"@types/yauzl": "^2.9.0",
"@types/json5": "^0.0.30",
"typescript": "^3.7.0",
"mocha": "^7.0.1",
"typescript": "^4.2.4",
"mocha": "^8.4.0",
"source-map-support": "^0.5.12",
"memory-streams": "^0.1.3",
"vscode-debugprotocol": "^1.35.0",
"vscode-debugadapter-testsupport": "^1.35.0",
"vsce": "^1.73.0",
"webpack": "^4.39.1",
"webpack-cli": "^3.3.7",
"ts-loader": "^6.2.1"
"vscode-debugprotocol": "^1.47.0",
"vscode-debugadapter-testsupport": "^1.47.0",
"vsce": "=1.88.0",
"webpack": "^5.37.1",
"webpack-cli": "^4.7.0",
"ts-loader": "^8.0.0"
}
}

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

@ -5,14 +5,13 @@ assert lib.versionAtLeast python3.version "3.5";
let
publisher = "vadimcn";
pname = "vscode-lldb";
version = "1.6.3";
version = "1.6.4";
src = fetchFromGitHub {
owner = "vadimcn";
repo = "vscode-lldb";
rev = "v${version}";
sha256 = "sha256-Lw9JX7x000pUd/1MnGPv+RcIKlCKFlVgEslwXgrdO4k=";
fetchSubmodules = true;
sha256 = "sha256-utElXMAJG8X7jFmY/oyrWOCkOiNG3jZHrf04vTBTi7M=";
};
lldb = callPackage ./lldb.nix {};
@ -24,7 +23,7 @@ let
# It will pollute the build environment of `buildRustPackage`.
cargoPatches = [ ./reset-cargo-config.patch ];
cargoSha256 = "sha256-6nN+qVb1AEAMUth7d8mfQfLul0CpHnq9F93lXlp4mS0=";
cargoSha256 = "sha256-ZbD/+QWvpi88bHoSvDG0FKcsTsnthYR1SYkkJhqBbbU=";
nativeBuildInputs = [ makeWrapper ];
@ -71,8 +70,10 @@ in stdenv.mkDerivation rec {
mkdir -p $ext/{adapter,formatters}
mv -t $ext vsix-extracted/extension/*
cp -t $ext/adapter ${adapter}/{bin,lib}/* ../adapter/*.py
wrapProgram $ext/adapter/codelldb \
--set-default LLDB_DEBUGSERVER_PATH "${lldb.out}/bin/lldb-server"
cp -t $ext/formatters ../formatters/*.py
ln -s ${lldb} $ext/lldb
ln -s ${lldb.lib} $ext/lldb
# Mark that all components are installed.
touch $ext/platform.ok