diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-21 00:12:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-21 00:12:59 +0000 |
| commit | 4025dfd47ff150d30044b5de675ef5c66861ff14 (patch) | |
| tree | 677b849dfb5e9d54661793d0e98a6f77021dff12 /maintainers | |
| parent | 0b3450476c35411d4c7fd98768107127fe255d2a (diff) | |
| parent | a5d84e419a51dac427916336aedbfee5d1d9e89c (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 19 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 10 |
2 files changed, 29 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5dfb9b863a7b7..b3314c21818b2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6773,6 +6773,10 @@ githubId = 1447245; name = "Robin Gloster"; }; + gm6k = { + email = "nix@quidecco.pl"; + name = "Isidor Zeuner"; + }; gmemstr = { email = "git@gmem.ca"; github = "gmemstr"; @@ -15960,6 +15964,15 @@ github = "rumpelsepp"; githubId = 1961699; }; + running-grass = { + name = "Leo Liu"; + email = "467195537@qq.com"; + github = "running-grass"; + githubId = 17241154; + keys = [{ + fingerprint = "5156 0FAB FF32 83EC BC8C EA13 9344 3660 9397 0138"; + }]; + }; rushmorem = { email = "rushmore@webenchanter.com"; github = "rushmorem"; @@ -16968,6 +16981,12 @@ githubId = 8017899; name = "Sivaram Balakrishnan"; }; + sixstring982 = { + email = "sixstring982@gmail.com"; + github = "sixstring982"; + githubId = 1328977; + name = "Trent Small"; + }; sjagoe = { email = "simon@simonjagoe.com"; github = "sjagoe"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 4209b50587902..0f0485a55bba4 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -403,6 +403,16 @@ with lib.maintainers; { enableFeatureFreezePing = true; }; + helsinki-systems = { + # Verify additions to this team with at least one already existing member of the team. + members = [ + ajs124 + das_j + ]; + scope = "Group registration for packages maintained by Helsinki Systems"; + shortName = "Helsinki Systems employees"; + }; + home-assistant = { members = [ fab |