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

Merge pull request #118800 from ymatsiuk/xdgteleport 

Xdgteleport
This commit is contained in:
Dmitry Kalinkin 2021-04-08 07:06:10 -04:00 committed by GitHub
parent 034c49f514 db3e568d98
commit 78198301f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/servers/teleport/default.nix
View File

@ -1,31 +1,31 @@
# 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 }: { lib, buildGoPackage, zip, fetchFromGitHub, makeWrapper, xdg-utils }:
let let
webassets = fetchFromGitHub { webassets = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
repo = "webassets"; repo = "webassets";
rev = "2d79788dbcd005bdcfe5b5120007d0faf8f1fc82"; rev = "8ace0cfcc6867651bed3fd5b5f35aaa2a80e1106";
sha256 = "001a3bx8yyx1hq8y5yiy1jzp122q8gcl369lj0609gaxp6dk5bdw"; sha256 = "sha256-mzvYysCFMvWHo8Y4cmhAju62jjpe92j564gc12BSdZA=";
}; };
in in
buildGoPackage rec { buildGoPackage rec {
pname = "teleport"; pname = "teleport";
version = "5.1.2"; version = "5.2.1";
# 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 = "0h1hn2dpdsmhxac06gn6787z2mnfcwb3wn0c2l7l2qhw6iqpgmvh"; sha256 = "sha256-8WEVH+04y1/s9KpBlK/LrgHG7qTpu2LqtanKKdi9N08=";
}; };
goPackagePath = "github.com/gravitational/teleport"; goPackagePath = "github.com/gravitational/teleport";
subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ]; subPackages = [ "tool/tctl" "tool/teleport" "tool/tsh" ];
nativeBuildInputs = [ zip ]; nativeBuildInputs = [ zip makeWrapper ];
postBuild = '' postBuild = ''
pushd . pushd .
@ -48,6 +48,7 @@ buildGoPackage rec {
postInstall = '' postInstall = ''
install -Dm755 -t $client/bin $out/bin/tsh install -Dm755 -t $client/bin $out/bin/tsh
wrapProgram $out/bin/tsh --prefix PATH : ${xdg-utils}/bin
''; '';
doInstallCheck = true; doInstallCheck = true;