From da8923a825594bfba0393ca64dd0f2da5a092fdd Mon Sep 17 00:00:00 2001 From: Taylor Gunnoe Date: Wed, 24 Mar 2021 16:30:26 -0400 Subject: maintainers: add tgunnoe --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 54c7d5e9e5cad..0974dbd14224e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9469,6 +9469,12 @@ githubId = 378734; name = "TG ⊗ Θ"; }; + tgunnoe = { + email = "t@gvno.net"; + github = "tgunnoe"; + githubId = 7254833; + name = "Taylor Gunnoe"; + }; th0rgal = { email = "thomas.marchand@tuta.io"; github = "Th0rgal"; -- cgit 1.4.1 From 54a25c67f9e778b949fe26608e7b2a108e847ff0 Mon Sep 17 00:00:00 2001 From: jmc-figueira Date: Sat, 22 Jan 2022 00:38:01 +0000 Subject: maintainers: add jmc-figueira --- maintainers/maintainer-list.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index db182861c7ba5..b7a9fbe11ce77 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5709,6 +5709,26 @@ githubId = 8900; name = "Johan Magnus Jonsson"; }; + jmc-figueira = { + email = "business+nixos@jmc-figueira.dev"; + github = "jmc-figueira"; + githubId = 6634716; + name = "João Figueira"; + keys = [ + + # GitHub signing key + { + longkeyid = "rsa4096/0xDC7AE56AE98E02D7"; + fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; + } + + # Email encryption + { + longkeyid = "ed25519/0x197F9A632D139E30"; + fingerprint = "816D 23F5 E672 EC58 7674 4A73 197F 9A63 2D13 9E30"; + } + ]; + }; jmettes = { email = "jonathan@jmettes.com"; github = "jmettes"; -- cgit 1.4.1 From 29dd066a556a86d608d72e0d14d964a1439fea7a Mon Sep 17 00:00:00 2001 From: João Figueira Date: Sun, 23 Jan 2022 03:46:00 +0000 Subject: maintainers: fixed formatting of maintainer entry for jmc-figueira Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 2 -- 1 file changed, 2 deletions(-) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index b7a9fbe11ce77..abdb8d973ab8b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5715,13 +5715,11 @@ githubId = 6634716; name = "João Figueira"; keys = [ - # GitHub signing key { longkeyid = "rsa4096/0xDC7AE56AE98E02D7"; fingerprint = "EC08 7AA3 DEAD A972 F015 6371 DC7A E56A E98E 02D7"; } - # Email encryption { longkeyid = "ed25519/0x197F9A632D139E30"; -- cgit 1.4.1 From 745e1ea21b7644d20224154a992528beaf7bccb5 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Sat, 8 Jan 2022 16:55:30 +1000 Subject: maintainers/teams: add kubernetes --- maintainers/team-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'maintainers') diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6f21c990b509a..361be88045f18 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -166,6 +166,17 @@ with lib.maintainers; { scope = "Maintain Jitsi."; }; + kubernetes = { + members = [ + johanot + offline + saschagrunert + srhb + zowoq + ]; + scope = "Maintain the Kubernetes package and module"; + }; + kodi = { members = [ aanderse -- cgit 1.4.1