From 0fd8cc390806ef15ded043e729816faa277120af Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 18 Sep 2021 23:00:51 +0800 Subject: [PATCH] treewide: switch from pantheon.maintainers to lib.teams.pantheon --- nixos/modules/services/desktops/gsignond.nix | 2 +- nixos/modules/services/x11/desktop-managers/pantheon.nix | 2 +- nixos/tests/pantheon.nix | 4 ++-- pkgs/applications/graphics/akira/default.nix | 2 +- pkgs/applications/graphics/ideogram/default.nix | 2 +- pkgs/applications/misc/appeditor/default.nix | 2 +- pkgs/applications/misc/cipher/default.nix | 2 +- pkgs/applications/misc/formatter/default.nix | 2 +- pkgs/applications/misc/plank/default.nix | 3 +-- pkgs/applications/misc/sequeler/default.nix | 2 +- pkgs/applications/networking/browsers/ephemeral/default.nix | 2 +- pkgs/applications/networking/ping/default.nix | 2 +- pkgs/applications/office/agenda/default.nix | 2 +- pkgs/applications/office/elementary-planner/default.nix | 2 +- pkgs/applications/office/khronos/default.nix | 2 +- pkgs/applications/office/spice-up/default.nix | 2 +- pkgs/applications/science/math/nasc/default.nix | 2 +- pkgs/applications/system/monitor/default.nix | 2 +- .../gnome/core/gnome-settings-daemon/3.38/default.nix | 2 +- pkgs/desktops/gnome/core/mutter/3.38/default.nix | 2 +- pkgs/desktops/pantheon/apps/appcenter/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-calculator/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-calendar/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-camera/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-code/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-dock/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-feedback/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-files/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-mail/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-music/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-tasks/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-terminal/default.nix | 2 +- pkgs/desktops/pantheon/apps/elementary-videos/default.nix | 2 +- pkgs/desktops/pantheon/apps/sideload/default.nix | 2 +- .../desktops/pantheon/apps/switchboard-plugs/a11y/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/about/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/applications/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/bluetooth/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/datetime/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/display/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/keyboard/default.nix | 2 +- .../apps/switchboard-plugs/mouse-touchpad/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/network/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/notifications/default.nix | 2 +- .../apps/switchboard-plugs/onlineaccounts/default.nix | 2 +- .../apps/switchboard-plugs/pantheon-shell/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/power/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/printers/default.nix | 2 +- .../apps/switchboard-plugs/security-privacy/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/sharing/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/sound/default.nix | 2 +- .../pantheon/apps/switchboard-plugs/wacom/default.nix | 2 +- pkgs/desktops/pantheon/apps/switchboard/default.nix | 2 +- .../pantheon/artwork/elementary-gtk-theme/default.nix | 2 +- .../pantheon/artwork/elementary-icon-theme/default.nix | 2 +- .../pantheon/artwork/elementary-redacted-script/default.nix | 2 +- .../pantheon/artwork/elementary-sound-theme/default.nix | 2 +- .../pantheon/artwork/elementary-wallpapers/default.nix | 2 +- .../pantheon/desktop/elementary-default-settings/default.nix | 2 +- pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix | 2 +- .../pantheon/desktop/elementary-onboarding/default.nix | 2 +- .../pantheon/desktop/elementary-print-shim/default.nix | 2 +- .../pantheon/desktop/elementary-session-settings/default.nix | 2 +- .../pantheon/desktop/elementary-shortcut-overlay/default.nix | 2 +- pkgs/desktops/pantheon/desktop/gala/default.nix | 2 +- .../pantheon/desktop/wingpanel-indicators/a11y/default.nix | 2 +- .../wingpanel-indicators/applications-menu/default.nix | 2 +- .../desktop/wingpanel-indicators/bluetooth/default.nix | 2 +- .../desktop/wingpanel-indicators/datetime/default.nix | 2 +- .../desktop/wingpanel-indicators/keyboard/default.nix | 2 +- .../pantheon/desktop/wingpanel-indicators/network/default.nix | 2 +- .../desktop/wingpanel-indicators/nightlight/default.nix | 2 +- .../desktop/wingpanel-indicators/notifications/default.nix | 2 +- .../pantheon/desktop/wingpanel-indicators/power/default.nix | 2 +- .../pantheon/desktop/wingpanel-indicators/session/default.nix | 2 +- .../pantheon/desktop/wingpanel-indicators/sound/default.nix | 2 +- pkgs/desktops/pantheon/desktop/wingpanel/default.nix | 2 +- pkgs/desktops/pantheon/granite/default.nix | 2 +- pkgs/desktops/pantheon/services/contractor/default.nix | 2 +- .../pantheon/services/elementary-capnet-assist/default.nix | 2 +- .../pantheon/services/elementary-notifications/default.nix | 2 +- .../pantheon/services/elementary-settings-daemon/default.nix | 2 +- .../pantheon/services/pantheon-agent-geoclue2/default.nix | 2 +- .../pantheon/services/pantheon-agent-polkit/default.nix | 2 +- pkgs/development/libraries/bamf/default.nix | 2 +- pkgs/development/tools/vala-lint/default.nix | 2 +- pkgs/misc/screensavers/light-locker/default.nix | 2 +- pkgs/tools/inputmethods/touchegg/default.nix | 2 +- pkgs/tools/misc/hashit/default.nix | 2 +- pkgs/tools/text/snippetpixie/default.nix | 4 +--- 92 files changed, 93 insertions(+), 96 deletions(-) diff --git a/nixos/modules/services/desktops/gsignond.nix b/nixos/modules/services/desktops/gsignond.nix index 5ab9add9f32d..465acd73fa64 100644 --- a/nixos/modules/services/desktops/gsignond.nix +++ b/nixos/modules/services/desktops/gsignond.nix @@ -9,7 +9,7 @@ let in { - meta.maintainers = pkgs.pantheon.maintainers; + meta.maintainers = teams.pantheon.members; ###### interface diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 1e9fb269a261..887d6c91e83b 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -18,7 +18,7 @@ in meta = { doc = ./pantheon.xml; - maintainers = pkgs.pantheon.maintainers; + maintainers = teams.pantheon.members; }; options = { diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 013ab441ab41..07588ddc3176 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -3,8 +3,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { name = "pantheon"; - meta = with pkgs.lib.maintainers; { - maintainers = pkgs.pantheon.maintainers; + meta = with lib; { + maintainers = teams.pantheon.members; }; machine = { ... }: diff --git a/pkgs/applications/graphics/akira/default.nix b/pkgs/applications/graphics/akira/default.nix index 46e4de27547f..430c582dd793 100644 --- a/pkgs/applications/graphics/akira/default.nix +++ b/pkgs/applications/graphics/akira/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { description = "Native Linux Design application built in Vala and GTK"; homepage = "https://github.com/akiraux/Akira"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ Br1ght0ne neonfuz ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/graphics/ideogram/default.nix b/pkgs/applications/graphics/ideogram/default.nix index f78170fde34a..f9b123ddb40b 100644 --- a/pkgs/applications/graphics/ideogram/default.nix +++ b/pkgs/applications/graphics/ideogram/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Insert emoji anywhere, even in non-native apps - designed for elementary OS"; homepage = "https://github.com/cassidyjames/ideogram"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; diff --git a/pkgs/applications/misc/appeditor/default.nix b/pkgs/applications/misc/appeditor/default.nix index a715681ae9f2..f8e709e423fd 100644 --- a/pkgs/applications/misc/appeditor/default.nix +++ b/pkgs/applications/misc/appeditor/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Edit the Pantheon desktop application menu"; homepage = "https://github.com/donadigo/appeditor"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/cipher/default.nix b/pkgs/applications/misc/cipher/default.nix index eab1185edd81..5675676d9519 100644 --- a/pkgs/applications/misc/cipher/default.nix +++ b/pkgs/applications/misc/cipher/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple application for encoding and decoding text, designed for elementary OS"; homepage = "https://github.com/arshubham/cipher"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/misc/formatter/default.nix b/pkgs/applications/misc/formatter/default.nix index e8f329ecb0da..4532b766f47b 100644 --- a/pkgs/applications/misc/formatter/default.nix +++ b/pkgs/applications/misc/formatter/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple formatter designed for elementary OS"; homepage = "https://github.com/Djaler/Formatter"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.lgpl2Plus; }; diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix index 85e3bb48119c..1a8f0df5e41c 100644 --- a/pkgs/applications/misc/plank/default.nix +++ b/pkgs/applications/misc/plank/default.nix @@ -23,7 +23,6 @@ , libgee , wrapGAppsHook , autoreconfHook -, pantheon }: stdenv.mkDerivation rec { @@ -84,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/plank"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix index 5fd5176c95f8..123e01fe798a 100644 --- a/pkgs/applications/misc/sequeler/default.nix +++ b/pkgs/applications/misc/sequeler/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/Alecaddd/sequeler"; license = licenses.gpl3; - maintainers = [ maintainers.etu ] ++ pantheon.maintainers; + maintainers = with maintainers; [ etu ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/browsers/ephemeral/default.nix b/pkgs/applications/networking/browsers/ephemeral/default.nix index 64e261425755..1fea44e66279 100644 --- a/pkgs/applications/networking/browsers/ephemeral/default.nix +++ b/pkgs/applications/networking/browsers/ephemeral/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "The always-incognito web browser"; homepage = "https://github.com/cassidyjames/ephemeral"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/networking/ping/default.nix b/pkgs/applications/networking/ping/default.nix index 40240565973d..82194e38eae7 100644 --- a/pkgs/applications/networking/ping/default.nix +++ b/pkgs/applications/networking/ping/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A helpful tool that lets you debug what part of your API is causing you issues"; homepage = "https://github.com/jeremyvaartjes/ping"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/agenda/default.nix b/pkgs/applications/office/agenda/default.nix index 6654ed529fc3..c42052e5f7d4 100644 --- a/pkgs/applications/office/agenda/default.nix +++ b/pkgs/applications/office/agenda/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A simple, fast, no-nonsense to-do (task) list designed for elementary OS"; homepage = "https://github.com/dahenson/agenda"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/applications/office/elementary-planner/default.nix b/pkgs/applications/office/elementary-planner/default.nix index 73888fbfe3d2..550316b82c55 100644 --- a/pkgs/applications/office/elementary-planner/default.nix +++ b/pkgs/applications/office/elementary-planner/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { description = "Task manager with Todoist support designed for GNU/Linux 🚀️"; homepage = "https://planner-todo.web.app"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ] ++ pantheon.maintainers; + maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; }; } diff --git a/pkgs/applications/office/khronos/default.nix b/pkgs/applications/office/khronos/default.nix index 0238388d7eab..b3a38905531e 100644 --- a/pkgs/applications/office/khronos/default.nix +++ b/pkgs/applications/office/khronos/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Track each task's time in a simple inobtrusive way"; homepage = "https://github.com/lainsce/khronos"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix index 28e35d08e917..b51eeb1ad954 100644 --- a/pkgs/applications/office/spice-up/default.nix +++ b/pkgs/applications/office/spice-up/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Create simple and beautiful presentations"; homepage = "https://github.com/Philip-Scott/Spice-up"; - maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ samdroid-apps xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; # The COPYING file has GPLv3; some files have GPLv2+ and some have GPLv3+ license = licenses.gpl3Plus; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 431668f0c583..dffbdaa23aa8 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation rec { the equations it’s used in. ''; homepage = "https://github.com/parnold-x/nasc"; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix index 588839b859da..720dc594c465 100644 --- a/pkgs/applications/system/monitor/default.nix +++ b/pkgs/applications/system/monitor/default.nix @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { section in the NixOS manual. ''; homepage = "https://github.com/stsdc/monitor"; - maintainers = with maintainers; [ xiorcale ] ++ pantheon.maintainers; + maintainers = with maintainers; [ xiorcale ] ++ teams.pantheon.members; platforms = platforms.linux; license = licenses.gpl3; }; diff --git a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix index 06a560380537..de48b72faca4 100644 --- a/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix +++ b/pkgs/desktops/gnome/core/gnome-settings-daemon/3.38/default.nix @@ -129,7 +129,7 @@ stdenv.mkDerivation rec { description = "GNOME Settings Daemon"; homepage = "https://gitlab.gnome.org/GNOME/gnome-settings-daemon/"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/gnome/core/mutter/3.38/default.nix b/pkgs/desktops/gnome/core/mutter/3.38/default.nix index 2d3f9f7bb75a..3c2d30b813ba 100644 --- a/pkgs/desktops/gnome/core/mutter/3.38/default.nix +++ b/pkgs/desktops/gnome/core/mutter/3.38/default.nix @@ -157,7 +157,7 @@ let self = stdenv.mkDerivation rec { description = "A window manager for GNOME"; homepage = "https://gitlab.gnome.org/GNOME/mutter"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; }; diff --git a/pkgs/desktops/pantheon/apps/appcenter/default.nix b/pkgs/desktops/pantheon/apps/appcenter/default.nix index b88d8f5518ef..441ef51b8f6f 100644 --- a/pkgs/desktops/pantheon/apps/appcenter/default.nix +++ b/pkgs/desktops/pantheon/apps/appcenter/default.nix @@ -97,6 +97,6 @@ stdenv.mkDerivation rec { description = "An open, pay-what-you-want app store for indie developers, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix index b2f0bc906ca5..7fbaa32dc39f 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calculator/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { description = "Calculator app designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix index d9f8cc69c16e..6afd44018314 100644 --- a/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-calendar/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/calendar"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix index 838bd5ae862e..432e5fdf00e7 100644 --- a/pkgs/desktops/pantheon/apps/elementary-camera/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-camera/default.nix @@ -80,6 +80,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/camera"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix index 96071e0c77c4..8516133b18d8 100644 --- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/code"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix index e0347e509c68..4de65108c564 100644 --- a/pkgs/desktops/pantheon/apps/elementary-dock/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-dock/default.nix @@ -75,6 +75,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/dock"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix index a06188fa6960..e65e45809c45 100644 --- a/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-feedback/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/feedback"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 3b9b0648c4d0..dcdd1bb9acec 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -99,6 +99,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/files"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix index 88c9b983b455..6d0b752c1d1d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-mail/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-mail/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/mail"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers ++ [ maintainers.ethancedwards8 ]; + maintainers = with maintainers; [ ethancedwards8 ] ++ teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-music/default.nix b/pkgs/desktops/pantheon/apps/elementary-music/default.nix index 3a865967ac3d..300e7919dced 100644 --- a/pkgs/desktops/pantheon/apps/elementary-music/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-music/default.nix @@ -107,6 +107,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/music"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 897b62d2a381..d1206c9d0ae0 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -113,6 +113,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/photos"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix index a7f2489da45e..4eb574d69f26 100644 --- a/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-screenshot/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/screenshot"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix index 20e6b576483f..bec0556a377d 100644 --- a/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-tasks/default.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation rec { description = "Synced tasks and reminders on elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix index 370dcad9bdff..cd0e39628023 100644 --- a/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-terminal/default.nix @@ -90,6 +90,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/terminal"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index e0f076719aaf..0c06e7b24439 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -82,6 +82,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/videos"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/sideload/default.nix b/pkgs/desktops/pantheon/apps/sideload/default.nix index 5f233f04bc42..fad1186578cf 100644 --- a/pkgs/desktops/pantheon/apps/sideload/default.nix +++ b/pkgs/desktops/pantheon/apps/sideload/default.nix @@ -71,6 +71,6 @@ stdenv.mkDerivation rec { description = "Flatpak installer, designed for elementary OS"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix index 5a0ab7a856d7..949f1ecc3d0b 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/a11y/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-a11y"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix index cb12f5b8cc20..c1144dd4ecd6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-about"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix index 325ad3b96fec..3b3cbf64ef85 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/applications/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-applications"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix index 2ddd6ab696ea..2238125fe2f6 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/bluetooth/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-bluetooth"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix index cfd3402edc1c..b4518ea1e440 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/datetime/default.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix index 82477c80a0b4..0fbb1eb81e7c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-display"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix index 9188e91d6baa..d8023a1bf37c 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/keyboard/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-keyboard"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix index a86a526366f9..ca0319a5498d 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-mouse-touchpad"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix index 5337d39fe0e7..7ccfb265e9e9 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/network/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-network"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix index 7c2583105cf9..42cddfd2d67f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/notifications/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-notifications"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix index 5c59a48289d4..9aa9d7e6780a 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/onlineaccounts/default.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-onlineaccounts"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix index e4e461f4baae..69242e8132f1 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/pantheon-shell/default.nix @@ -78,6 +78,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix index 98a9c039ef4f..a9c60600f045 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-power"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix index 2c870d12c2d9..cae5b570547f 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/printers/default.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-printers"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix index 58c8266f16a9..986aa171e920 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/security-privacy/default.nix @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-security-privacy"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix index faedee81f5cd..2eacf5585109 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sharing/default.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-sharing"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix index ddcb81e154ed..7719477ce702 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-sound"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix index 1c80659bc526..9268fa76aefc 100644 --- a/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/wacom/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard-plug-wacom"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/apps/switchboard/default.nix b/pkgs/desktops/pantheon/apps/switchboard/default.nix index 9580f063ba04..bdab9b0d7662 100644 --- a/pkgs/desktops/pantheon/apps/switchboard/default.nix +++ b/pkgs/desktops/pantheon/apps/switchboard/default.nix @@ -74,6 +74,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/switchboard"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix index 657e1c3e116f..e0299767ef3f 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-gtk-theme/default.nix @@ -39,6 +39,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/stylesheet"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix index bd4845172c52..abaf8d6c31c5 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/icons"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix index 6a9d1b0aca36..b9c51f5688c2 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-redacted-script/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { description = "Font for concealing text"; homepage = "https://github.com/png2378/redacted-elementary"; license = licenses.ofl; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix index d273f03f4bda..6fe18119b458 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-sound-theme/default.nix @@ -37,6 +37,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/sound-theme"; license = licenses.unlicense; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix index f2f89ea1eacf..9fd0a4d1a4e8 100644 --- a/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix +++ b/pkgs/desktops/pantheon/artwork/elementary-wallpapers/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wallpapers"; license = licenses.publicDomain; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix index 1518c06a2650..1751636da008 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-default-settings/default.nix @@ -85,6 +85,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/default-settings"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix index 541faf2474b5..86b71ab49930 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-greeter/default.nix @@ -134,6 +134,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/greeter"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix index 05e92e127a3c..e7b0248ad425 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-onboarding/default.nix @@ -76,6 +76,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/onboarding"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix index 7b821f883ce9..c64cfced0c55 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-print-shim/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/print"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix index eab14403bd7c..e3d0cb8c7282 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix @@ -155,6 +155,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/session-settings"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix index ef4fdf80cef2..3a6fbc194772 100644 --- a/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix +++ b/pkgs/desktops/pantheon/desktop/elementary-shortcut-overlay/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/shortcut-overlay"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/gala/default.nix b/pkgs/desktops/pantheon/desktop/gala/default.nix index 9e0229be5b23..280a6a07576d 100644 --- a/pkgs/desktops/pantheon/desktop/gala/default.nix +++ b/pkgs/desktops/pantheon/desktop/gala/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/gala"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix index ff89c2de3304..7e185ece23ac 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/a11y/default.nix @@ -65,6 +65,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-a11y"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 3e2163d877fe..29432bf19656 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -95,6 +95,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/applications-menu"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix index e2129de263f3..a9b13650ddba 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-bluetooth"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix index a892339fd10c..ad030277463c 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/datetime/default.nix @@ -83,6 +83,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-datetime"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix index cd5b51a560ff..6d5227b7139f 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/keyboard/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-keyboard"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix index 3b599e455f6f..92738df7b355 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/network/default.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-network"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix index 8d454cd51ee3..23f9e400c01b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/nightlight/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-nightlight"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix index 77b0aabef64d..1a101a8a886d 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-notifications"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 8d0afb560c2e..f3d3ac0e46d5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -72,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-power"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix index e9c77a8d45da..eaccad35aa0b 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/session/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-session"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix index 00ae9bfc4b60..fcaf06de0113 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/sound/default.nix @@ -73,6 +73,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel-indicator-sound"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix index 7ed4adf29c7c..1ae9f9f4aaa5 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel/default.nix @@ -84,6 +84,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/wingpanel"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/granite/default.nix b/pkgs/desktops/pantheon/granite/default.nix index c7c5351bb28b..0e6d14d2425a 100644 --- a/pkgs/desktops/pantheon/granite/default.nix +++ b/pkgs/desktops/pantheon/granite/default.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/granite"; license = licenses.lgpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/contractor/default.nix b/pkgs/desktops/pantheon/services/contractor/default.nix index f503e26b8452..666e17362ac2 100644 --- a/pkgs/desktops/pantheon/services/contractor/default.nix +++ b/pkgs/desktops/pantheon/services/contractor/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/contractor"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix index ce30afac3cb7..0b904a112177 100644 --- a/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-capnet-assist/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/capnet-assist"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix index ac484c3a0592..15ae6840e454 100644 --- a/pkgs/desktops/pantheon/services/elementary-notifications/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-notifications/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { description = "GTK notification server for Pantheon"; homepage = "https://github.com/elementary/notifications"; license = licenses.gpl3Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix index e7dad3c2ccfd..d1aaad42e2f3 100644 --- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix +++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation rec { description = "Settings daemon for Pantheon"; homepage = "https://github.com/elementary/settings-daemon"; license = licenses.gpl3Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix index d62bc275ed9f..e2053ebf6a31 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-geoclue2/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/pantheon-agent-geoclue2"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix index 1a8fb8047598..4bef7fd5e08e 100644 --- a/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix +++ b/pkgs/desktops/pantheon/services/pantheon-agent-polkit/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/elementary/pantheon-agent-polkit"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/development/libraries/bamf/default.nix b/pkgs/development/libraries/bamf/default.nix index f53ea0d705cc..406ff81fe8ee 100644 --- a/pkgs/development/libraries/bamf/default.nix +++ b/pkgs/development/libraries/bamf/default.nix @@ -94,6 +94,6 @@ stdenv.mkDerivation rec { homepage = "https://launchpad.net/bamf"; license = licenses.lgpl3; platforms = platforms.linux; - maintainers = with maintainers; [ davidak ] ++ pantheon.maintainers; + maintainers = with maintainers; [ davidak ] ++ teams.pantheon.members; }; } diff --git a/pkgs/development/tools/vala-lint/default.nix b/pkgs/development/tools/vala-lint/default.nix index 3c91880e16ed..e91bceeae7a3 100644 --- a/pkgs/development/tools/vala-lint/default.nix +++ b/pkgs/development/tools/vala-lint/default.nix @@ -46,6 +46,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/misc/screensavers/light-locker/default.nix b/pkgs/misc/screensavers/light-locker/default.nix index ef1143f41430..0ad2c77dc7ef 100644 --- a/pkgs/misc/screensavers/light-locker/default.nix +++ b/pkgs/misc/screensavers/light-locker/default.nix @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { ConsoleKit/UPower or logind/systemd. ''; license = licenses.gpl2; - maintainers = with maintainers; [ obadz ] ++ pantheon.maintainers; + maintainers = with maintainers; [ obadz ] ++ teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index d1df32199545..69d05ceaed1e 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -62,6 +62,6 @@ stdenv.mkDerivation rec { description = "Linux multi-touch gesture recognizer"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; }; } diff --git a/pkgs/tools/misc/hashit/default.nix b/pkgs/tools/misc/hashit/default.nix index edda48bdc924..e26a0abbde3a 100644 --- a/pkgs/tools/misc/hashit/default.nix +++ b/pkgs/tools/misc/hashit/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { description = "A simple app for checking usual checksums - Designed for elementary OS"; homepage = "https://github.com/artemanufrij/hashit"; license = licenses.gpl2Plus; - maintainers = pantheon.maintainers; + maintainers = teams.pantheon.members; platforms = platforms.linux; }; } diff --git a/pkgs/tools/text/snippetpixie/default.nix b/pkgs/tools/text/snippetpixie/default.nix index 301831d1a830..e66a5404f439 100644 --- a/pkgs/tools/text/snippetpixie/default.nix +++ b/pkgs/tools/text/snippetpixie/default.nix @@ -86,9 +86,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.snippetpixie.com"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ - ianmjones - ] ++ pantheon.maintainers; + maintainers = with maintainers; [ ianmjones ] ++ teams.pantheon.members; platforms = platforms.linux; }; }