@@ -1,27 +1,27 @@
11# 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 }:
33let
44 webassets = fetchFromGitHub {
55 owner = "gravitational";
66 repo = "webassets";
7− rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106";
8− sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA=";
7+ rev = "cf396f868aebb8ba654ea2398c25f033181e7114";
8+ sha256 = "sha256-12jkpWl/kL0ttRHtxyDnKjYAZNrheEGQF8HEGSXvvAk=";
99 };
1010in
1111
12−buildGoPackage rec {
12+buildGoModule rec {
1313 pname = "teleport";
14− version = "5.2.1";
14+ version = "6.1.2";
1515
1616 # This repo has a private submodule "e" which fetchgit cannot handle without failing.
1717 src = fetchFromGitHub {
1818 owner = "gravitational";
1919 repo = "teleport";
2020 rev = "v${version}";
21− sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08=";
21+ sha256 = "sha256-4ZaebTTgGrGRQbMfDw1PL/qtDKmHbSY6kPmWyFeIcAU=";
2222 };
2323
24− goPackagePath = "github.com/gravitational/teleport";
24+ vendorSha256 = null;
2525
2626 subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
2727
@@ -29,7 +29,6 @@ buildGoPackage rec {
2929
3030 postBuild = ''
3131 pushd .
32− cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport
3332 mkdir -p build
3433 echo "making webassets"
3534 cp -r ${webassets}/* webassets/
@@ -41,13 +40,21 @@ buildGoPackage rec {
4140 popd
4241 '';
4342
43+ # Do not strip the embedded web assets
44+ dontStrip = true;
45+
4446 # Reduce closure size for client machines
4547 outputs = [ "out" "client" ];
4648
4749 buildTargets = [ "full" ];
4850
51+ preCheck = ''
52+ export HOME=$(mktemp -d)
53+ '';
54+
4955 postInstall = ''
5056 install -Dm755 -t $client/bin $out/bin/tsh
57+ wrapProgram $client/bin/tsh --prefix PATH : ${xdg-utils}/bin
5158 wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin
5259 '';
5360
@@ -62,7 +69,7 @@ buildGoPackage rec {
6269
6370 meta = with lib; {
6471 description = "A SSH CA management suite";
65− homepage = "https://gravitational.com/teleport/";
72+ homepage = "https://goteleport.com/";
6673 license = licenses.asl20;
6774 maintainers = with maintainers; [ sigma tomberek freezeboy ];
6875 platforms = platforms.unix;