diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-08-04 15:22:46 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-04 15:22:46 +0200 |
| commit | 5310ebc9d2cf5046af495738f49bc384d6065800 (patch) | |
| tree | 8c86d45f21d220bc7a961542f85edd9a00ad2453 | |
| parent | d837e2737b8745825c1f5cc75fdab8f0344187a3 (diff) | |
| parent | 7614ffb774c25674ddee5a7ffc5d4f7d7d047e4b (diff) | |
| download | nixpkgs-5310ebc9d2cf5046af495738f49bc384d6065800.tar nixpkgs-5310ebc9d2cf5046af495738f49bc384d6065800.tar.gz nixpkgs-5310ebc9d2cf5046af495738f49bc384d6065800.tar.bz2 nixpkgs-5310ebc9d2cf5046af495738f49bc384d6065800.tar.lz nixpkgs-5310ebc9d2cf5046af495738f49bc384d6065800.tar.xz nixpkgs-5310ebc9d2cf5046af495738f49bc384d6065800.tar.zst nixpkgs-5310ebc9d2cf5046af495738f49bc384d6065800.zip | |
Merge pull request #132654 from ymatsiuk/132652
teleport: 6.2.7 -> 6.2.8
| -rw-r--r-- | pkgs/servers/teleport/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/servers/teleport/test.patch | 13 |
2 files changed, 23 insertions, 6 deletions
diff --git a/pkgs/servers/teleport/default.nix b/pkgs/servers/teleport/default.nix index ad96798133b..57866388b46 100644 --- a/pkgs/servers/teleport/default.nix +++ b/pkgs/servers/teleport/default.nix @@ -4,21 +4,21 @@ let webassets = fetchFromGitHub { owner = "gravitational"; repo = "webassets"; - rev = "8a30ee4e3570c7db0566028b6b562167aa40f646"; - sha256 = "sha256-noMVcB1cjiMcRke6/qJIzDaEh4uPIewsedLQRdPbzIQ="; + rev = "c63397375632f1a4323918dde78334472f3ffbb9"; + sha256 = "sha256-6YKk0G3s+35PRsUBkKgu/tNoSSwjJ5bTn8DACF4gYr4="; }; in buildGoModule rec { pname = "teleport"; - version = "6.2.7"; + version = "6.2.8"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "0ychs2pqi3awbr0vraz0ksddwk5hihrd1d9raq8mxyw5dz5124ki"; + sha256 = "sha256-TVjdz97CUXBKCQh9bYrvtcH4StblBMsXiQ9Gix/NIm4="; }; vendorSha256 = null; @@ -27,8 +27,12 @@ buildGoModule rec { nativeBuildInputs = [ zip makeWrapper ]; - # https://github.com/NixOS/nixpkgs/issues/120738 - patches = [ ./tsh.patch ]; + patches = [ + # https://github.com/NixOS/nixpkgs/issues/120738 + ./tsh.patch + # https://github.com/NixOS/nixpkgs/issues/132652 + ./test.patch + ]; postBuild = '' pushd . diff --git a/pkgs/servers/teleport/test.patch b/pkgs/servers/teleport/test.patch new file mode 100644 index 00000000000..49f5a17663e --- /dev/null +++ b/pkgs/servers/teleport/test.patch @@ -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) + } |