fix(flake): make nix-dev a path input instead of local import

Use a proper flake input declaration:
  inputs.nix-dev.url = "path:./nix-dev";

This change prevents downstream consumers from hitting
"path '/nix/store/...-nix-dev' is not valid" during flake evaluation.
It also preserves the original inputsCombined logic.

Fixes #149

Author: ohbe1jacobi

data/cache/open-vsx-latest.json

@@ -32,9 +32,19 @@ in
 
   vadimcn.vscode-lldb =
     config@{ mktplcRef, ... }:
-    if lib.versionAtLeast mktplcRef.version "1.11.0" then
-      # https://github.com/NixOS/nixpkgs/pull/383013
+    let
+      lowestSupportedVersion = "1.11.7";
+    in
+    if lib.versionAtLeast mktplcRef.version lowestSupportedVersion then
+      # https://github.com/nix-community/nix-vscode-extensions/pull/151
       callPackage ./vadimcn/vscode-lldb/latest config
     else
-      callPackage ./vadimcn/vscode-lldb/1.10.0 config;
+      throw ''
+        The version `${mktplcRef.version}` of `vadimcn.vscode-lldb` is unsupported.
+         
+        Only versions greater or equal to `${lowestSupportedVersion}` are supported.
+
+        Try `extensions.${pkgs.stdenv.hostPlatform.system}.vscode-marketplace-universal.vadimcn.vscode-lldb`
+        or  `extensions.${pkgs.stdenv.hostPlatform.system}.open-vsx-universal.vadimcn.vscode-lldb`.
+      '';
 }

data/cache/vscode-marketplace-latest.json

@@ -33,58 +33,27 @@ let
   # nix-repl> :lf nixpkgs
   # nix-repl> pkgs = legacyPackages.${builtins.currentSystem}
 
-  # - Build `f` with the version and the hash of the `src` of the new version.
-  # - Use the `got:` hash.
-
-  # Hashes of the source code in releases (https://github.com/vadimcn/codelldb/releases)
-  # nix-repl> rev = "1.11.6"
+  # Get the hash of a source code in a release (https://github.com/vadimcn/codelldb/releases)
+  #
+  # nix-repl> rev = "1.11.7"
   # nix-repl> src = pkgs.fetchFromGitHub { owner = "vadimcn"; repo = "codelldb"; rev = "v${rev}"; hash = ""; }
   # nix-repl> :b src
   #
-  # copy the hash that you got
-  #
-  # nix-repl> src = pkgs.fetchFromGitHub { owner = "vadimcn"; repo = "codelldb"; rev = "v${rev}"; hash = "sha256-uqvcixxJduF1l/qgt2rIACNsPcH1REiVwRz3zZBA82Q="; }
-  hash =
-    {
-      "1.11.0" = "sha256-BzLKRs1fbLN4XSltnxPsgUG7ZJSMz/yJ/jQDZ9OTVxY=";
-      "1.11.1" = "sha256-b063cCuiDpaeSSWxY0sbKsZucY7BCxI5s+35soJRFFQ=";
-      "1.11.2" = "sha256-wj0X7nAcMU+kwl2qQRKixF+kTbTlnpgU7BYwaibIIKQ=";
-      "1.11.3" = "sha256-zqaJzRTYc2gsipnbn4t16u62C/gkIohenWJDTEvZRvU=";
-      "1.11.4" = "sha256-+Pe7ij5ukF5pLgwvr+HOHjIv1TQDiPOEeJtkpIW9XWI=";
-      "1.11.5" = "sha256-mp50QmYmqMjIUfGKAt8fWcov4Bn9ruya+SwXGT3T/zk=";
-      "1.11.6" = "sha256-uqvcixxJduF1l/qgt2rIACNsPcH1REiVwRz3zZBA82Q=";
-    }
-    .${version};
+  # Write here the hash that you `got:`.
+  hash = "sha256-qbpl+/GsMjhs7xZdt8r3CM5gYOowBlu/yCd5RmU2eXE=";
+
+  # Write here the hash from above.
+  # nix-repl> src = pkgs.fetchFromGitHub { owner = "vadimcn"; repo = "codelldb"; rev = "v${rev}"; hash = "sha256-qbpl+/GsMjhs7xZdt8r3CM5gYOowBlu/yCd5RmU2eXE="; }
 
   # nix-repl> :b pkgs.rustPlatform.buildRustPackage { cargoHash = ""; name = "dummy"; inherit src; useFetchCargoVendor = true; }
   #
-  # add here the cargoHash that you got.
-  cargoHash =
-    {
-      "1.11.0" = "sha256-cLmL+QnFh2HwS2FcKTmGYI1NsrGV7MLWf3UBhNzBo0g=";
-      "1.11.1" = "sha256-HFu3u/DX+SOIwwgk7+2EbQZ1tp9yqaV1CxiCN1PgXwM=";
-      "1.11.2" = "sha256-Bl7bD+ulRJkeTdzyS8T/eMBmFaeqgMFFg3OTwSfo/RY=";
-      "1.11.3" = "sha256-Nh4YesgWa1JR8tLfrIRps9TBdsAfilXu6G2/kB08co8=";
-      "1.11.4" = "sha256-Nh4YesgWa1JR8tLfrIRps9TBdsAfilXu6G2/kB08co8=";
-      "1.11.5" = "sha256-nTQbgYDDDI+pnKpCAUWDtk5rujjlK+7ZLUgPp1C/foo=";
-      "1.11.6" = "sha256-jAr/5wW9Vy2xfgHKeJGz/vuIRuouVAGH3XHFdQ34x4A=";
-    }
-    .${version};
+  # Write here the hash that you `got:`.
+  cargoHash = "sha256-jAr/5wW9Vy2xfgHKeJGz/vuIRuouVAGH3XHFdQ34x4A=";
 
   # nix-repl> :b pkgs.buildNpmPackage { npmDepsHash = ""; name = "dummy"; inherit src; dontNpmBuild = true; }
   #
-  # add here the npmDepsHash that you got.
-  npmDepsHash =
-    {
-      "1.11.0" = "sha256-JRLXPsru+4cJe/WInYSr57+Js7mohL1CMR9LLCXORDg=";
-      "1.11.1" = "sha256-4CCvOh7XOUsdI/gzDfx0OwzE7rhdCYFO49wVv6Gn/J0=";
-      "1.11.2" = "sha256-oqRV9oDYPJkSkvYJA0jCgDyfzy6AnYq/ftRPM3swDyE=";
-      "1.11.3" = "sha256-Efeun7AFMAnoNXLbTGH7OWHaBHT2tO9CodfjKrIYw40=";
-      "1.11.4" = "sha256-Efeun7AFMAnoNXLbTGH7OWHaBHT2tO9CodfjKrIYw40=";
-      "1.11.5" = "sha256-mHSY4LqcQiaVs6qvusxjybdKyrMh9sQatBanpIo6xk4=";
-      "1.11.6" = "sha256-cS7Fr4mrq0QIPFtG5VjLEOOiC2QuVDW+Ispt2LmI258=";
-    }
-    .${version};
+  # Write here the hash that you `got:`.
+  npmDepsHash = "sha256-cS7Fr4mrq0QIPFtG5VjLEOOiC2QuVDW+Ispt2LmI258=";
 
   src = fetchFromGitHub {
     owner = "vadimcn";
@@ -125,6 +94,18 @@ let
         ;
     }
   );
+
+  codelldb-types = (
+    callPackage ./lldb-types.nix {
+      inherit
+        pname
+        src
+        version
+        cargoHash
+        nodeDeps
+        ;
+    }
+  );
 in
 lib.customisation.makeOverridable stdenv.mkDerivation {
   pname = "vscode-extension-${publisher}-${pname}";
@@ -155,6 +136,14 @@ 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"
@@ -197,7 +186,7 @@ lib.customisation.makeOverridable stdenv.mkDerivation {
   '';
 
   passthru = {
-    inherit lldb adapter;
+    inherit lldb adapter codelldb-types;
     updateScript = ./update.sh;
   };
 

extensions/default.nix

@@ -0,0 +1,58 @@
+{
+  rustPlatform,
+  nodejs,
+  nodeDeps,
+  stdenv,
+
+  pname,
+  src,
+  version,
+
+  cargoHash,
+}:
+# codelldb-types.nix
+rustPlatform.buildRustPackage {
+  pname = "${pname}-types";
+  inherit version src cargoHash;
+
+  nativeBuildInputs = [ nodejs ];
+
+  buildAndTestSubdir = "src/codelldb-types";
+  cargoBuildFlags = [ "--bin=codelldb-types" ];
+
+  # Don't run normal install - we need custom workflow
+  dontCargoInstall = true;
+
+  postBuild = ''
+    # Go back to the workspace root
+    cd $NIX_BUILD_TOP/source
+
+    # The binary is in target/<rust-target>/release/codelldb-types
+    RUST_TARGET="${stdenv.hostPlatform.rust.rustcTarget}"
+    CODELLDB_TYPES_BIN="./target/$RUST_TARGET/release/codelldb-types"
+
+    echo "Looking for binary at: $CODELLDB_TYPES_BIN"
+    ls -la $CODELLDB_TYPES_BIN
+
+    # Generate schema by running codelldb-types
+    $CODELLDB_TYPES_BIN codelldb.schema.json
+
+    # Copy node_modules for prep-package.js
+    cp -r ${nodeDeps}/lib/node_modules .
+
+    # Process package.json (substitute @VERSION@ with actual version)
+    sed "s/@VERSION@/${version}/g" package.json > package.pre.json
+    node tools/prep-package.js package.pre.json package.json
+
+    # Generate TypeScript types
+    mkdir -p generated
+    npm run json2ts -- codelldb.schema.json generated/codelldb.ts
+
+  '';
+
+  installPhase = ''
+    mkdir -p $out
+    cp package.json $out/
+    cp -r generated $out/
+  '';
+}

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

@@ -1,14 +1,16 @@
 {
+  lib,
   buildNpmPackage,
 
+  stdenv,
   libsecret,
   python3,
   pkg-config,
+  clang_20,
 
   pname,
   src,
   version,
-
   npmDepsHash,
 }:
 buildNpmPackage {
@@ -20,7 +22,8 @@ buildNpmPackage {
   nativeBuildInputs = [
     python3
     pkg-config
-  ];
+  ]
+  ++ lib.optionals stdenv.isDarwin [ clang_20 ];
 
   buildInputs = [ libsecret ];
 

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

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d51dfad..2b2e492 100644
+index 0132c82..83e871c 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -16,13 +16,6 @@ endif()
@@ -15,11 +15,15 @@ index d51dfad..2b2e492 100644
 -
  set(CMAKE_CTEST_ARGUMENTS "--output-on-failure" CACHE INTERNAL "CTest arguments")
 
- if (CMAKE_SYSROOT)
-@@ -125,15 +118,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)
+ set(TEST_TIMEOUT 5000 CACHE STRING "Test timeout [ms]")
+@@ -116,33 +109,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)
 -# Install node_modules
 -execute_process(
 -    COMMAND ${NPM} install
@@ -29,18 +33,35 @@ index d51dfad..2b2e492 100644
 -if (NOT ${Result} EQUAL 0)
 -    message(FATAL_ERROR "npm install failed: ${Result}")
 -endif()
- # So we can commit any changes
- file(COPY_FILE ${CMAKE_CURRENT_BINARY_DIR}/package-lock.json ${CMAKE_CURRENT_SOURCE_DIR}/package-lock.json)
- 
-@@ -166,6 +150,7 @@ add_custom_target(update_lockfiles
+-# 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
+-    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
+ )
+@@ -161,6 +130,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)
-@@ -182,6 +167,7 @@ add_custom_target(dev_debugging
+@@ -177,6 +147,7 @@ add_custom_target(dev_debugging
  set(PackagedFilesBootstrap
      README.md
      CHANGELOG.md