diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 116 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 9 |
2 files changed, 121 insertions, 4 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5fda9284d6f6..e5aa18445485 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -816,6 +816,12 @@ githubId = 7112447; name = "Andre S. Ramos"; }; + andrevmatos = { + email = "andrevmatos@gmail.com"; + github = "andrevmatos"; + githubId = 587021; + name = "André V L Matos"; + }; andrew-d = { email = "andrew@du.nham.ca"; github = "andrew-d"; @@ -1417,6 +1423,12 @@ githubId = 35324; name = "Badi' Abdul-Wahid"; }; + baitinq = { + email = "manuelpalenzuelamerino@gmail.com"; + name = "Baitinq"; + github = "Baitinq"; + githubId = 30861839; + }; balodja = { email = "balodja@gmail.com"; github = "balodja"; @@ -2919,7 +2931,7 @@ danth = { name = "Daniel Thwaites"; email = "danthwaites30@btinternet.com"; - matrix = "@danth:pwak.org"; + matrix = "@danth:danth.me"; github = "danth"; githubId = 28959268; keys = [{ @@ -4422,6 +4434,12 @@ githubId = 74379; name = "Florian Pester"; }; + fmoda3 = { + email = "fmoda3@mac.com"; + github = "fmoda3"; + githubId = 1746471; + name = "Frank Moda III"; + }; fmthoma = { email = "f.m.thoma@googlemail.com"; github = "fmthoma"; @@ -5775,6 +5793,16 @@ github = "jacg"; githubId = 2570854; }; + jakehamilton = { + name = "Jake Hamilton"; + email = "jake.hamilton@hey.com"; + matrix = "@jakehamilton:matrix.org"; + github = "jakehamilton"; + githubId = 7005773; + keys = [{ + fingerprint = "B982 0250 1720 D540 6A18 2DA8 188E 4945 E85B 2D21"; + }]; + }; jasoncarr = { email = "jcarr250@gmail.com"; github = "jasoncarr0"; @@ -6540,6 +6568,12 @@ githubId = 705123; name = "Jan Tojnar"; }; + jtrees = { + email = "me@jtrees.io"; + github = "jtrees"; + githubId = 5802758; + name = "Joshua Trees"; + }; juaningan = { email = "juaningan@gmail.com"; github = "uningan"; @@ -8040,11 +8074,11 @@ name = "Michael Fellinger"; }; maralorn = { - email = "malte.brandy@maralorn.de"; + email = "mail@maralorn.de"; matrix = "@maralorn:maralorn.de"; github = "maralorn"; githubId = 1651325; - name = "Malte Brandy"; + name = "maralorn"; }; marcweber = { email = "marco-oweber@gmx.de"; @@ -8593,6 +8627,12 @@ fingerprint = "FEF0 AE2D 5449 3482 5F06 40AA 186A 1EDA C5C6 3F83"; }]; }; + mightyiam = { + email = "mightyiampresence@gmail.com"; + github = "mightyiam"; + githubId = 635591; + name = "Shahar Dawn Or"; + }; mihnea-s = { email = "mihn.stn@gmail.com"; github = "mihnea-s"; @@ -8941,7 +8981,7 @@ name = "Millian Poquet"; }; mpscholten = { - email = "marc@mpscholten.de"; + email = "marc@digitallyinduced.com"; github = "mpscholten"; githubId = 2072185; name = "Marc Scholten"; @@ -9652,6 +9692,12 @@ github = "numkem"; githubId = 332423; }; + nviets = { + email = "nathan.g.viets@gmail.com"; + github = "nviets"; + githubId = 16027994; + name = "Nathan Viets"; + }; nyanloutre = { email = "paul@nyanlout.re"; github = "nyanloutre"; @@ -9692,6 +9738,12 @@ githubId = 3359345; name = "obadz"; }; + oberblastmeister = { + email = "littlebubu.shu@gmail.com"; + github = "oberblastmeister"; + githubId = 61095988; + name = "Brian Shu"; + }; obsidian-systems-maintenance = { name = "Obsidian Systems Maintenance"; email = "maintainer@obsidian.systems"; @@ -10948,6 +11000,12 @@ githubId = 7226587; name = "Théophane Hufschmitt"; }; + rehno-lindeque = { + email = "rehno.lindeque+code@gmail.com"; + github = "rehno-lindeque"; + githubId = 337811; + name = "Rehno Lindeque"; + }; relrod = { email = "ricky@elrod.me"; github = "relrod"; @@ -11524,6 +11582,12 @@ fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; }]; }; + samlukeyes123 = { + email = "samlukeyes123@gmail.com"; + github = "SamLukeYes"; + githubId = 12882091; + name = "Sam L. Yes"; + }; samrose = { email = "samuel.rose@gmail.com"; github = "samrose"; @@ -13055,6 +13119,12 @@ githubId = 3268082; name = "Thibaut Marty"; }; + thyol = { + name = "thyol"; + email = "thyol@pm.me"; + github = "thyol"; + githubId = 81481634; + }; thmzlt = { email = "git@thomazleite.com"; github = "thmzlt"; @@ -13506,6 +13576,15 @@ fingerprint = "EE59 5E29 BB5B F2B3 5ED2 3F1C D276 FF74 6700 7335"; }]; }; + unhammer = { + email = "unhammer@fsfe.org"; + github = "unhammer"; + githubId = 56868; + name = "Kevin Brubeck Unhammer"; + keys = [{ + fingerprint = "50D4 8796 0B86 3F05 4B6A 12F9 7426 06DE 766A C60C"; + }]; + }; uniquepointer = { email = "uniquepointer@mailbox.org"; matrix = "@uniquepointer:matrix.org"; @@ -15066,4 +15145,33 @@ github = "yisuidenghua"; githubId = 102890144; }; + macalinao = { + email = "me@ianm.com"; + name = "Ian Macalinao"; + github = "macalinao"; + githubId = 401263; + keys = [{ + fingerprint = "1147 43F1 E707 6F3E 6F4B 2C96 B9A8 B592 F126 F8E8"; + }]; + }; + tjni = { + email = "43ngvg@masqt.com"; + matrix = "@tni:matrix.org"; + name = "Theodore Ni"; + github = "tjni"; + githubId = 3806110; + keys = [{ + fingerprint = "4384 B8E1 299F C028 1641 7B8F EC30 EFBE FA7E 84A4"; + }]; + }; + cafkafk = { + email = "cafkafk@cafkafk.com"; + matrix = "@cafkafk:matrix.cafkafk.com"; + name = "Christina Sørensen"; + github = "cafkafk"; + githubId = 89321978; + keys = [{ + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + }]; + }; } diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 13936b4fd5a5..fbd7972cb2bb 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -74,6 +74,15 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + bitnomial = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + cdepillabout + ]; + scope = "Group registration for packages maintained by Bitnomial."; + shortName = "Bitnomial employees"; + }; + blockchains = { members = [ mmahut |