From 10ac558ca10c11019d07f1fda8f9406a0642e81d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 27 Oct 2019 22:44:24 +0100
Subject: [PATCH 1/2] lib: Add lib.teams

Also add a freedesktop maintainer group as an example.
---
 lib/default.nix           |  1 +
 maintainers/team-list.nix | 24 ++++++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 maintainers/team-list.nix

diff --git a/lib/default.nix b/lib/default.nix
index 74d508ec1d6..716bd772c7f 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -24,6 +24,7 @@ let
     # packaging
     customisation = callLibs ./customisation.nix;
     maintainers = import ../maintainers/maintainer-list.nix;
+    teams = callLibs ../maintainers/team-list.nix;
     meta = callLibs ./meta.nix;
     sources = callLibs ./sources.nix;
     versions = callLibs ./versions.nix;
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
new file mode 100644
index 00000000000..f98bbeee912
--- /dev/null
+++ b/maintainers/team-list.nix
@@ -0,0 +1,24 @@
+/* List of maintainer teams.
+    name = {
+      # Required
+      members = [ maintainer1 maintainer2 ];
+      scope = "Maintain foo packages.";
+    };
+
+  where
+
+  - `members` is the list of maintainers belonging to the group,
+  - `scope` describes the scope of the group.
+
+  More fields may be added in the future.
+
+  Please keep the list alphabetically sorted.
+  */
+
+{ lib }:
+with lib.maintainers; {
+  freedesktop = {
+    members = [ jtojnar worldofpeace ];
+    scope = "Maintain Freedesktop.org packages for graphical desktop.";
+  };
+}

From 03941c1e673289dbc732da059d6edd7b61b8fde0 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 27 Oct 2019 22:49:09 +0100
Subject: [PATCH 2/2] colord: add freedesktop team to maintainers

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

diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 54379ec08f0..c6dbcfdda02 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
     description = "System service to manage, install and generate color profiles to accurately color manage input and output devices";
     homepage = https://www.freedesktop.org/software/colord/;
     license = licenses.lgpl2Plus;
-    maintainers = [ maintainers.marcweber ];
+    maintainers = [ maintainers.marcweber ] ++ teams.freedesktop.members;
     platforms = platforms.linux;
   };
 }