diff options
| author | JuliusFreudenberger <julius+git@jfreudenberger.de> | 2025-03-22 19:43:17 +0200 |
|---|---|---|
| committer | JuliusFreudenberger <julius+git@jfreudenberger.de> | 2025-04-04 20:43:15 +0300 |
| commit | fe5f529c0290a6a737059baadfff90295ef40171 (patch) | |
| tree | 845a9aa478bd515abd3e148b15f8bc3890118ad8 | |
| parent | teleport_16: 16.4.17 -> 16.4.18 (diff) | |
| download | nixpkgs-fe5f529c0290a6a737059baadfff90295ef40171.tar.gz | |
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
(cherry picked from commit 277cac41256020ba79775909d9150918ab696d63)
| -rw-r--r-- | pkgs/servers/teleport/17/default.nix | 10 | ||||
| -rw-r--r-- | 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 1e177ba2c856..45d4e519cf33 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 [ |