From b24cc395ccf892827585d32246b4902bd9379113 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sun, 6 Jun 2021 16:08:22 +0200
Subject: [PATCH 1/2] maintainers/teams: remove pacien from the matrix team

I prefer to focus only on the individual packages which I know.
---
 maintainers/team-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index ab05ab7a5b23..3e6843f0e573 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -155,7 +155,6 @@ with lib.maintainers; {
   matrix = {
     members = [
       ma27
-      pacien
       fadenb
       mguentner
       ekleog

From 92f62de6f1ee9c9e31a8432ad222e79deef2ad87 Mon Sep 17 00:00:00 2001
From: pacien <pacien.trangirard@pacien.net>
Date: Sun, 6 Jun 2021 16:09:19 +0200
Subject: [PATCH 2/2] matrix-appservice-discord: increase test timeout

Hydra and my local machine are sometimes hitting the default timeout.
See https://hydra.nixos.org/build/138032455/nixlog/8/tail
---
 pkgs/servers/matrix-appservice-discord/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 = ''