From 7b47ad2dfd84863fb3a8d4f83e8b93ddd892fa16 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sat, 9 Nov 2024 11:22:40 +0100
Subject: [PATCH] vscode-extensions: set pname

---
 nixos/doc/manual/release-notes/rl-2505.section.md     |  1 +
 .../extensions/rust-lang.rust-analyzer/default.nix    |  3 +--
 .../editors/vscode/extensions/vscode-utils.nix        | 11 +++++++----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 29af283010c9..2e40fb998124 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -24,6 +24,7 @@
   See the release notes of
   [v1.7.0](https://github.com/jtroo/kanata/releases/tag/v1.7.0)
   for more information.
+- `vscode-utils.buildVscodeExtension` now requires pname as an argument
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
diff --git a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
index e937da9c44b3..bcb076135ae1 100644
--- a/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/rust-lang.rust-analyzer/default.nix
@@ -72,8 +72,7 @@ let
   };
 in
 vscode-utils.buildVscodeExtension {
-  inherit version vsix;
-  name = "${pname}-${version}";
+  inherit version vsix pname;
   src = "${vsix}/${pname}.zip";
   vscodeExtUniqueId = "${publisher}.${pname}";
   vscodeExtPublisher = publisher;
diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
index d457b156aa97..bd0390eaa84b 100644
--- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
+++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix
@@ -11,7 +11,7 @@
 let
   buildVscodeExtension =
     a@{
-      name,
+      pname,
       src,
       # Same as "Unique Identifier" on the extension's web page.
       # For the moment, only serve as unique extension dir.
@@ -33,10 +33,13 @@ let
       ...
     }:
     stdenv.mkDerivation (
-      (removeAttrs a [ "vscodeExtUniqueId" ])
+      (removeAttrs a [
+        "vscodeExtUniqueId"
+        "pname"
+      ])
       // {
 
-        name = "vscode-extension-${name}";
+        pname = "vscode-extension-${pname}";
 
         passthru = passthru // {
           inherit vscodeExtPublisher vscodeExtName vscodeExtUniqueId;
@@ -88,7 +91,7 @@ let
         "vsix"
       ])
       // {
-        name = "${mktplcRef.publisher}-${mktplcRef.name}-${mktplcRef.version}";
+        pname = "${mktplcRef.publisher}-${mktplcRef.name}";
         version = mktplcRef.version;
         src = if (vsix != null) then vsix else fetchVsixFromVscodeMarketplace mktplcRef;
         vscodeExtPublisher = mktplcRef.publisher;