Merge pull request #267049 from justinas/justinas/remove-teleport-11

teleport_11: remove
This commit is contained in:
Robert Scott 2023-12-01 23:06:31 +00:00 committed by GitHub
commit 53bf3e8255
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 3 additions and 1708 deletions

View file

@ -9,7 +9,8 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
let
packages = with pkgs; {
"default" = teleport;
"11" = teleport_11;
"12" = teleport_12;
"13" = teleport_13;
};
minimal = package: {

File diff suppressed because it is too large Load diff

View file

@ -1,19 +0,0 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
version = "11.3.27";
hash = "sha256-A3EeFQsDOaggfb5S+eyRCe/vm054MabfRrcHPxhO0So=";
vendorHash = "sha256-hjMv/H4dlinlv3ku7i1km2/b+6uCdbznHtVOMIjDlUc=";
yarnHash = "sha256-hip0WQVZpx2qfVDmEy4nk4UFYEjX1Xhj8HsIIQ8PF1Y=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rdp-rs-0.1.0" = "sha256-GJfUyiYQwcDTMqt+iik3mFI0f6mu13RJ2XuoDzlg9sU=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
../test.patch
];
} // builtins.removeAttrs args [ "callPackage" ])

View file

@ -905,6 +905,7 @@ mapAliases ({
taro = taproot-assets; # Added 2023-07-04
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
tensile = throw "'tensile' has been replaced with 'rocmPackages.tensile'"; # Added 2023-10-08
testVersion = testers.testVersion; # Added 2022-04-20
tfplugindocs = terraform-plugin-docs; # Added 2023-11-01

View file

@ -13778,9 +13778,6 @@ with pkgs;
telegraf = callPackage ../servers/monitoring/telegraf { };
teleport_11 = callPackage ../servers/teleport/11 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
};
teleport_12 = callPackage ../servers/teleport/12 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
};