mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 04:02:10 +00:00
Code Issues Wiki Activity

teleport_14: init at 14.0.1

Browse source
This commit is contained in:
techknowlogick 2023-10-04 02:21:48 -04:00
parent 5fc008449a
commit 3a60214cb3
8 changed files with 2041 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/servers/teleport/11/default.nix
View file

@ -10,4 +10,10 @@ callPackage ../generic.nix ({
"rdp-rs-0.1.0" = "sha256-GJfUyiYQwcDTMqt+iik3mFI0f6mu13RJ2XuoDzlg9sU=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
../test.patch
];
} // builtins.removeAttrs args [ "callPackage" ])

6
pkgs/servers/teleport/12/default.nix
View file

@ -10,4 +10,10 @@ callPackage ../generic.nix ({
"rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
../test.patch
];
} // builtins.removeAttrs args [ "callPackage" ])

6
pkgs/servers/teleport/13/default.nix
View file

@ -10,4 +10,10 @@ callPackage ../generic.nix ({
"rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
../test.patch
];
} // builtins.removeAttrs args [ "callPackage" ])

1982
pkgs/servers/teleport/14/Cargo.lock generated Normal file
View file

File diff suppressed because it is too large Load diff

17
pkgs/servers/teleport/14/default.nix Normal file
View file

@ -0,0 +1,17 @@
{ callPackage, ... }@args:
callPackage ../generic.nix ({
version = "14.0.1";
hash = "sha256-esQwk2PFnk3/REzLr3ExtzEcUs2q4Tn/2KpfFWAx5uU=";
vendorHash = "sha256-lzwrkW0dHxCHBSJjzNhXgq3Av8Zj8xEn3kfTRtT/q04=";
yarnHash = "sha256-Y2dVxRyKPLD2xjwr0QqrKHf/4gnMCErmDzievu5zTGg=";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"rdp-rs-0.1.0" = "sha256-n4x4w7GZULxqaR109das12+ZGU0xvY3wGOTWngcwe4M=";
};
};
extPatches = [
# https://github.com/NixOS/nixpkgs/issues/120738
../tsh_14.patch
];
} // builtins.removeAttrs args [ "callPackage" ])

7
pkgs/servers/teleport/generic.nix
View file

@ -22,6 +22,7 @@
, version
, hash
, vendorHash
, extPatches ? null
, cargoHash ? null
, cargoLock ? null
, yarnHash
@ -111,11 +112,7 @@ buildGoModule rec {
++ lib.optionals (stdenv.isDarwin && withRdpClient) [ CoreFoundation Security AppKit ];
nativeBuildInputs = [ makeWrapper pkg-config ];
patches = [
# https://github.com/NixOS/nixpkgs/issues/120738
./tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
./test.patch
patches = extPatches ++ [
./0001-fix-add-nix-path-to-exec-env.patch
./rdpclient.patch
];

17
pkgs/servers/teleport/tsh_14.patch Normal file
View file

@ -0,0 +1,17 @@
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 = path.Dir(tempBinaryPath) + "/tsh"
// configs
setEnvFlags(&cf)

6
pkgs/top-level/all-packages.nix
View file

@ -13759,7 +13759,11 @@ with pkgs;
teleport_13 = callPackage ../servers/teleport/13 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
};
teleport = teleport_13;
teleport_14 = callPackage ../servers/teleport/14 {
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
buildGoModule = buildGo121Module;
};
teleport = teleport_14;
telepresence = callPackage ../tools/networking/telepresence {
pythonPackages = python3Packages;