talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

teleport_15, teleport_16: Use fetchCargoVendor

Browse Source
This commit is contained in:
JuliusFreudenberger 2025-02-09 13:50:19 +02:00
parent 4ca5e4ed5c
commit ce9995c88d
5 changed files with 8 additions and 7312 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3375
pkgs/servers/teleport/15/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

9
pkgs/servers/teleport/15/default.nix
View File

@ -6,13 +6,6 @@ import ../generic.nix (
hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o="; hash = "sha256-LxMwCI/8otH32bRJvz9p1zWw4QzF/wrqeboZ6B3aw9o=";
vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA="; vendorHash = "sha256-VG9b1M3zdtRXY3eCFC7izejSSs4nTjtR9/wOc36PFnA=";
yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY="; yarnHash = "sha256-kmjY7KQfSzmlNS7ZK25YItZct/Tg7CWKfoRfubFBGlY=";
cargoLock = { cargoHash = "sha256-IQi11Hpavj4pImwjxU6uoHQ+vjwc/++NuWXREcIKH3s=";
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=";
};
};
} }
) )

3919
pkgs/servers/teleport/16/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/servers/teleport/16/default.nix
View File

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

9
pkgs/servers/teleport/generic.nix
View File

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