From eb43e8dd1b045d5a524465007b3d2a52f2732fed Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 20 Apr 2020 01:17:48 +0100
Subject: [PATCH 1/5] maintainers/teams: add acme team

---
 maintainers/team-list.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 7efff7f45eca..16c902ab8c5d 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -17,6 +17,18 @@
 
 { lib }:
 with lib.maintainers; {
+  acme = {
+    members = [
+      aanderse
+      andrew-d
+      arianvp
+      emily
+      flokli
+      m1cr0man
+    ];
+    scope = "Maintain ACME-related packages and modules.";
+  };
+
   freedesktop = {
     members = [ jtojnar worldofpeace ];
     scope = "Maintain Freedesktop.org packages for graphical desktop.";

From ef7e6eeaf417858ff51aa66ced6b274450b68786 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 20 Apr 2020 01:36:13 +0100
Subject: [PATCH 2/5] nixos/acme: set maintainers to acme team

---
 nixos/modules/security/acme.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 39976380e3b4..36f91529265e 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -458,7 +458,7 @@ in
   ];
 
   meta = {
-    maintainers = with lib.maintainers; [ abbradar fpletz globin m1cr0man ];
+    maintainers = lib.teams.acme.members;
     doc = ./acme.xml;
   };
 }

From bfffee9364cfa2abe67e0d863ac3974ad8834a6d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 20 Apr 2020 01:36:29 +0100
Subject: [PATCH 3/5] nixos/tests/acme: set maintainers to acme team

---
 nixos/tests/acme.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix
index 693f02962f45..fc41dc1eb5ff 100644
--- a/nixos/tests/acme.nix
+++ b/nixos/tests/acme.nix
@@ -12,8 +12,9 @@ let
     fi
   '';
 
-in import ./make-test-python.nix {
+in import ./make-test-python.nix ({ lib, ... }: {
   name = "acme";
+  meta.maintainers = lib.teams.acme.members;
 
   nodes = rec {
     acme = { nodes, lib, ... }: {
@@ -207,4 +208,4 @@ in import ./make-test-python.nix {
               "curl --cacert /tmp/ca.crt https://c.example.test/ | grep -qF 'hello world'"
           )
     '';
-}
+})

From f3c18b24203e9a4ee8937fc4497baf0c5ad9e32b Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 20 Apr 2020 01:36:40 +0100
Subject: [PATCH 4/5] lego: set maintainers to acme team

---
 pkgs/tools/admin/lego/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix
index 72c61ceecaf2..ce250d33e946 100644
--- a/pkgs/tools/admin/lego/default.nix
+++ b/pkgs/tools/admin/lego/default.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     description = "Let's Encrypt client and ACME library written in Go";
     license = licenses.mit;
     homepage = "https://go-acme.github.io/lego/";
-    maintainers = with maintainers; [ andrew-d ];
+    maintainers = teams.acme.members;
   };
 }

From 3112c0e7fa50b2615284866468792cda644e2f2d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 20 Apr 2020 01:36:42 +0100
Subject: [PATCH 5/5] pebble: set maintainers to acme team

---
 pkgs/tools/admin/pebble/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix
index efd9bfe05964..4813f86ea641 100644
--- a/pkgs/tools/admin/pebble/default.nix
+++ b/pkgs/tools/admin/pebble/default.nix
@@ -21,6 +21,6 @@ in buildGoPackage {
     homepage = "https://github.com/letsencrypt/pebble";
     description = "A miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
     license = [ lib.licenses.mpl20 ];
-    maintainers = with lib.maintainers; [ emily ];
+    maintainers = lib.teams.acme.members;
   };
 }