teleport_17: init at 17.2.1; teleport: Use fetchCargoVendor (#380613)

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: {

pkgs/servers/teleport/15/default.nix

@@ -6,13 +6,6 @@ import ../generic.nix (
     hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o=";
     vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA=";
     yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY=";
-    cargoLock = {
-      lockFile = ./Cargo.lock;
-      outputHashes = {
-        "boring-4.4.0" = "sha256-4wdl2kIA5oHQ0H6IddKQ+B5kRwrTeMbKe1+tAYZt2uw=";
-        "ironrdp-async-0.1.0" = "sha256-nE5O/wRJ3vJqJG5zdYmpVkhx6JC6Yb92pR4EKSWSdkA=";
-        "sspi-0.10.1" = "sha256-fkclC/plTh2d8zcmqthYmr5yXqbPTeFxI1VuaPX5vxk=";
-      };
-    };
+    cargoHash = "sha256-IQi11Hpavj4pImwjxU6uoHQ+vjwc/++NuWXREcIKH3s=";
   }
 )

pkgs/servers/teleport/16/default.nix

@@ -6,12 +6,6 @@ import ../generic.nix (
     hash = "sha256-9X4PLN5y1pJMNGL7o+NR/b3yUYch/VVEMmGmWbEO1CA=";
     vendorHash = "sha256-nJdtllxjem+EA77Sb1XKmrAaWh/8WrL3AuvVxgBRkxI=";
     pnpmHash = "sha256-+eOfGS9m3c9i7ccOS8q6KM0IrBIJZKlxx7h3qqxTJHE=";
-    cargoLock = {
-      lockFile = ./Cargo.lock;
-      outputHashes = {
-        "boring-4.7.0" = "sha256-ACzw4Bfo6OUrwvi3h21tvx5CpdQaWCEIDkslzjzy9o8=";
-        "ironrdp-async-0.2.0" = "sha256-s0WdaEd3J2r/UmSVBktxtspIytlfw6eWUW3A4kOsTP0=";
-      };
-    };
+    cargoHash = "sha256-6JYSW65ou8iC4/7AJVZ9+vpItxpJtaGFA4Nm3fgyHIs=";
   }
 )

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=";
+  }
+)

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"
   ]
 )

pkgs/servers/teleport/generic.nix

@@ -32,7 +32,6 @@
   vendorHash,
   extPatches ? [ ],
   cargoHash ? null,
-  cargoLock ? null,
   yarnHash ? null,
   pnpmHash ? null,
 }:
@@ -50,7 +49,8 @@ let
 
   rdpClient = rustPlatform.buildRustPackage rec {
     pname = "teleport-rdpclient";
-    inherit cargoHash cargoLock;
+    useFetchCargoVendor = true;
+    inherit cargoHash;
     inherit version src;
 
     buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";
@@ -84,7 +84,10 @@ let
     pname = "teleport-webassets";
     inherit src version;
 
-    cargoDeps = rustPlatform.importCargoLock cargoLock;
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      inherit src;
+      hash = cargoHash;
+    };
 
     pnpmDeps =
       if pnpmHash != null then

pkgs/top-level/all-packages.nix

@@ -5133,8 +5133,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;