Merge pull request #173 from nix-community/update-vadimcn-vscodelldb

Update `vadimcn.vscodelldb`: v1.11.8 -> v1.12.1

Author: deemp

extensions/vadimcn/vscode-lldb/latest/adapter.nix

@@ -21,7 +21,6 @@ let
     else
       "${lib.getBin lldb}/bin/lldb-server";
   LLVM_TRIPLE = stdenv.buildPlatform.rust.rustcTarget;
-  DYLIB_SUFFIX = if stdenv.hostPlatform.isDarwin then ".dylib" else ".so";
 in
 rustPlatform.buildRustPackage {
   pname = "${pname}-adapter";
@@ -33,10 +32,8 @@ rustPlatform.buildRustPackage {
   # The LLDB_* variables are used in adapter/lldb/build.rs.
   "CC_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/cc";
   "CXX_${LLVM_TRIPLE}" = "${stdenv.cc}/bin/c++";
+  LLDB_DYLIB = "${lib.getLib lldb}/lib/liblldb${stdenv.hostPlatform.extensions.sharedLibrary}";
   LLDB_INCLUDE = "${lib.getDev lldb}/include";
-  LLDB_LINK_LIB = "lldb";
-  LLDB_LINK_SEARCH = "${lib.getLib lldb}/lib";
-  LLDB_DYLIB = "${lib.getLib lldb}/lib/liblldb${DYLIB_SUFFIX}";
 
   nativeBuildInputs = [ makeWrapper ];
 

extensions/vadimcn/vscode-lldb/latest/codelldb-launch.nix

@@ -0,0 +1,22 @@
+{
+  makeBinaryWrapper,
+  rustPlatform,
+  pname,
+  src,
+  version,
+
+  cargoHash,
+}:
+rustPlatform.buildRustPackage {
+  pname = "${pname}-codelldb-launch";
+  inherit version src cargoHash;
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  cargoBuildFlags = [
+    "--package=codelldb-launch"
+  ];
+
+  # Tests fail to build (as of version 1.12.0).
+  doCheck = false;
+}

extensions/vadimcn/vscode-lldb/latest/codelldb-types.nix

@@ -0,0 +1,22 @@
+{
+  makeWrapper,
+  rustPlatform,
+  pname,
+  src,
+  version,
+
+  cargoHash,
+}:
+rustPlatform.buildRustPackage {
+  pname = "${pname}-codelldb-types";
+  inherit version src cargoHash;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  cargoBuildFlags = [
+    "--package=codelldb-types"
+  ];
+
+  # Tests fail to build (as of version 1.12.0).
+  doCheck = false;
+}

extensions/vadimcn/vscode-lldb/latest/default.nix

@@ -1,5 +1,4 @@
-# Original implementation: https://github.com/NixOS/nixpkgs/pull/383013
-# After merging should be in https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb
+# Based on https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix
 {
   callPackage,
   cargo,
@@ -21,15 +20,16 @@
 }:
 assert lib.versionAtLeast python3.version "3.5";
 let
-  supportedVersion = "1.11.8";
+  supportedVersion = "1.12.1";
+  extFullName = "${mktplcRef.publisher}.${mktplcRef.name}";
 in
 assert lib.asserts.assertMsg (mktplcRef.version == supportedVersion) ''
-  The version `${mktplcRef.version}` of `vadimcn.vscode-lldb` is not supported.
+  The version `${mktplcRef.version}` of `${extFullName}` is not supported.
    
   Only the version `${supportedVersion}` is supported.
 
-  Try `extensions.${stdenv.hostPlatform.system}.vscode-marketplace-universal.vadimcn.vscode-lldb`
-  or  `extensions.${stdenv.hostPlatform.system}.open-vsx-universal.vadimcn.vscode-lldb`.
+  Try `extensions.${stdenv.hostPlatform.system}.vscode-marketplace-universal.${extFullName}`
+  or  `extensions.${stdenv.hostPlatform.system}.open-vsx-universal.${extFullName}`.
 '';
 let
   inherit (mktplcRef) publisher version;
@@ -46,25 +46,25 @@ let
 
   # Get the hash of a source code in a release (https://github.com/vadimcn/codelldb/releases)
   #
-  # nix-repl> rev = "1.11.8"
+  # nix-repl> rev = "1.12.1"
   # nix-repl> src = pkgs.fetchFromGitHub { owner = "vadimcn"; repo = "codelldb"; rev = "v${rev}"; hash = ""; }
   # nix-repl> :b src
   #
   # Write here the hash that you `got:`.
-  hash = "sha256-mal3hhf+nri8/2Y0wjfBhnMuGVwM3i0JswxT+ttTm7E=";
+  hash = "sha256-B8iCy4NXG7IzJVncbYm5VoAMfhMfxGF+HW7M5sVn5b0=";
 
   # Write here the hash from above.
-  # nix-repl> src = pkgs.fetchFromGitHub { owner = "vadimcn"; repo = "codelldb"; rev = "v${rev}"; hash = "sha256-mal3hhf+nri8/2Y0wjfBhnMuGVwM3i0JswxT+ttTm7E="; }
+  # nix-repl> src = pkgs.fetchFromGitHub { owner = "vadimcn"; repo = "codelldb"; rev = "v${rev}"; hash = "sha256-B8iCy4NXG7IzJVncbYm5VoAMfhMfxGF+HW7M5sVn5b0="; }
 
   # nix-repl> :b pkgs.rustPlatform.buildRustPackage { cargoHash = ""; name = "dummy"; inherit src; useFetchCargoVendor = true; }
   #
   # Write here the hash that you `got:`.
-  cargoHash = "sha256-sRqL629+mqvGyNkxpsYd/Kb3AyuysomN0JDR9zKwCO0=";
+  cargoHash = "sha256-fuUTLdavMiYfpyxctXes2GJCsNZd5g1d4B/v+W/Rnu8=";
 
   # nix-repl> :b pkgs.buildNpmPackage { npmDepsHash = ""; name = "dummy"; inherit src; dontNpmBuild = true; }
   #
   # Write here the hash that you `got:`.
-  npmDepsHash = "sha256-cS7Fr4mrq0QIPFtG5VjLEOOiC2QuVDW+Ispt2LmI258=";
+  npmDepsHash = "sha256-TCeIBrlsNuphW2gVsX97+Wu1lOG5gDwS7559YA1d10M=";
 
   src = fetchFromGitHub {
     owner = "vadimcn";
@@ -74,23 +74,23 @@ let
   };
 
   lldb = llvmPackages_19.lldb;
+  stdenv = llvmPackages_19.libcxxStdenv;
 
   adapter = (
     callPackage ./adapter.nix {
       # The adapter is meant to be compiled with clang++,
       # based on the provided CMake toolchain files.
       # <https://github.com/vadimcn/codelldb/tree/master/cmake>
       rustPlatform = makeRustPlatform {
-        stdenv = llvmPackages_19.libcxxStdenv;
-        inherit cargo rustc;
+        inherit stdenv cargo rustc;
       };
-      stdenv = llvmPackages_19.libcxxStdenv;
 
       inherit
         pname
         src
         version
         cargoHash
+        stdenv
         ;
     }
   );
@@ -107,13 +107,31 @@ let
   );
 
   codelldb-types = (
-    callPackage ./lldb-types.nix {
+    callPackage ./codelldb-types.nix {
+      rustPlatform = makeRustPlatform {
+        inherit stdenv cargo rustc;
+      };
+
+      inherit
+        pname
+        src
+        version
+        cargoHash
+        ;
+    }
+  );
+
+  codelldb-launch = (
+    callPackage ./codelldb-launch.nix {
+      rustPlatform = makeRustPlatform {
+        inherit stdenv cargo rustc;
+      };
+
       inherit
         pname
         src
         version
         cargoHash
-        nodeDeps
         ;
     }
   );
@@ -132,10 +150,11 @@ lib.customisation.makeOverridable stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    cargo
     makeWrapper
     nodejs
     unzip
+    codelldb-types
+    codelldb-launch
   ];
 
   patches = [ ./patches/cmake-build-extension-only.patch ];
@@ -147,14 +166,6 @@ lib.customisation.makeOverridable stdenv.mkDerivation {
 
   postConfigure = ''
     cp -r ${nodeDeps}/lib/node_modules .
-
-    # Copy pre-built package.json and generated types from codelldb-types
-    cp ${codelldb-types}/package.json .
-    mkdir -p generated
-    cp -r ${codelldb-types}/generated/* generated/
-
-    # Touch the files to ensure they're newer than dependencies
-    touch package.json generated/codelldb.ts
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     export HOME="$TMPDIR/home"
@@ -183,6 +194,11 @@ lib.customisation.makeOverridable stdenv.mkDerivation {
     wrapProgram $ext/adapter/codelldb \
       --prefix LD_LIBRARY_PATH : "$ext/lldb/lib" \
       --set-default LLDB_DEBUGSERVER_PATH "${adapter.lldbServer}"
+
+    # Used by VSCode
+    mkdir -p $ext/bin
+    cp ${codelldb-launch}/bin/codelldb-launch $ext/bin/codelldb-launch
+
     # Mark that all components are installed.
     touch $ext/platform.ok
 
@@ -197,15 +213,15 @@ lib.customisation.makeOverridable stdenv.mkDerivation {
   '';
 
   passthru = {
-    inherit lldb adapter codelldb-types;
+    inherit lldb adapter;
     updateScript = ./update.sh;
   };
 
   meta = {
     description = "Native debugger extension for VSCode based on LLDB";
     homepage = "https://github.com/vadimcn/vscode-lldb";
     license = [ lib.licenses.mit ];
-    maintainers = [ lib.maintainers.r4v3n6101 ];
+    maintainers = [ ];
     platforms = lib.platforms.all;
   };
 }

extensions/vadimcn/vscode-lldb/latest/lldb-types.nix

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 215dd3c..0409d03 100644
+index 3e4f955..2ca59d0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -16,13 +16,6 @@ endif()
@@ -15,54 +15,42 @@ index 215dd3c..0409d03 100644
 -
  set(CMAKE_CTEST_ARGUMENTS "--output-on-failure" CACHE INTERNAL "CTest arguments")
 
- if (CMAKE_SYSROOT)
-@@ -121,30 +114,9 @@ configure_file(webpack.config.mjs ${CMAKE_CURRENT_BINARY_DIR}/webpack.config.mjs
- configure_file(vscode.test.mjs ${CMAKE_CURRENT_BINARY_DIR}/.vscode-test.mjs)
- 
- set(PLATFORM_PACKAGE_URL "https://github.com/vadimcn/codelldb/releases/download/v\${version}/\${platformPackage}" CACHE STRING "")
--configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
--# We still need to resolve codelldb schema $ref's in it, but we'll do this during the build.
--file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_CURRENT_BINARY_DIR}/package.pre.json)
--file(COPY_FILE ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json)
+ set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]")
+@@ -120,12 +113,6 @@ configure_file(package.json ${CMAKE_CURRENT_BINARY_DIR}/package.json @ONLY)
+ # We still need to resolve codelldb schema $ref's in it, but we'll do this during the build.
+ file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package.json ${CMAKE_CURRENT_BINARY_DIR}/package.pre.json)
+ file(COPY_FILE ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json)
 -# Install node_modules
 -execute_process(
 -    COMMAND ${NPM} install
 -    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
 -    COMMAND_ERROR_IS_FATAL ANY
 -)
--# So we can commit any changes
--file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json)
--
--# Generate schema for codelldb types, resolve references to them in package.pre.json yielding the final package.json
--add_custom_command(
--    OUTPUT ${CMAKE_BINARY_DIR}/package.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
--    DEPENDS ${CMAKE_SOURCE_DIR}/package.json ${CMAKE_SOURCE_DIR}/src/codelldb-types/src/lib.rs
+ # So we can commit any changes
+ file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json)
+ 
+@@ -133,7 +120,7 @@ file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json ${CMAKE_CURRENT_SOU
+ add_custom_command(
+     OUTPUT ${CMAKE_BINARY_DIR}/package.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
+     DEPENDS ${CMAKE_SOURCE_DIR}/package.json ${CMAKE_SOURCE_DIR}/src/codelldb-types/src/lib.rs
 -    COMMAND cargo run --package codelldb-types -- ${CMAKE_BINARY_DIR}/codelldb.schema.json
--    COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js
--            ${CMAKE_CURRENT_BINARY_DIR}/package.pre.json ${CMAKE_CURRENT_BINARY_DIR}/package.json
--    COMMAND ${NPM} run json2ts -- ${CMAKE_BINARY_DIR}/codelldb.schema.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
--    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
--    USES_TERMINAL
--)
-+
-+# Nix: package.json and generated/codelldb.ts are provided by the codelldb-types derivation
-+# They are copied into the build directory in postConfigure phase
- add_custom_target(package_json
-     DEPENDS ${CMAKE_BINARY_DIR}/package.json
- )
-@@ -163,6 +135,7 @@ add_custom_target(update_lockfiles
++    COMMAND codelldb-types ${CMAKE_BINARY_DIR}/codelldb.schema.json
+     COMMAND ${WithEnv} NODE_PATH=${CMAKE_CURRENT_BINARY_DIR}/node_modules node ${CMAKE_CURRENT_SOURCE_DIR}/tools/prep-package.js
+             ${CMAKE_CURRENT_BINARY_DIR}/package.pre.json ${CMAKE_CURRENT_BINARY_DIR}/package.json
+     COMMAND ${NPM} run json2ts -- ${CMAKE_BINARY_DIR}/codelldb.schema.json ${CMAKE_BINARY_DIR}/generated/codelldb.ts
+@@ -158,6 +145,7 @@ add_custom_target(update_lockfiles
 
  add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_BINARY_DIR}/README.md)
  add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG.md ${CMAKE_CURRENT_BINARY_DIR}/CHANGELOG.md)
 +add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_BINARY_DIR}/LICENSE)
  add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/lldb.png ${CMAKE_CURRENT_BINARY_DIR}/images/lldb.png)
  add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/user.svg ${CMAKE_CURRENT_BINARY_DIR}/images/user.svg)
  add_copy_file(PackageFiles ${CMAKE_CURRENT_SOURCE_DIR}/images/users.svg ${CMAKE_CURRENT_BINARY_DIR}/images/users.svg)
-@@ -179,6 +152,7 @@ add_custom_target(dev_debugging
+@@ -174,6 +162,7 @@ add_custom_target(dev_debugging
  set(PackagedFilesBootstrap
      README.md
      CHANGELOG.md
 +    LICENSE
      extension.js
      images/*
-     syntaxes/*
+     syntaxes/*

extensions/vadimcn/vscode-lldb/latest/patches/cmake-build-extension-only.patch

@@ -44,6 +44,6 @@ pkgs.vscode-with-extensions.override {
     ))
     ++ (with extensions.vscode-marketplace-universal; [
       # TODO enable after closing https://github.com/nix-community/nix-vscode-extensions/issues/165
-      # vadimcn.vscode-lldb
+      vadimcn.vscode-lldb
     ]);
 }