summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaximilian Bosch <maximilian@mbosch.me>2021-06-16 11:48:48 +0200
committerGitHub <noreply@github.com>2021-06-16 11:48:48 +0200
commitb3761f1173b1831cac2e89a396fb7be4e5e55556 (patch)
tree37e2e2765ff8e8152daa8fc1c2ef8d75deccab48
parentMerge pull request #127055 from NixOS/backport-126607-to-release-21.05 (diff)
parentmatrix-appservice-discord: increase test timeout (diff)
downloadnixpkgs-b3761f1173b1831cac2e89a396fb7be4e5e55556.tar.gz
Merge pull request #125967 from NixOS/backport-125953-to-release-21.05
[Backport release-21.05] matrix-appservice-discord: increase test timeout
-rw-r--r--maintainers/team-list.nix1
-rw-r--r--pkgs/servers/matrix-appservice-discord/default.nix3
2 files changed, 2 insertions, 2 deletions
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 1d8a920efcb2..a0bbc4d43837 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -145,7 +145,6 @@ with lib.maintainers; {
matrix = {
members = [
ma27
- pacien
fadenb
mguentner
ekleog
diff --git a/pkgs/servers/matrix-appservice-discord/default.nix b/pkgs/servers/matrix-appservice-discord/default.nix
index 4a41f019e179..7b7a67821f9e 100644
--- a/pkgs/servers/matrix-appservice-discord/default.nix
+++ b/pkgs/servers/matrix-appservice-discord/default.nix
@@ -43,7 +43,8 @@ in mkYarnPackage rec {
doCheck = true;
checkPhase = ''
- yarn --offline test
+ # the default 2000ms timeout is sometimes too short on our busy builders
+ yarn --offline test --timeout 10000
'';
postInstall = ''