diff --git a/nixos/tests/teleport.nix b/nixos/tests/teleport.nix index 2fb372f6f419..0031986f7de8 100644 --- a/nixos/tests/teleport.nix +++ b/nixos/tests/teleport.nix @@ -9,8 +9,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; let packages = with pkgs; { - "default" = teleport; "15" = teleport_15; + "16" = teleport_16; + "17" = teleport_17; }; minimal = package: { diff --git a/pkgs/servers/teleport/17/default.nix b/pkgs/servers/teleport/17/default.nix new file mode 100644 index 000000000000..c93f925af288 --- /dev/null +++ b/pkgs/servers/teleport/17/default.nix @@ -0,0 +1,11 @@ +{ wasm-bindgen-cli, ... }@args: +import ../generic.nix ( + args + // { + version = "17.2.1"; + hash = "sha256-QlBj3zGnELgQJMIMSZK1YVE3H2hO09Xgdtcw0BML7KQ="; + vendorHash = "sha256-Y3og6oifpQIZxkKR1qgD3l06YaCFpSlh/+jN3w0gq7M="; + pnpmHash = "sha256-ChRWq0acDzHhm6JK2W3V6LZHlq4vXMxa1AMqiCPIouc="; + cargoHash = "sha256-GDwH/2aiqvTbLC8/x/n0yLuU8IEBVpyacN2B+EGwBgE="; + } +) diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index 26c3467c7973..980beffcb52f 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -3,6 +3,8 @@ lib, wasm-bindgen-cli_0_2_92, wasm-bindgen-cli_0_2_95, + buildGo122Module, + buildGo123Module, ... }@args: let @@ -12,15 +14,24 @@ let args // { wasm-bindgen-cli = wasm-bindgen-cli_0_2_92; + buildGoModule = buildGo122Module; } ); teleport_16 = import ./16 ( args // { wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; + buildGoModule = buildGo122Module; } ); teleport = teleport_16; + teleport_17 = import ./17 ( + args + // { + wasm-bindgen-cli = wasm-bindgen-cli_0_2_95; + buildGoModule = buildGo123Module; + } + ); }; # Ensure the following callPackages invocation includes everything 'generic' needs. f' = lib.setFunctionArgs f (builtins.functionArgs (import ./generic.nix)); @@ -30,5 +41,7 @@ callPackages f' ( "callPackages" "wasm-bindgen-cli_0_2_92" "wasm-bindgen-cli_0_2_95" + "buildGo122Module" + "buildGo123Module" ] ) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dcacf936d9c1..995819227cca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5137,8 +5137,7 @@ with pkgs; inherit (callPackages ../servers/teleport { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit; - buildGoModule = buildGo122Module; - }) teleport_15 teleport_16 teleport; + }) teleport_15 teleport_16 teleport_17 teleport; telepresence = callPackage ../tools/networking/telepresence { pythonPackages = python3Packages;