teleport: 5.2.1 -> 6.1.2

This commit is contained in:
Justinas Stankevicius 2021-04-22 18:32:55 +03:00
parent cd0ffd3f5f
commit 8e2d3f941e

View File

@ -1,27 +1,27 @@
# This file was generated by https://github.com/kamilchm/go2nix v2.0-dev # This file was generated by https://github.com/kamilchm/go2nix v2.0-dev
{ lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }: { lib, buildGoModule, zip, fetchFromGitHub, makeWrapper, xdg-utils }:
let let
webassets = fetchFromGitHub { webassets = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
repo = "webassets"; repo = "webassets";
rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106"; rev = "cf396f868aebb8ba654ea2398c25f033181e7114";
sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA="; sha256 = "sha256-12jkpWl/kL0ttRHtxyDnKjYAZNrheEGQF8HEGSXvvAk=";
}; };
in in
buildGoPackage rec { buildGoModule rec {
pname = "teleport"; pname = "teleport";
version = "5.2.1"; version = "6.1.2";
# This repo has a private submodule "e" which fetchgit cannot handle without failing. # This repo has a private submodule "e" which fetchgit cannot handle without failing.
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
repo = "teleport"; repo = "teleport";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08="; sha256 = "sha256-4ZaebTTgGrGRQbMfDw1PL/qtDKmHbSY6kPmWyFeIcAU=";
}; };
goPackagePath = "github.com/gravitational/teleport"; vendorSha256 = null;
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
@ -29,7 +29,6 @@ buildGoPackage rec {
postBuild = '' postBuild = ''
pushd . pushd .
cd $NIX_BUILD_TOP/go/src/github.com/gravitational/teleport
mkdir -p build mkdir -p build
echo "making webassets" echo "making webassets"
cp -r ${webassets}/* webassets/ cp -r ${webassets}/* webassets/
@ -41,13 +40,21 @@ buildGoPackage rec {
popd popd
''; '';
# Do not strip the embedded web assets
dontStrip = true;
# Reduce closure size for client machines # Reduce closure size for client machines
outputs = [ "out" "client" ]; outputs = [ "out" "client" ];
buildTargets = [ "full" ]; buildTargets = [ "full" ];
preCheck = ''
export HOME=$(mktemp -d)
'';
postInstall = '' postInstall = ''
install -Dm755 -t $client/bin $out/bin/tsh install -Dm755 -t $client/bin $out/bin/tsh
wrapProgram $client/bin/tsh --prefix PATH : ${xdg-utils}/bin
wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin
''; '';
@ -62,7 +69,7 @@ buildGoPackage rec {
meta = with lib; { meta = with lib; {
description = "A SSH CA management suite"; description = "A SSH CA management suite";
homepage = "https://gravitational.com/teleport/"; homepage = "https://goteleport.com/";
license = licenses.asl20; license = licenses.asl20;
maintainers = with maintainers; [ sigma tomberek freezeboy ]; maintainers = with maintainers; [ sigma tomberek freezeboy ];
platforms = platforms.unix; platforms = platforms.unix;