From 9b8bcfcf158a405332f91483b941a892aaf498d2 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Mon, 2 Jan 2023 22:44:01 +0200 Subject: [PATCH] teleport: 10.3.1 -> 11.1.4 --- .../from_md/release-notes/rl-2305.section.xml | 10 ++++++++++ nixos/doc/manual/release-notes/rl-2305.section.md | 2 ++ pkgs/servers/teleport/default.nix | 14 +++++++------- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml index ea3be31a2060..4bc7a3b1f331 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2305.section.xml @@ -211,6 +211,16 @@ stage-2. + + + teleport has been upgraded to major version + 11. Please see upstream + upgrade + instructions and + release + notes. + + The EC2 image module previously detected and activated diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index df0ec622e56e..a9c8aca8df30 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -57,6 +57,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The EC2 image module previously detected and automatically mounted ext3-formatted instance store devices and partitions in stage-1 (initramfs), storing `/tmp` on the first discovered device. This behaviour, which only catered to very specific use cases and could not be disabled, has been removed. Users relying on this should provide their own implementation, and probably use ext4 and perform the mount in stage-2. +- `teleport` has been upgraded to major version 11. Please see upstream [upgrade instructions](https://goteleport.com/docs/setup/operations/upgrading/) and [release notes](https://goteleport.com/docs/changelog/#1100). + - The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation. - Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually. diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 8cc67a1ff6ec..ac08b5958231 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -23,13 +23,13 @@ let owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - hash = "sha256-F5v3/eKPLhSxW7FImTbE+QMtfn8w5WVTrxMWhgNr3YA="; + hash = "sha256-8S+r5pd8icOljGkxqLsZKmh4+nIwPQErs7RK88q0vOQ="; }; - version = "10.3.1"; + version = "11.1.4"; rdpClient = rustPlatform.buildRustPackage rec { pname = "teleport-rdpclient"; - cargoHash = "sha256-Xmabjoq1NXxXemeR06Gg8R/HwdSE+rsxxX645pQ3SuI="; + cargoHash = "sha256-XuJTdpb2eIeXnVtuSOlHjZQ8PpwxK4/4siK2S2h6xIw="; inherit version src; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; @@ -53,16 +53,16 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - # Submodule rev from https://github.com/gravitational/teleport/tree/v10.3.1 - rev = "6710dcd0dc19ad101bac3259c463ef940f2ab1f3"; - hash = "sha256-A13FSpgJODmhugAwy4kqiDw4Rihr//DhQX/bjwaeo2A="; + # Submodule rev from https://github.com/gravitational/teleport/tree/v11.1.4 + rev = "5f2597d5987804d37e61da8ae9d1a5a2d6b43ef4"; + hash = "sha256-meRinI4VsJuRoJznVULHL38bUIu352lf5LRPLlef1OA="; }; in buildGoModule rec { pname = "teleport"; inherit src version; - vendorHash = "sha256-2Zrd3CbZvxns9lNVtwaaor1mi97IhPc+MRJhj3rU760="; + vendorHash = "sha256-nlwBjeh0BlZ3vUQxvaYW0aK5Y2YK1gEar9s1IMJJEMY="; subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; tags = [ "libfido2" "webassets_embed" ]