ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-20 03:59:30 +03:00
Code Issues Projects Releases Wiki Activity

teleport: 11.2.3 -> 11.3.4

Browse Source
This commit is contained in:
Justinas Stankevicius 2023-02-04 00:42:58 +02:00
parent 95642fb287
commit 72f1773807
1 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,17 +2,21 @@
, buildGoModule , buildGoModule
, rustPlatform , rustPlatform
, fetchFromGitHub , fetchFromGitHub
, fetchYarnDeps
, makeWrapper , makeWrapper
, symlinkJoin , symlinkJoin
, CoreFoundation , CoreFoundation
, AppKit , AppKit
, libfido2 , libfido2
, nodejs
, openssl , openssl
, pkg-config , pkg-config
, protobuf , protobuf
, Security , Security
, stdenv , stdenv
, xdg-utils , xdg-utils
, yarn
, yarn2nix-moretea
, nixosTests , nixosTests
, withRdpClient ? true , withRdpClient ? true
@ -23,13 +27,13 @@ let
owner = "gravitational"; owner = "gravitational";
repo = "teleport"; repo = "teleport";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-dr+tmWVO7yXRLTvJZoFZzayRWETa8wC/aZ7S/vh8qyk="; hash = "sha256-jJfOgcwKkNFO/5XHxMoapZxM8Tb0kEgKVA7SrMU7uW4=";
}; };
version = "11.2.3"; version = "11.3.4";
rdpClient = rustPlatform.buildRustPackage rec { rdpClient = rustPlatform.buildRustPackage rec {
pname = "teleport-rdpclient"; pname = "teleport-rdpclient";
cargoHash = "sha256-8NTzX9HeGg9U3bmiZHXHTcKnbJk55YfY2bkjilEyg0g="; cargoHash = "sha256-TSIwLCY01ygCWT73LR/Ch7NwPQA3a3r0PyL3hUzBNr4=";
inherit version src; inherit version src;
buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient"; buildAndTestSubdir = "lib/srv/desktop/rdp/rdpclient";
@ -50,19 +54,49 @@ let
''; '';
}; };
webassets = fetchFromGitHub { yarnOfflineCache = fetchYarnDeps {
owner = "gravitational"; yarnLock = "${src}/yarn.lock";
repo = "webassets"; hash = "sha256-MAGeWzA366yzpjdCY0+X6RV5MKcsHa/xD5CJu6ce1FU=";
# Submodule rev from https://github.com/gravitational/teleport/tree/v11.2.3 };
rev = "cbddcfda9d5ccba11f02ee61bd305c1f600ee6b0";
hash = "sha256-XPcQaMyf6kEj5RDRKjNO5b+n1zj/TpBHcDnGhYVUbts="; webassets = stdenv.mkDerivation {
pname = "teleport-webassets";
inherit src version;
nativeBuildInputs = [
nodejs
yarn
yarn2nix-moretea.fixup_yarn_lock
];
configurePhase = ''
export HOME=$(mktemp -d)
'';
buildPhase = ''
yarn config --offline set yarn-offline-mirror ${yarnOfflineCache}
fixup_yarn_lock yarn.lock
yarn install --offline \
--frozen-lockfile \
--ignore-engines --ignore-scripts
patchShebangs .
yarn build-ui-oss
'';
installPhase = ''
mkdir -p $out
cp -R webassets/. $out
'';
}; };
in in
buildGoModule rec { buildGoModule rec {
pname = "teleport"; pname = "teleport";
inherit src version; inherit src version;
vendorHash = "sha256-rWdRVOaPPK2oXK6fXka4FtuxEkaQf4igm7xlg0wauMs="; vendorHash = "sha256-NkiFLEHBNjxUOSuAlVugAV14yCCo3z6yhX7LZQFKhvA=";
proxyVendor = true;
subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ]; subPackages = [ "tool/tbot" "tool/tctl" "tool/teleport" "tool/tsh" ];
tags = [ "libfido2" "webassets_embed" ] tags = [ "libfido2" "webassets_embed" ]
@ -85,10 +119,7 @@ buildGoModule rec {
outputs = [ "out" "client" ]; outputs = [ "out" "client" ];
preBuild = '' preBuild = ''
mkdir -p build cp -r ${webassets} webassets
echo "making webassets"
cp -r ${webassets}/* webassets/
make -j$NIX_BUILD_CORES lib/web/build/webassets
'' + lib.optionalString withRdpClient '' '' + lib.optionalString withRdpClient ''
ln -s ${rdpClient}/lib/* lib/ ln -s ${rdpClient}/lib/* lib/
ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/ ln -s ${rdpClient}/include/* lib/srv/desktop/rdp/rdpclient/