Unverified Commit a4908b5e authored by Robert Scott's avatar Robert Scott Committed by GitHub
Browse files

Merge pull request #224379 from justinas/teleport-12-1-5 

teleport: 12.1.0 -> 12.1.5
parents b505951d a0405f0a

pkgs/servers/teleport/11.nix→pkgs/servers/teleport/11/default.nix

+1 −1
Original line number Diff line number Diff line 
{ callPackage, ... }@args:

callPackage ./generic.nix ({

callPackage ../generic.nix ({

  version = "11.3.5";

  hash = "sha256-/InWly0jCiPBlgM/qgS6ErMv7Hhg5PW9sldda1oaUIg=";

  vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA=";

pkgs/servers/teleport/12.nix

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
{ callPackage, ... }@args:

callPackage ./generic.nix ({

  version = "12.1.0";

  hash = "sha256-rM8ehf4Bb+IvbLLeZEfQZnq6ViAp4d3RiYv1lGYbrOc=";

  vendorHash = "sha256-euzu6GROCZnmawLnh549ETlfLDqKFuUG9YM6klXO3z0=";

  cargoHash = "sha256-p8N07EITd+EAMJxMqBtg+1kOuqa94e5c3NtT3Z4VL6g=";

  yarnHash = "sha256-zwKjuP85VCCghpRdwGtaul9VtMF5ByMJ45QU7wgrteg=";

} // builtins.removeAttrs args [ "callPackage" ])

pkgs/servers/teleport/12/Cargo.lock

0 → 100644
+1861 −0

File added.

Preview size limit exceeded, changes collapsed.

pkgs/servers/teleport/12/default.nix

0 → 100644
+13 −0
Original line number Diff line number Diff line 
{ callPackage, ... }@args:

callPackage ../generic.nix ({

  version = "12.1.5";

  hash = "sha256-bPnXZTe4LB50W2UT/sA+2Or/LJMqcEuPpTTF8ue/2Ak=";

  vendorHash = "sha256-mznhfliYpsJJJSL17Q7WXX0SkIn+Bcb1fzYdLRTRDI0=";

  yarnHash = "sha256-cElFTxolQnJAbpln2aGjlTJr/hbUML4QHeHQ3yrWVqU=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

      "rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";

    };

  };

} // builtins.removeAttrs args [ "callPackage" ])

pkgs/servers/teleport/generic.nix

+3 −4
Original line number Diff line number Diff line
@@ -4,14 +4,12 @@ 
, fetchFromGitHub

, fetchYarnDeps

, makeWrapper

, symlinkJoin

, CoreFoundation

, AppKit

, libfido2

, nodejs

, openssl

, pkg-config

, protobuf

, Security

, stdenv

, xdg-utils
@@ -24,7 +22,8 @@ 
, version

, hash

, vendorHash

, cargoHash

, cargoHash ? null

, cargoLock ? null

, yarnHash

}:

let
@@ -39,7 +38,7 @@ let 


  rdpClient = rustPlatform.buildRustPackage rec {

    pname = "teleport-rdpclient";

    inherit cargoHash;

    inherit cargoHash cargoLock;

    inherit version src;



    buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";