BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

teleport: 6.2.7 -> 6.2.8

Browse source 
Patch tests to lower the number of active connections to fix:
--- FAIL: TestResolveDefaultAddrTimeoutBeforeAllRacersLaunched (0.28s)
panic: httptest: failed to listen on a port: listen tcp6 [::1]:0: socket: too many open files
This commit is contained in:
Yurii Matsiuk 2021-08-04 14:00:16 +02:00
parent 677dc1b93b
commit 7614ffb774
No known key found for this signature in database
GPG key ID: 61302290298601AA
2 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/servers/teleport/default.nix
View file

@ -4,21 +4,21 @@ let
webassets = fetchFromGitHub { webassets = fetchFromGitHub {
owner = "gravitational"; owner = "gravitational";
repo = "webassets"; repo = "webassets";
rev = "8a30ee4e3570c7db0566028b6b562167aa40f646"; rev = "c63397375632f1a4323918dde78334472f3ffbb9";
sha256 = "sha256-noMVcB1cjiMcRke6/qJIzDaEh4uPIewsedLQRdPbzIQ="; sha256 = "sha256-6YKk0G3s+35PRsUBkKgu/tNoSSwjJ5bTn8DACF4gYr4=";
}; };
in in
buildGoModule rec { buildGoModule rec {
pname = "teleport"; pname = "teleport";
version = "6.2.7"; version = "6.2.8";
# 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 = "0ychs2pqi3awbr0vraz0ksddwk5hihrd1d9raq8mxyw5dz5124ki"; sha256 = "sha256-TVjdz97CUXBKCQh9bYrvtcH4StblBMsXiQ9Gix/NIm4=";
}; };
vendorSha256 = null; vendorSha256 = null;
@ -27,8 +27,12 @@ buildGoModule rec {
nativeBuildInputs = [ zip makeWrapper ]; nativeBuildInputs = [ zip makeWrapper ];
# https://github.com/NixOS/nixpkgs/issues/120738 patches = [
patches = [ ./tsh.patch ]; # https://github.com/NixOS/nixpkgs/issues/120738
./tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
./test.patch
];
postBuild = '' postBuild = ''
pushd . pushd .

13
pkgs/servers/teleport/test.patch Normal file
View file

@ -0,0 +1,13 @@
diff --git a/tool/tsh/resolve_default_addr_test.go b/tool/tsh/resolve_default_addr_test.go
index d5976f156..aec5199aa 100644
--- a/tool/tsh/resolve_default_addr_test.go
+++ b/tool/tsh/resolve_default_addr_test.go
@@ -237,7 +237,7 @@ func TestResolveDefaultAddrTimeoutBeforeAllRacersLaunched(t *testing.T) {
blockingHandler, doneCh := newWaitForeverHandler()
- servers := make([]*httptest.Server, 1000)
+ servers := make([]*httptest.Server, 100)
for i := 0; i < len(servers); i++ {
servers[i] = makeTestServer(t, blockingHandler)
}