Commit 6f1c82c7 authored by Justinas Stankevicius's avatar Justinas Stankevicius
Browse files

teleport_11: init at 11.3.5

parent 857636b0

pkgs/servers/teleport/11.nix

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

callPackage ./generic.nix ({

  version = "11.3.5";

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

  vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA=";

  cargoHash = "sha256-02qo6i6GuRAYKDKA7k2hDq2O6ayEQbeGhFS2g3b9Wuo=";

  yarnHash = "sha256-kvnVmDZ/jISaaS97KM0WbPJU7Y8XWOeHrDLT0iXRyfc=";

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

pkgs/servers/teleport/12.nix

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

callPackage ./generic.nix ({

  version = "12.0.2";

  hash = "sha256-9RD4ETQEXnj3d5YID3f3BghwitdqfcDgNhsk8ixWTW4=";

  vendorHash = "sha256-2sOELuMyg7w/rhnWvnwDiUOsjUfb56JdAbrTGKvGnjs=";

  cargoHash = "sha256-1ScU5ywq8vz1sWHW2idBsWcB1Xs+aylukBm96dKrwL4=";

  yarnHash = "sha256-ItRi5EkYrwNB1MIf9l3yyK1BX6vNpL2+H1BlN3Evibg=";

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

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

+11 −5
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ 
, nixosTests



, withRdpClient ? true



, version

, hash

, vendorHash

, cargoHash

, yarnHash

}:

let

  # This repo has a private submodule "e" which fetchgit cannot handle without failing.
@@ -27,13 +33,13 @@ let 
    owner = "gravitational";

    repo = "teleport";

    rev = "v${version}";

    hash = "sha256-9RD4ETQEXnj3d5YID3f3BghwitdqfcDgNhsk8ixWTW4=";

    inherit hash;

  };

  version = "12.0.2";

  inherit version;



  rdpClient = rustPlatform.buildRustPackage rec {

    pname = "teleport-rdpclient";

    cargoHash = "sha256-1ScU5ywq8vz1sWHW2idBsWcB1Xs+aylukBm96dKrwL4=";

    inherit cargoHash;

    inherit version src;



    buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";
@@ -56,7 +62,7 @@ let 


  yarnOfflineCache = fetchYarnDeps {

    yarnLock = "${src}/yarn.lock";

    hash = "sha256-ItRi5EkYrwNB1MIf9l3yyK1BX6vNpL2+H1BlN3Evibg=";

    hash = yarnHash;

  };



  webassets = stdenv.mkDerivation {
@@ -95,7 +101,7 @@ buildGoModule rec { 
  pname = "teleport";



  inherit src version;

  vendorHash = "sha256-2sOELuMyg7w/rhnWvnwDiUOsjUfb56JdAbrTGKvGnjs=";

  inherit vendorHash;

  proxyVendor = true;



  subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ];

pkgs/top-level/all-packages.nix

+5 −1
Original line number Diff line number Diff line
@@ -12515,9 +12515,13 @@ with pkgs; 














  telegraf = callPackage ../servers/monitoring/telegraf { };



























  teleport = callPackage ../servers/teleport {













  teleport_11 = callPackage ../servers/teleport/11.nix {















    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;















  };













  teleport_12 = callPackage ../servers/teleport/12.nix {













    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;













  };













  teleport = teleport_12;





























  telepresence = callPackage ../tools/networking/telepresence {















    pythonPackages = python3Packages;