Unverified Commit 39495b64 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

teleport_16: 16.2.0 -> 16.4.6, teleport_15: 15.4.11 -> 15.4.21 (#351209)

parents 9aa6de66 98c9f5fd

pkgs/servers/teleport/15/default.nix

+4 −4
Original line number Diff line number Diff line 
{ wasm-bindgen-cli, ... }@args:

import ../generic.nix (args // {

  version = "15.4.11";

  hash = "sha256-vmJ76aRAsbSGXZ2HcuryOlUYrUOPMP6MaI8OjxxyiZ4=";

  vendorHash = "sha256-oJo8Ga6TAUz1xSYiRckzq8zZvgIZFCeEwZbiyyVOdkI=";

  yarnHash = "sha256-5ppgBa5CyQ49FSFhdWDbTcCTdt0vsXAzNTeyG4r7crg=";

  version = "15.4.21";

  hash = "sha256-n5dAJ5ilq5nHo3neQzCUFnDRwLhArwleMSho4/g0MT4=";

  vendorHash = "sha256-bW8ztNeSzxUNtbuBtxIya9TeGfktC+/fz9iXB0GL0Mg=";

  yarnHash = "sha256-ZaLLrcwAeq6TQ1SaA2few4s0HqktOZEpxCTcNGloGfk=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

pkgs/servers/teleport/16/default.nix

+3 −3
Original line number Diff line number Diff line 
{ wasm-bindgen-cli, ... }@args:

import ../generic.nix (args // {

  version = "16.2.0";

  hash = "sha256-3LLoO7SNJfEfDEU7JnAhmAOIdRO+TkgiJKjT8sqzelo=";

  version = "16.4.6";

  hash = "sha256-TdOCFs6YeqINM8aPryrjYPaXEjc/gIqu7kzVYDnMsjg=";

  vendorHash = "sha256-iyYfht0aB9Vv2hsaqrieFHXbDhlotKQYfLn4JFqpve8=";

  pnpmHash = "sha256-lcev7VwTcuCuced8uZzLoobREWtNRDFRFdfmabJPLtc=";

  pnpmHash = "sha256-NF45Wp4itYud01VzxC8bRHZ3xZ1T1du1QmZTDMS5nOk=";

  cargoLock = {

    lockFile = ./Cargo.lock;

    outputHashes = {

pkgs/servers/teleport/generic.nix

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ buildGoModule rec { 
  patches = extPatches ++ [

    ./0001-fix-add-nix-path-to-exec-env.patch

    ./rdpclient.patch

    (if lib.versionAtLeast version "16" then ./tsh_16.patch else ./tsh.patch)

    ./tsh.patch

  ];



  # Reduce closure size for client machines

pkgs/servers/teleport/tsh.patch

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ index 5de21c69d0..3995c19e3c 100644 
 	if err != nil {

 		return trace.Wrap(err)

 	}

+	cf.executablePath = path.Dir(tempBinaryPath) + "/tsh"

+	cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"

 

 	// configs

 	setEnvFlags(&cf)

pkgs/servers/teleport/tsh_16.patch

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go

index 5de21c69d0..3995c19e3c 100644

--- a/tool/tsh/common/tsh.go

+++ b/tool/tsh/common/tsh.go

@@ -1084,10 +1084,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {

 

 	var err error

 

-	cf.executablePath, err = os.Executable()

+	tempBinaryPath, err := os.Executable()

 	if err != nil {

 		return trace.Wrap(err)

 	}

+	cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"

 

 	// configs

 	setEnvFlags(&cf)