Commit ce9995c8 authored by JuliusFreudenberger's avatar JuliusFreudenberger
Browse files

teleport_15, teleport_16: Use fetchCargoVendor

parent 4ca5e4ed

pkgs/servers/teleport/15/Cargo.lock

deleted100644 → 0
+0 −3375

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/servers/teleport/15/default.nix

+1 −8
Original line number Diff line number Diff line
@@ -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/Cargo.lock

deleted100644 → 0
+0 −3919

File deleted.

Preview size limit exceeded, changes collapsed.

pkgs/servers/teleport/16/default.nix

+1 −7
Original line number Diff line number Diff line
@@ -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/generic.nix

+6 −3
Original line number Diff line number Diff line
@@ -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