about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authortomberek <tomberek@users.noreply.github.com>2024-04-17 02:05:41 -0400
committerGitHub <noreply@github.com>2024-04-17 02:05:41 -0400
commit2c88a89c8eab2f463dcd4cab28d450f559024cf4 (patch)
tree34114b2b8889a4e2d0f0608c9cfd0155f149c0fd /nixos
parentab7b278a52a5e09353341c72daaa8074b6ad4e90 (diff)
parentb944bd2c7f55a52e61aed3292b56fb9087ac43d7 (diff)
Merge pull request #285922 from justinas/teleport-15
teleport_15: init at 15.2.2, teleport_12: remove 
Diffstat (limited to 'nixos')
-rw-r--r--nixos/doc/manual/release-notes/rl-2405.section.md4
-rw-r--r--nixos/tests/teleport.nix2
2 files changed, 5 insertions, 1 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md
index 3f4549911fe49..c97045b2dfca8 100644
--- a/nixos/doc/manual/release-notes/rl-2405.section.md
+++ b/nixos/doc/manual/release-notes/rl-2405.section.md
@@ -37,6 +37,10 @@ In addition to numerous new and upgraded packages, this release has the followin
 Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for PipeWire and
 `services.pipewire.wireplumber.configPackages` for WirePlumber instead."
 
+- `teleport` has been upgraded from major version 14 to major version 15.
+  Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
+  and release notes for [v15](https://goteleport.com/docs/changelog/#1500-013124).
+
 - A new option `systemd.sysusers.enable` was added. If enabled, users and
   groups are created with systemd-sysusers instead of with a custom perl script.
 
diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix
index d68917c6c7acb..2fb347155759a 100644
--- a/nixos/tests/teleport.nix
+++ b/nixos/tests/teleport.nix
@@ -9,8 +9,8 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
 let
   packages = with pkgs; {
     "default" = teleport;
-    "12" = teleport_12;
     "13" = teleport_13;
+    "14" = teleport_14;
   };
 
   minimal = package: {