From ce01f3c7c95964758573f4bd03bb995c46a9a334 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Thu, 20 Feb 2025 15:18:31 +0200 Subject: [PATCH 1/4] teleport_15: 15.4.26 -> 15.4.29 (cherry picked from commit 8d62b09309bee7d119508190e4f712041265a5d6) --- pkgs/servers/teleport/15/default.nix | 16 ++++++++-------- pkgs/servers/teleport/default.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/teleport/15/default.nix b/pkgs/servers/teleport/15/default.nix index 0c9262d8741780..44bd66455a5fc9 100644 --- a/pkgs/servers/teleport/15/default.nix +++ b/pkgs/servers/teleport/15/default.nix @@ -2,16 +2,16 @@ import ../generic.nix ( args // { - version = "15.4.26"; - hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o="; - vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA="; - yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY="; - cargoHash = "sha256-IQi11Hpavj4pImwjxU6uoHQ+vjwc/++NuWXREcIKH3s="; + version = "15.4.29"; + hash = "sha256-FL7u7icwTS8V7ZodKjN/9vRTzXgJ0MCRgAz23eA+kfA="; + vendorHash = "sha256-LL18GI5w9kJdBJf2al9rK3dBwib2mLG/deZgSsmZv0U="; + yarnHash = "sha256-63JX0rAMyZA58CdaqHlTXlL7npvKcYnhVIh1NaJEmBk="; + cargoHash = "sha256-2lIhtIWl26xoH7XxhPEmG/2FpfwgTC7kmahCim1W4To="; wasm-bindgen-cli = wasm-bindgen-cli.override { - version = "0.2.92"; - hash = "sha256-1VwY8vQy7soKEgbki4LD+v259751kKxSxmo/gqE6yV0="; - cargoHash = "sha256-aACJ+lYNEU8FFBs158G1/JG8sc6Rq080PeKCMnwdpH0="; + version = "0.2.100"; + hash = "sha256-3RJzK7mkYFrs7C/WkhW9Rr4LdP5ofb2FdYGz1P7Uxog="; + cargoHash = "sha256-tD0OY2PounRqsRiFh8Js5nyknQ809ZcHMvCOLrvYHRE="; }; } ) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 7c8df38e616ad0..5b768d023a4361 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -11,7 +11,7 @@ let teleport_15 = import ./15 ( args // { - buildGoModule = buildGo122Module; + buildGoModule = buildGo123Module; } ); teleport_16 = import ./16 ( From f27d8fa47e9f9f66783ccddf9df59b14ce6209de Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Thu, 20 Feb 2025 15:19:30 +0200 Subject: [PATCH 2/4] teleport_16: 16.4.14 -> 16.4.16 (cherry picked from commit 2c8f17bd418c0f14016a8b44753ba6ab9fe6c663) --- pkgs/servers/teleport/16/default.nix | 10 +++++----- pkgs/servers/teleport/default.nix | 4 +--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/servers/teleport/16/default.nix b/pkgs/servers/teleport/16/default.nix index b73f0b52273706..bd6984998ab52b 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.14"; - hash = "sha256-9X4PLN5y1pJMNGL7o+NR/b3yUYch/VVEMmGmWbEO1CA="; - vendorHash = "sha256-nJdtllxjem+EA77Sb1XKmrAaWh/8WrL3AuvVxgBRkxI="; - pnpmHash = "sha256-+eOfGS9m3c9i7ccOS8q6KM0IrBIJZKlxx7h3qqxTJHE="; - cargoHash = "sha256-6JYSW65ou8iC4/7AJVZ9+vpItxpJtaGFA4Nm3fgyHIs="; + version = "16.4.16"; + hash = "sha256-0nag5T+qv00uA//N9ZDuCqarCfXYn76Ycxd97FfILpE="; + vendorHash = "sha256-5fSMbmvnbJ4zQuTBsmN/Ym3syn819hRmxv0aRzDnRFU="; + pnpmHash = "sha256-OpCUYn69UNs6cplM74oNO4hQ5wiYBbjqGN3bJfbrsqk="; + cargoHash = "sha256-oavJSszi6uWfUIzD+wRZL3wAFgmPvFwGeNHZexOlup4="; # 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/default.nix b/pkgs/servers/teleport/default.nix index 5b768d023a4361..704f5279923dff 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -1,7 +1,6 @@ { callPackages, lib, - buildGo122Module, buildGo123Module, ... }@args: @@ -17,7 +16,7 @@ let teleport_16 = import ./16 ( args // { - buildGoModule = buildGo122Module; + buildGoModule = buildGo123Module; } ); teleport = teleport_16; @@ -34,7 +33,6 @@ in callPackages f' ( builtins.removeAttrs args [ "callPackages" - "buildGo122Module" "buildGo123Module" ] ) From 69897311181d9b1ca02901f60980cc773791fd8f Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Thu, 20 Feb 2025 15:19:55 +0200 Subject: [PATCH 3/4] teleport_17: 17.2.1 -> 17.2.8 (cherry picked from commit d05cf7637e854beeec3f5849558a5a47b434ff84) --- pkgs/servers/teleport/17/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix index c93f925af28894..67c6b563d0bb4e 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.1"; - hash = "sha256-QlBj3zGnELgQJMIMSZK1YVE3H2hO09Xgdtcw0BML7KQ="; - vendorHash = "sha256-Y3og6oifpQIZxkKR1qgD3l06YaCFpSlh/+jN3w0gq7M="; - pnpmHash = "sha256-ChRWq0acDzHhm6JK2W3V6LZHlq4vXMxa1AMqiCPIouc="; - cargoHash = "sha256-GDwH/2aiqvTbLC8/x/n0yLuU8IEBVpyacN2B+EGwBgE="; + version = "17.2.8"; + hash = "sha256-VjYC5q4hYU+YYW4sgPDpdHKoD4CJtGvIGWSOUGZ5hpQ="; + vendorHash = "sha256-i/U1Zy8wEfhLet9FSj/z9lvWE8gI6Hpz/5GZYbmu1j4="; + pnpmHash = "sha256-wiLpxIxqIYM/DDW9DpUyIvt+5Vf51uVceRxVGA2q9wI="; + cargoHash = "sha256-FiPfeDnb/FTemE1ZO2Ydg2KUjNmw7U3SCNu6cOqalOM="; } ) From 0cf4d1d3c49a3bef610d985e257b99cebf138ad5 Mon Sep 17 00:00:00 2001 From: JuliusFreudenberger Date: Thu, 27 Feb 2025 12:36:54 +0200 Subject: [PATCH 4/4] teleport_17: 17.2.8 -> 17.2.9 Changelog: https://github.com/gravitational/teleport/releases/tag/v17.2.9 Diff: https://github.com/gravitational/teleport/compare/v17.2.8...v17.2.9 (cherry picked from commit cd0b20bac0697133421f0ecdff1913da8d8952f7) --- pkgs/servers/teleport/17/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix index 67c6b563d0bb4e..e35240ef82a3ff 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.8"; - hash = "sha256-VjYC5q4hYU+YYW4sgPDpdHKoD4CJtGvIGWSOUGZ5hpQ="; - vendorHash = "sha256-i/U1Zy8wEfhLet9FSj/z9lvWE8gI6Hpz/5GZYbmu1j4="; - pnpmHash = "sha256-wiLpxIxqIYM/DDW9DpUyIvt+5Vf51uVceRxVGA2q9wI="; + version = "17.2.9"; + hash = "sha256-4NOPNw5Hpb2V/M7y+tycCAdNPa/iKKoRdDO1kB3kkjo="; + vendorHash = "sha256-+nmkpUz1gT6qWNz9t2H1Txx1hl+37zXve9G45hEZMDU="; + pnpmHash = "sha256-6ziUPx5sNoMUe3fmzsPwddzNdL9Up6JlBkvq2lE6o5I="; cargoHash = "sha256-FiPfeDnb/FTemE1ZO2Ydg2KUjNmw7U3SCNu6cOqalOM="; } )