teleport_15: remove

nixos/tests/teleport.nix

@@ -9,7 +9,6 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
 
 let
   packages = with pkgs; {
-    "15" = teleport_15;
     "16" = teleport_16;
     "17" = teleport_17;
   };

pkgs/servers/teleport/15/default.nix

@@ -1,11 +0,0 @@
-args:
-import ../generic.nix (
-  args
-  // {
-    version = "15.4.30";
-    hash = "sha256-qLGlhCDfIPVJfKI37Wv2XNl5tdloq48wJu8V/ww0yHc=";
-    vendorHash = "sha256-aM7VYauCC6zytFELKNyUa30H17ErFmBkyEr+eDoF92g=";
-    yarnHash = "sha256-63JX0rAMyZA58CdaqHlTXlL7npvKcYnhVIh1NaJEmBk=";
-    cargoHash = "sha256-2lIhtIWl26xoH7XxhPEmG/2FpfwgTC7kmahCim1W4To=";
-  }
-)

pkgs/servers/teleport/default.nix

@@ -2,20 +2,11 @@
   callPackages,
   lib,
   wasm-bindgen-cli_0_2_95,
-  wasm-bindgen-cli_0_2_100,
   buildGo123Module,
   ...
 }@args:
 let
   f = args: rec {
-    # wasm-bindgen-cli version must match the version of wasm-bindgen in Cargo.lock
-    teleport_15 = import ./15 (
-      args
-      // {
-        wasm-bindgen-cli = wasm-bindgen-cli_0_2_100;
-        buildGoModule = buildGo123Module;
-      }
-    );
     teleport_16 = import ./16 (
       args
       // {
@@ -39,7 +30,6 @@ callPackages f' (
   builtins.removeAttrs args [
     "callPackages"
     "wasm-bindgen-cli_0_2_95"
-    "wasm-bindgen-cli_0_2_100"
     "buildGo123Module"
   ]
 )

pkgs/servers/teleport/generic.nix

@@ -3,7 +3,6 @@
   buildGoModule,
   rustPlatform,
   fetchFromGitHub,
-  fetchYarnDeps,
   fetchpatch,
   makeWrapper,
   CoreFoundation,
@@ -19,10 +18,8 @@
   Security,
   stdenv,
   xdg-utils,
-  yarn,
   wasm-bindgen-cli,
   wasm-pack,
-  fixup-yarn-lock,
   nixosTests,
 
   withRdpClient ? true,
@@ -31,11 +28,9 @@
   hash,
   vendorHash,
   extPatches ? [ ],
-  cargoHash ? null,
+  cargoHash,
-  yarnHash ? null,
+  pnpmHash,
-  pnpmHash ? null,
 }:
-assert yarnHash != null || pnpmHash != null;
 let
   # This repo has a private submodule "e" which fetchgit cannot handle without failing.
   src = fetchFromGitHub {
@@ -75,11 +70,6 @@ let
     '';
   };
 
-  yarnOfflineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = yarnHash;
-  };
-
   webassets = stdenv.mkDerivation {
     pname = "teleport-webassets";
     inherit src version;
@@ -89,38 +79,24 @@ let
       hash = cargoHash;
     };
 
-    pnpmDeps =
+    pnpmDeps = pnpm_10.fetchDeps {
-      if pnpmHash != null then
+      inherit src pname version;
-        pnpm_10.fetchDeps {
+      hash = pnpmHash;
-          inherit src pname version;
+    };
-          hash = pnpmHash;
-        }
-      else
-        null;
 
-    nativeBuildInputs =
+    nativeBuildInputs = [
-      [ nodejs ]
+      binaryen
-      ++ lib.optional (lib.versionAtLeast version "15") [
+      cargo
-        binaryen
+      nodejs
-        cargo
+      pnpm_10.configHook
-        nodejs
+      rustc
-        rustc
+      rustc.llvmPackages.lld
-        rustc.llvmPackages.lld
+      rustPlatform.cargoSetupHook
-        rustPlatform.cargoSetupHook
+      wasm-bindgen-cli
-        wasm-bindgen-cli
+      wasm-pack
-        wasm-pack
+    ];
-      ]
-      ++ (
-        if lib.versionAtLeast version "16" then
-          [ pnpm_10.configHook ]
-        else
-          [
-            yarn
-            fixup-yarn-lock
-          ]
-      );
 
-    patches = lib.optional (lib.versionAtLeast version "16") [
+    patches = [
       (fetchpatch {
         name = "disable-wasm-opt-for-ironrdp.patch";
         url = "https://github.com/gravitational/teleport/commit/994890fb05360b166afd981312345a4cf01bc422.patch?full_index=1";
@@ -137,30 +113,13 @@ let
     '';
 
     buildPhase = ''
-      ${lib.optionalString (lib.versionOlder version "16") ''
-        yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
-        fixup-yarn-lock yarn.lock
-
-        yarn install --offline \
-          --frozen-lockfile \
-          --ignore-engines --ignore-scripts
-        patchShebangs .
-      ''}
-
       PATH=$PATH:$PWD/node_modules/.bin
 
-      ${
+      pushd web/packages/teleport
-        if lib.versionAtLeast version "15" then
+      # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20
-          ''
+      RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install
-            pushd web/packages/teleport
+      vite build
-            # https://github.com/gravitational/teleport/blob/6b91fe5bbb9e87db4c63d19f94ed4f7d0f9eba43/web/packages/teleport/README.md?plain=1#L18-L20
+      popd
-            RUST_MIN_STACK=16777216 wasm-pack build ./src/ironrdp --target web --mode no-install
-            vite build
-            popd
-          ''
-        else
-          "yarn build-ui-oss"
-      }
     '';
 
     installPhase = ''
@@ -248,7 +207,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Certificate authority and access plane for SSH, Kubernetes, web applications, and databases";
     homepage = "https://goteleport.com/";
-    license = if lib.versionAtLeast version "15" then licenses.agpl3Plus else licenses.asl20;
+    license = licenses.agpl3Plus;
     maintainers = with maintainers; [
       arianvp
       justinas

pkgs/top-level/aliases.nix

@@ -1539,6 +1539,7 @@ mapAliases {
   teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
   teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
   teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
+  teleport_15 = throw "teleport 15 has been removed as it is EOL. Please upgrade to Teleport 16 or later"; # Added 2025-03-28
   terminus-nerdfont = lib.warnOnInstantiate "terminus-nerdfont is redundant. Use nerd-fonts.terminess-ttf instead." nerd-fonts.terminess-ttf; # Added 2024-11-10
   temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
   temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01

pkgs/top-level/all-packages.nix

@@ -4904,7 +4904,7 @@ with pkgs;
 
   inherit (callPackages ../servers/teleport {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
-  }) teleport_15 teleport_16 teleport_17 teleport;
+  }) teleport_16 teleport_17 teleport;
 
   telepresence = callPackage ../tools/networking/telepresence {
     pythonPackages = python3Packages;