diff options
author | Maximilian Bosch <maximilian@mbosch.me> | 2020-06-18 00:23:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-18 00:23:55 +0200 |
commit | 0510cbe849e71a6cbe50656fd82e136a618cd404 (patch) | |
tree | abe5b6895d23a4b3a26cc1f69fdcfaf642db3ce4 | |
parent | 2a3ceb730b8da53ba19f5fcb44135d6ade0ed014 (diff) | |
parent | 650617253e8397634b7e3e4518c1c14168c1b100 (diff) | |
download | nixlib-0510cbe849e71a6cbe50656fd82e136a618cd404.tar nixlib-0510cbe849e71a6cbe50656fd82e136a618cd404.tar.gz nixlib-0510cbe849e71a6cbe50656fd82e136a618cd404.tar.bz2 nixlib-0510cbe849e71a6cbe50656fd82e136a618cd404.tar.lz nixlib-0510cbe849e71a6cbe50656fd82e136a618cd404.tar.xz nixlib-0510cbe849e71a6cbe50656fd82e136a618cd404.tar.zst nixlib-0510cbe849e71a6cbe50656fd82e136a618cd404.zip |
Merge pull request #90646 from Ma27/matrix-maintainer-team
maintainers/teams: add matrix team
-rw-r--r-- | maintainers/team-list.nix | 12 | ||||
-rw-r--r-- | nixos/modules/services/misc/matrix-synapse.nix | 1 | ||||
-rw-r--r-- | nixos/tests/matrix-synapse.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/instant-messengers/riot/riot-web.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/matrix-synapse/default.nix | 2 |
6 files changed, 18 insertions, 5 deletions
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 25a4995b733e..703a6a031d6f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -57,6 +57,18 @@ with lib.maintainers; { scope = "Maintain GNOME desktop environment and platform."; }; + matrix = { + members = [ + ma27 + pacien + fadenb + mguentner + ekleog + ralith + ]; + scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; + }; + php = { members = [ aanderse diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index 8ed4bbdd031c..e982eb16fa70 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -727,5 +727,6 @@ in { ]; meta.doc = ./matrix-synapse.xml; + meta.maintainers = teams.matrix.members; } diff --git a/nixos/tests/matrix-synapse.nix b/nixos/tests/matrix-synapse.nix index f3623aa3c094..9ca808721763 100644 --- a/nixos/tests/matrix-synapse.nix +++ b/nixos/tests/matrix-synapse.nix @@ -29,8 +29,8 @@ import ./make-test-python.nix ({ pkgs, ... } : let in { name = "matrix-synapse"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ corngood ]; + meta = with pkgs.stdenv.lib; { + maintainers = teams.matrix.members; }; nodes = { diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix index acdf40e772ea..b05f64c13822 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-desktop.nix @@ -78,7 +78,7 @@ in mkYarnPackage rec { description = "A feature-rich client for Matrix.org"; homepage = "https://about.riot.im/"; license = licenses.asl20; - maintainers = with maintainers; [ pacien worldofpeace ma27 ]; + maintainers = teams.matrix.members; inherit (electron.meta) platforms; }; } diff --git a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix index c08d1dbe0332..cc4eb4161f1b 100644 --- a/pkgs/applications/networking/instant-messengers/riot/riot-web.nix +++ b/pkgs/applications/networking/instant-messengers/riot/riot-web.nix @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { meta = { description = "A glossy Matrix collaboration client for the web"; homepage = "http://riot.im/"; - maintainers = with stdenv.lib.maintainers; [ bachp pacien ma27 ]; + maintainers = stdenv.lib.teams.matrix.members; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.all; hydraPlatforms = []; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index f2abcc4c024b..fbcec04e5320 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -77,6 +77,6 @@ buildPythonApplication rec { homepage = "https://matrix.org"; description = "Matrix reference homeserver"; license = licenses.asl20; - maintainers = with maintainers; [ ralith roblabla ekleog pacien ma27 ]; + maintainers = teams.matrix.members; }; } |