diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index 063b56ec9894..e11c6eaf0d8d 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.18"; - hash = "sha256-DpbRfWVsfGpIANs6LMtIPtgsCEt5UMoNBpqelMQF+7s="; - vendorHash = "sha256-H7EIt9HImdjSQMCv0Jr4mx3woMA6ZSR7KMpQbKvggZU="; - pnpmHash = "sha256-LHdX7Vo4neaN+SNrh/De3n/0mR6ZgGvJzNKcxOOHpZA="; + version = "16.5.0"; + hash = "sha256-d634UB/YGDdAeBEJcRsRE5gqd31oQX3P4HJ+PoMQUmk="; + vendorHash = "sha256-0/ZYG8mYv3B0YJ89NJVG7M29/hU2zBtSXmoD32VEqpk="; + pnpmHash = "sha256-dqCfwMzSnEPQXz1bsroqSihkvw2Kcvyz+A4fpa52LVk="; cargoHash = "sha256-NASNBk4QVoqe2cz4l94aXo6pUtF8Qxwb61XRI/ErjTs="; } ) diff --git a/pkgs/servers/teleport/generic.nix b/pkgs/servers/teleport/generic.nix index d206dc1512ac..b09fbb4caf8b 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -14,7 +14,6 @@ nodejs, openssl, pkg-config, - pnpm_9, pnpm_10, rustc, Security, @@ -92,16 +91,10 @@ let pnpmDeps = if pnpmHash != null then - 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; - } + pnpm_10.fetchDeps { + inherit src pname version; + hash = pnpmHash; + } else null; @@ -118,10 +111,8 @@ let wasm-pack ] ++ ( - if lib.versionAtLeast version "17" then + if lib.versionAtLeast version "16" then [ pnpm_10.configHook ] - else if lib.versionAtLeast version "16" then - [ pnpm_9.configHook ] else [ yarn