From 75a4674be1ff568646dde0bd23dca3d34d69378d Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Fri, 25 Jun 2021 10:55:11 +0800
Subject: [PATCH 1/2] vscode-extensions.vadimcn.vscode-lldb: normalize name and
 version

---
 pkgs/misc/vscode-extensions/vscode-lldb/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
index 444f5a681216..f82a42886251 100644
--- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
+++ b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
@@ -7,6 +7,8 @@ let
   pname = "vscode-lldb";
   version = "1.6.4";
 
+  vscodeExtUniqueId = "${publisher}.${pname}";
+
   src = fetchFromGitHub {
     owner = "vadimcn";
     repo = "vscode-lldb";
@@ -41,10 +43,10 @@ let
 
   nodeDeps = nodePackages."vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps";
 
-in stdenv.mkDerivation rec {
-  name = "vscode-extension-${pname}";
-  inherit src;
-  vscodeExtUniqueId = "${publisher}.${pname}";
+in stdenv.mkDerivation {
+  pname = "vscode-extension-${publisher}-${pname}";
+  inherit src version vscodeExtUniqueId;
+
   installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}";
 
   nativeBuildInputs = [ cmake nodejs unzip makeWrapper ];

From 65196202893fcbe707d38bd3beb4290afd604db7 Mon Sep 17 00:00:00 2001
From: oxalica <oxalicc@pm.me>
Date: Fri, 25 Jun 2021 14:50:10 +0800
Subject: [PATCH 2/2] vscode-extensions.vadimcn.vscode-lldb: 1.6.4 -> 1.6.5

---
 pkgs/development/node-packages/node-packages.nix            | 2 +-
 .../vscode-extensions/vscode-lldb/build-deps/package.json   | 2 +-
 pkgs/misc/vscode-extensions/vscode-lldb/default.nix         | 6 +++---
 pkgs/misc/vscode-extensions/vscode-lldb/update.sh           | 3 +++
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index b18d1b290f84..92a931bd4bba 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -114043,7 +114043,7 @@ in
   "vscode-lldb-build-deps-../../misc/vscode-extensions/vscode-lldb/build-deps" = nodeEnv.buildNodePackage {
     name = "vscode-lldb";
     packageName = "vscode-lldb";
-    version = "1.6.4";
+    version = "1.6.5";
     src = ../../misc/vscode-extensions/vscode-lldb/build-deps;
     dependencies = [
       sources."@discoveryjs/json-ext-0.5.3"
diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json
index 1b1c61d642c2..86d7b1aa6fa4 100644
--- a/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json
+++ b/pkgs/misc/vscode-extensions/vscode-lldb/build-deps/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vscode-lldb",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "dependencies": {
     "string-argv": "^0.3.1",
     "yaml": "^1.10.0",
diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix b/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
index f82a42886251..0ef98818dbd1 100644
--- a/pkgs/misc/vscode-extensions/vscode-lldb/default.nix
+++ b/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.4";
+  version = "1.6.5";
 
   vscodeExtUniqueId = "${publisher}.${pname}";
 
@@ -13,7 +13,7 @@ let
     owner = "vadimcn";
     repo = "vscode-lldb";
     rev = "v${version}";
-    sha256 = "sha256-utElXMAJG8X7jFmY/oyrWOCkOiNG3jZHrf04vTBTi7M=";
+    sha256 = "sha256-ppiEWFKJiUtlF8LSqBb8Xvg26B+wHcIZJhU+ANE4J2k=";
   };
 
   lldb = callPackage ./lldb.nix {};
@@ -25,7 +25,7 @@ let
     # It will pollute the build environment of `buildRustPackage`.
     cargoPatches = [ ./reset-cargo-config.patch ];
 
-    cargoSha256 = "sha256-ZbD/+QWvpi88bHoSvDG0FKcsTsnthYR1SYkkJhqBbbU=";
+    cargoSha256 = "sha256-ksRFlbtrFAbcX/Pc6rgWUHVl859GVUOvNckxM7Q971U=";
 
     nativeBuildInputs = [ makeWrapper ];
 
diff --git a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh
index 34bb5dbc33d5..8511ea3b12ed 100755
--- a/pkgs/misc/vscode-extensions/vscode-lldb/update.sh
+++ b/pkgs/misc/vscode-extensions/vscode-lldb/update.sh
@@ -30,6 +30,9 @@ 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