diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-01-24 00:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 00:01:45 +0000 |
| commit | 11cced74386b684080ae9476f792c8511380ed8d (patch) | |
| tree | bdd86a73ff8961006523ebe74fe20a4f07cc246d /maintainers | |
| parent | 93a9821309e7386116e53ef5f306069cb02be8f7 (diff) | |
| parent | 7502596e708f747765a4969b40723549a5a000f6 (diff) | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 24 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 11 |
2 files changed, 35 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 563c21b34deea..966ed4197e5bf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5711,6 +5711,24 @@ 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"; @@ -11850,6 +11868,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"; 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 |