lol

Merge pull request #208804 from justinas/teleport-11

authored by

Sandro and committed by
GitHub
d12f8d56 a3c80e7c

+19 -7
+10
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
··· 272 272 </listitem> 273 273 <listitem> 274 274 <para> 275 + <literal>teleport</literal> has been upgraded to major version 276 + 11. Please see upstream 277 + <link xlink:href="https://goteleport.com/docs/setup/operations/upgrading/">upgrade 278 + instructions</link> and 279 + <link xlink:href="https://goteleport.com/docs/changelog/#1100">release 280 + notes</link>. 281 + </para> 282 + </listitem> 283 + <listitem> 284 + <para> 275 285 The EC2 image module previously detected and activated 276 286 swap-formatted instance store devices and partitions in 277 287 stage-1 (initramfs). This behaviour has been removed. Users
+2
nixos/doc/manual/release-notes/rl-2305.section.md
··· 71 71 72 72 - 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. 73 73 74 + - `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). 75 + 74 76 - 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. 75 77 76 78 - 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.
+7 -7
pkgs/servers/teleport/default.nix
··· 23 23 owner = "gravitational"; 24 24 repo = "teleport"; 25 25 rev = "v${version}"; 26 - hash = "sha256-F5v3/eKPLhSxW7FImTbE+QMtfn8w5WVTrxMWhgNr3YA="; 26 + hash = "sha256-8S+r5pd8icOljGkxqLsZKmh4+nIwPQErs7RK88q0vOQ="; 27 27 }; 28 - version = "10.3.1"; 28 + version = "11.1.4"; 29 29 30 30 rdpClient = rustPlatform.buildRustPackage rec { 31 31 pname = "teleport-rdpclient"; 32 - cargoHash = "sha256-Xmabjoq1NXxXemeR06Gg8R/HwdSE+rsxxX645pQ3SuI="; 32 + cargoHash = "sha256-XuJTdpb2eIeXnVtuSOlHjZQ8PpwxK4/4siK2S2h6xIw="; 33 33 inherit version src; 34 34 35 35 buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; ··· 53 53 webassets = fetchFromGitHub { 54 54 owner = "gravitational"; 55 55 repo = "webassets"; 56 - # Submodule rev from https://github.com/gravitational/teleport/tree/v10.3.1 57 - rev = "6710dcd0dc19ad101bac3259c463ef940f2ab1f3"; 58 - hash = "sha256-A13FSpgJODmhugAwy4kqiDw4Rihr//DhQX/bjwaeo2A="; 56 + # Submodule rev from https://github.com/gravitational/teleport/tree/v11.1.4 57 + rev = "5f2597d5987804d37e61da8ae9d1a5a2d6b43ef4"; 58 + hash = "sha256-meRinI4VsJuRoJznVULHL38bUIu352lf5LRPLlef1OA="; 59 59 }; 60 60 in 61 61 buildGoModule rec { 62 62 pname = "teleport"; 63 63 64 64 inherit src version; 65 - vendorHash = "sha256-2Zrd3CbZvxns9lNVtwaaor1mi97IhPc+MRJhj3rU760="; 65 + vendorHash = "sha256-nlwBjeh0BlZ3vUQxvaYW0aK5Y2YK1gEar9s1IMJJEMY="; 66 66 67 67 subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; 68 68 tags = [ "libfido2" "webassets_embed" ]