pyrox.dev
Merge pull request #120224 from justinas/teleport-6
teleport: 5.2.1 -> 6.1.2
authored by Luke Granger-Brown and committed by GitHub 6af7bcbd 9788d31a
+16
-9
pkgs/servers/teleport/default.nix
+16
-9
pkgs/servers/teleport/default.nix
···
1
1
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
2
-
{ lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }:
2
+
{ lib, buildGoModule, zip, fetchFromGitHub, makeWrapper, xdg-utils }:
3
3
let
4
4
webassets = fetchFromGitHub {
5
5
owner = "gravitational";
6
6
repo = "webassets";
7
-
rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106";
8
-
sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA=";
7
+
rev = "cf396f868aebb8ba654ea2398c25f033181e7114";
8
+
sha256 = "sha256-12jkpWl/kL0ttRHtxyDnKjYAZNrheEGQF8HEGSXvvAk=";
9
9
};
10
10
in
11
11
12
-
buildGoPackage rec {
12
+
buildGoModule rec {
13
13
pname = "teleport";
14
-
version = "5.2.1";
14
+
version = "6.1.2";
15
15
16
16
# This repo has a private submodule "e" which fetchgit cannot handle without failing.
17
17
src = fetchFromGitHub {
18
18
owner = "gravitational";
19
19
repo = "teleport";
20
20
rev = "v${version}";
21
-
sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08=";
21
+
sha256 = "sha256-4ZaebTTgGrGRQbMfDw1PL/qtDKmHbSY6kPmWyFeIcAU=";
22
22
};
23
23
24
-
goPackagePath = "github.com/gravitational/teleport";
24
+
vendorSha256 = null;
25
25
26
26
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
27
27
···
29
29
30
30
postBuild = ''
31
31
pushd .
32
-
cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport
33
32
mkdir -p build
34
33
echo "making webassets"
35
34
cp -r ${webassets}/* webassets/
···
41
40
popd
42
41
'';
43
42
43
+
# Do not strip the embedded web assets
44
+
dontStrip = true;
45
+
44
46
# Reduce closure size for client machines
45
47
outputs = [ "out" "client" ];
46
48
47
49
buildTargets = [ "full" ];
48
50
51
+
preCheck = ''
52
+
export HOME=$(mktemp -d)
53
+
'';
54
+
49
55
postInstall = ''
50
56
install -Dm755 -t $client/bin $out/bin/tsh
57
+
wrapProgram $client/bin/tsh --prefix PATH : ${xdg-utils}/bin
51
58
wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin
52
59
'';
53
60
···
62
69
63
70
meta = with lib; {
64
71
description = "A SSH CA management suite";
65
-
homepage = "https://gravitational.com/teleport/";
72
+
homepage = "https://goteleport.com/";
66
73
license = licenses.asl20;
67
74
maintainers = with maintainers; [ sigma tomberek freezeboy ];
68
75
platforms = platforms.unix;