From 85530321076743c2fb8b194c4fb3492788322c68 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sat, 22 Mar 2025 19:43:08 +0200
Subject: [PATCH 1/2] teleport_16: 16.4.17 -> 16.4.18

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.4.18
Diff: https://github.com/gravitational/teleport/compare/v16.4.17...v16.4.18
---
 pkgs/servers/teleport/16/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix
index 0b85dcc8af44..063b56ec9894 100644
--- a/pkgs/servers/teleport/16/default.nix
+++ b/pkgs/servers/teleport/16/default.nix
@@ -2,10 +2,10 @@ args:
 import ../generic.nix (
   args
   // {
-    version = "16.4.17";
-    hash = "sha256-NLWISsh0zoTn849VK5YL2zxp7zuu7xFqLdbP/cPeNFc=";
-    vendorHash = "sha256-OoGx3ae69NCY6OFs/Ez4Lc8NVcgxl4bRoicFAVHicdQ=";
-    pnpmHash = "sha256-OpCUYn69UNs6cplM74oNO4hQ5wiYBbjqGN3bJfbrsqk=";
-    cargoHash = "sha256-oavJSszi6uWfUIzD+wRZL3wAFgmPvFwGeNHZexOlup4=";
+    version = "16.4.18";
+    hash = "sha256-DpbRfWVsfGpIANs6LMtIPtgsCEt5UMoNBpqelMQF+7s=";
+    vendorHash = "sha256-H7EIt9HImdjSQMCv0Jr4mx3woMA6ZSR7KMpQbKvggZU=";
+    pnpmHash = "sha256-LHdX7Vo4neaN+SNrh/De3n/0mR6ZgGvJzNKcxOOHpZA=";
+    cargoHash = "sha256-NASNBk4QVoqe2cz4l94aXo6pUtF8Qxwb61XRI/ErjTs=";
   }
 )

From 277cac41256020ba79775909d9150918ab696d63 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sat, 22 Mar 2025 19:43:17 +0200
Subject: [PATCH 2/2] teleport_17: 17.3.3 -> 17.4.0

Changelog: https://github.com/gravitational/teleport/releases/tag/v17.3.4 https://github.com/gravitational/teleport/releases/tag/v17.4.0
Diff: https://github.com/gravitational/teleport/compare/v17.3.3...v17.4.0
---
 pkgs/servers/teleport/17/default.nix | 10 +++++-----
 pkgs/servers/teleport/generic.nix    | 19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix
index 20c78bf0dead..b9ddbff587bd 100644
--- a/pkgs/servers/teleport/17/default.nix
+++ b/pkgs/servers/teleport/17/default.nix
@@ -2,10 +2,10 @@
 import ../generic.nix (
   args
   // {
-    version = "17.3.3";
-    hash = "sha256-COvVkZN0ekuFEeCmFChHRiGS6ILtYAG4VM98DOKnnFc=";
-    vendorHash = "sha256-JO7wDDQLK9NE8OZla0VT/EKMV6YvdImoJWZPten42Z8=";
-    pnpmHash = "sha256-74hX508HQDEx6iWe1LHALBL8xwwgeDXGHog5RHFBud8=";
-    cargoHash = "sha256-FiPfeDnb/FTemE1ZO2Ydg2KUjNmw7U3SCNu6cOqalOM=";
+    version = "17.4.0";
+    hash = "sha256-O/JMv757DcO7x8Lh5cMeoa1GPvtQETxUlW2meMSSoM0=";
+    vendorHash = "sha256-C2YpZr9baUUE3pPHXNCIppujYQkioC9DWzSqeigmzmE=";
+    pnpmHash = "sha256-Hh4R+mkJJp9CR4NHw+VFzLPxb7e9T1BQkey0in2t934=";
+    cargoHash = "sha256-0PT9y56V/WHo3M5TcpVWBuHcQMZ0w2L4rEuXuTvVNFU=";
   }
 )
diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix
index f8d7c6bda924..d206dc1512ac 100644
--- a/pkgs/servers/teleport/generic.nix
+++ b/pkgs/servers/teleport/generic.nix
@@ -15,6 +15,7 @@
   openssl,
   pkg-config,
   pnpm_9,
+  pnpm_10,
   rustc,
   Security,
   stdenv,
@@ -91,10 +92,16 @@ let
 
     pnpmDeps =
       if pnpmHash != null then
-        pnpm_9.fetchDeps {
-          inherit src pname version;
-          hash = pnpmHash;
-        }
+        if lib.versionAtLeast version "17" then
+          pnpm_10.fetchDeps {
+            inherit src pname version;
+            hash = pnpmHash;
+          }
+        else
+          pnpm_9.fetchDeps {
+            inherit src pname version;
+            hash = pnpmHash;
+          }
       else
         null;
 
@@ -111,7 +118,9 @@ let
         wasm-pack
       ]
       ++ (
-        if lib.versionAtLeast version "16" then
+        if lib.versionAtLeast version "17" then
+          [ pnpm_10.configHook ]
+        else if lib.versionAtLeast version "16" then
           [ pnpm_9.configHook ]
         else
           [