diff options
Diffstat (limited to 'maintainers')
-rw-r--r-- | maintainers/maintainer-list.nix | 47 | ||||
-rw-r--r-- | maintainers/team-list.nix | 10 |
2 files changed, 52 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 3d6cc12533840..d807828a8184a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3765,6 +3765,13 @@ githubId = 11006031; name = "Leo Maroni"; }; + emmabastas = { + email = "emma.bastas@protonmail.com"; + matrix = "@emmabastas:matrix.org"; + github = "emmabastas"; + githubId = 22533224; + name = "Emma Bastås"; + }; emmanuelrosa = { email = "emmanuelrosa@protonmail.com"; matrix = "@emmanuelrosa:matrix.org"; @@ -5067,6 +5074,12 @@ githubId = 2405974; name = "Sébastian Méric de Bellefon"; }; + helium = { + email = "helium.dev@tuta.io"; + github = "helium18"; + githubId = 86223025; + name = "helium"; + }; henkkalkwater = { email = "chris+nixpkgs@netsoj.nl"; github = "HenkKalkwater"; @@ -7900,6 +7913,12 @@ githubId = 65531; name = "Mario Rodas"; }; + marsupialgutz = { + email = "mars@possums.xyz"; + github = "marsupialgutz"; + githubId = 33522919; + name = "Marshall Arruda"; + }; martijnvermaat = { email = "martijn@vermaat.name"; github = "martijnvermaat"; @@ -7982,6 +8001,12 @@ githubId = 19036; name = "Matthew Bauer"; }; + matthiasbenaets = { + email = "matthias.benaets@gmail.com"; + github = "MatthiasBenaets"; + githubId = 89214559; + name = "Matthias Benaets"; + }; matthiasbeyer = { email = "mail@beyermatthias.de"; matrix = "@musicmatze:beyermatthi.as"; @@ -10181,6 +10206,12 @@ githubId = 10473184; name = "Jia Xiaodong"; }; + polarmutex = { + email = "brian@brianryall.xyz"; + github = "polarmutex"; + githubId = 115141; + name = "Brian Ryall"; + }; polendri = { email = "paul@ijj.li"; github = "polendri"; @@ -11403,7 +11434,7 @@ longkeyid = "rsa2048/0x8E8FF66E2AE8D970"; fingerprint = "30BB FF3F AB0B BB3E 0435 F83C 8E8F F66E 2AE8 D970"; }]; -}; + }; scode = { email = "peter.schuller@infidyne.com"; github = "scode"; @@ -12092,10 +12123,10 @@ name = "Steve Elliott"; }; stehessel = { - email = "stephan@stehessel.de"; - github = "stehessel"; - githubId = 55607356; - name = "Stephan Heßelmann"; + email = "stephan@stehessel.de"; + github = "stehessel"; + githubId = 55607356; + name = "Stephan Heßelmann"; }; steinybot = { name = "Jason Pickens"; @@ -14677,4 +14708,10 @@ github = "snpschaaf"; githubId = 105843013; }; + jali-clarke = { + email = "jinnah.ali-clarke@outlook.com"; + name = "Jinnah Ali-Clarke"; + github = "jali-clarke"; + githubId = 17733984; + }; } diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 8b21f98409ef1..2ea345a652d29 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -355,6 +355,16 @@ with lib.maintainers; { shortName = "Linux Kernel"; }; + lumiguide = { + # Verify additions by approval of an already existing member of the team. + members = [ + roelvandijk + lucus16 + ]; + scope = "Group registration for LumiGuide employees who collectively maintain packages."; + shortName = "Lumiguide employees"; + }; + lumina = { members = [ romildo |