Unverified Commit 42e32771 authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #315182 from justinas/24-05-backport-314573 

[24.05]  teleport_13: remove
parents 42e786fc dac0b86b

nixos/tests/teleport.nix

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; 
let

  packages = with pkgs; {

    "default" = teleport;

    "13" = teleport_13;

    "14" = teleport_14;

  };

pkgs/servers/teleport/13/Cargo.lock

deleted100644 → 0
+0 −1956

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/servers/teleport/13/default.nix

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
args:

import ../generic.nix (args // {

  version = "13.4.26";

  hash = "sha256-vtOig4uIyAGC6yraiqLeJZ3X8arHRGc2AAaopgQLCHo=";

  vendorHash = "sha256-lAPx54vsqXW7WKIi+zFQtVhWYlPX1Is0b5jiWsN3j2E=";

  yarnHash = "sha256-Os8T4p5/QzZJAvLqJwKgB4XiLg/TYdlXpunStKAc/mk=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "rdp-rs-0.1.0" = "sha256-U52FVuqo2DH/7f0cQ1qcb1GbFZ97yxExVFMX5cs0zw4=";

    };

  };

  extPatches = [

    # https://github.com/NixOS/nixpkgs/issues/120738

    ../tsh.patch

  ];

})

pkgs/servers/teleport/default.nix

+0 −1
Original line number Diff line number Diff line 
{ callPackages, lib, ... }@args:

let

  f = args: rec {

    teleport_13 = import ./13 args;

    teleport_14 = import ./14 args;

    teleport_15 = import ./15 args;

    teleport = teleport_15;

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -1256,6 +1256,7 @@ mapAliases ({ 
  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

  teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26

  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

  tepl = libgedit-tepl; # Added 2024-04-29