diff options
author | tomberek <tomberek@users.noreply.github.com> | 2024-04-17 02:05:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-17 02:05:41 -0400 |
commit | 2c88a89c8eab2f463dcd4cab28d450f559024cf4 (patch) | |
tree | 34114b2b8889a4e2d0f0608c9cfd0155f149c0fd /pkgs/top-level | |
parent | ab7b278a52a5e09353341c72daaa8074b6ad4e90 (diff) | |
parent | b944bd2c7f55a52e61aed3292b56fb9087ac43d7 (diff) |
Merge pull request #285922 from justinas/teleport-15
teleport_15: init at 15.2.2, teleport_12: remove
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/aliases.nix | 1 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 3 insertions, 9 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index faa715ecd4f6a..c8a80540f9e82 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1219,6 +1219,7 @@ mapAliases ({ tdesktop = telegram-desktop; # Added 2023-04-07 telegram-cli = throw "telegram-cli was removed because it was broken and abandoned upstream"; # Added 2023-07-28 teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27 + teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04 teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14 tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08 testVersion = testers.testVersion; # Added 2022-04-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 09edd1168cf61..92a7ba3cabefb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13631,16 +13631,9 @@ with pkgs; telegraf = callPackage ../servers/monitoring/telegraf { }; - teleport_12 = callPackage ../servers/teleport/12 { + inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }; - teleport_13 = callPackage ../servers/teleport/13 { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }; - teleport_14 = callPackage ../servers/teleport/14 { - inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - }; - teleport = teleport_14; + }) teleport_13 teleport_14 teleport_15 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages; |