gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Thomas Gerbet
2024-10-30 22:42:04 +01:00
committed by GitHub
parent 9aa6de663b 98c9f5fd29
commit 39495b6479
5 changed files with 9 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/teleport/15/default.nix
+4 -4
View File
@@ -1,9 +1,9 @@
{ 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
View File
@@ -1,9 +1,9 @@
{ 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
View File
@@ -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
View File
@@ -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
-17
View File
@@ -1,17 +0,0 @@
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)