diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2025-04-21 21:18:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-21 21:18:56 +0200 |
| commit | 539baab13f31d87e4bfad330adf561455be0c951 (patch) | |
| tree | 56a5496a50a1215402ec87d75172554a96da3feb | |
| parent | [Backport 400164 to release 24.11] doc: cleanup (#400470) (diff) | |
| parent | teleport_17: 17.4.1 -> 17.4.2 (diff) | |
| download | nixpkgs-539baab13f31d87e4bfad330adf561455be0c951.tar.gz | |
[Backport 24.11] teleport_17: 17.2.9 -> 17.4.2; teleport_16: 16.4.16 -> 16.5.0; teleport_15: 15.4.29 -> 15.4.30 (#396588)
| -rw-r--r-- | pkgs/servers/teleport/15/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/teleport/16/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/teleport/17/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/teleport/generic.nix | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix index 44bd66455a5f..d3a0133b6ac2 100644 --- a/pkgs/servers/teleport/15/default.nix +++ b/pkgs/servers/teleport/15/default.nix @@ -2,9 +2,9 @@ import ../generic.nix ( args // { - version = "15.4.29"; - hash = "sha256-FL7u7icwTS8V7ZodKjN/9vRTzXgJ0MCRgAz23eA+kfA="; - vendorHash = "sha256-LL18GI5w9kJdBJf2al9rK3dBwib2mLG/deZgSsmZv0U="; + version = "15.4.30"; + hash = "sha256-qLGlhCDfIPVJfKI37Wv2XNl5tdloq48wJu8V/ww0yHc="; + vendorHash = "sha256-aM7VYauCC6zytFELKNyUa30H17ErFmBkyEr+eDoF92g="; yarnHash = "sha256-63JX0rAMyZA58CdaqHlTXlL7npvKcYnhVIh1NaJEmBk="; cargoHash = "sha256-2lIhtIWl26xoH7XxhPEmG/2FpfwgTC7kmahCim1W4To="; diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index bd6984998ab5..ff974bc7ae52 100644 --- a/pkgs/servers/teleport/16/default.nix +++ b/pkgs/servers/teleport/16/default.nix @@ -2,11 +2,11 @@ import ../generic.nix ( args // { - version = "16.4.16"; - hash = "sha256-0nag5T+qv00uA//N9ZDuCqarCfXYn76Ycxd97FfILpE="; - vendorHash = "sha256-5fSMbmvnbJ4zQuTBsmN/Ym3syn819hRmxv0aRzDnRFU="; - pnpmHash = "sha256-OpCUYn69UNs6cplM74oNO4hQ5wiYBbjqGN3bJfbrsqk="; - cargoHash = "sha256-oavJSszi6uWfUIzD+wRZL3wAFgmPvFwGeNHZexOlup4="; + version = "16.5.0"; + hash = "sha256-d634UB/YGDdAeBEJcRsRE5gqd31oQX3P4HJ+PoMQUmk="; + vendorHash = "sha256-0/ZYG8mYv3B0YJ89NJVG7M29/hU2zBtSXmoD32VEqpk="; + pnpmHash = "sha256-dqCfwMzSnEPQXz1bsroqSihkvw2Kcvyz+A4fpa52LVk="; + cargoHash = "sha256-NASNBk4QVoqe2cz4l94aXo6pUtF8Qxwb61XRI/ErjTs="; # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock wasm-bindgen-cli = wasm-bindgen-cli.override { diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix index e35240ef82a3..4907b21d80a1 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.2.9"; - hash = "sha256-4NOPNw5Hpb2V/M7y+tycCAdNPa/iKKoRdDO1kB3kkjo="; - vendorHash = "sha256-+nmkpUz1gT6qWNz9t2H1Txx1hl+37zXve9G45hEZMDU="; - pnpmHash = "sha256-6ziUPx5sNoMUe3fmzsPwddzNdL9Up6JlBkvq2lE6o5I="; - cargoHash = "sha256-FiPfeDnb/FTemE1ZO2Ydg2KUjNmw7U3SCNu6cOqalOM="; + version = "17.4.2"; + hash = "sha256-hiitFUN7bJR68sh/HrWsQMUm1lM2J3yjSoIT7mv/ldo="; + vendorHash = "sha256-03qkUH7UfAF0FwbG5enKf9Ke1teN89vmzk8yRfGvmPg="; + 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..09113353aa3d 100644 --- a/pkgs/servers/teleport/generic.nix +++ b/pkgs/servers/teleport/generic.nix @@ -14,7 +14,7 @@ nodejs, openssl, pkg-config, - pnpm_9, + pnpm_10, rustc, Security, stdenv, @@ -91,7 +91,7 @@ let pnpmDeps = if pnpmHash != null then - pnpm_9.fetchDeps { + pnpm_10.fetchDeps { inherit src pname version; hash = pnpmHash; } @@ -112,7 +112,7 @@ let ] ++ ( if lib.versionAtLeast version "16" then - [ pnpm_9.configHook ] + [ pnpm_10.configHook ] else [ yarn |
