diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-04-30 00:12:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-30 00:12:40 +0000 |
| commit | d80578ab520f20ecf0b5e77d821f38038398901f (patch) | |
| tree | 25b7f13c36d944f3ff515ac57b9ad5f15fd44e2a /maintainers | |
| parent | ce0b19596b3c24c329d4311b103eaec9d9ee08cc (diff) | |
| parent | deda1252285ddfc8c840e9b619d43317658fbf7f (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 30 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 12 insertions, 19 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 36716ae1f4608..7edf4202b1e39 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9094,6 +9094,12 @@ github = "joshua-cooper"; githubId = 35612334; }; + jcaesar = { + name = "Julius Michaelis"; + matrix = "@julius:mtx.liftm.de"; + github = "jcaesar"; + githubId = 1753388; + }; jceb = { name = "Jan Christoph Ebersbach"; email = "jceb@e-jc.de"; @@ -10787,6 +10793,12 @@ githubId = 2037002; name = "Konstantinos"; }; + kotatsuyaki = { + email = "kotatsuyaki@mail.kotatsu.dev"; + github = "kotatsuyaki"; + githubId = 17219127; + name = "kotatsuyaki"; + }; kouyk = { email = "skykinetic@stevenkou.xyz"; github = "kouyk"; @@ -11584,12 +11596,6 @@ githubId = 918448; name = "Anthony Lodi"; }; - loewenheim = { - email = "loewenheim@mailbox.org"; - github = "loewenheim"; - githubId = 7622248; - name = "Sebastian Zivota"; - }; logo = { email = "logo4poop@protonmail.com"; matrix = "@logo4poop:matrix.org"; @@ -13576,12 +13582,6 @@ githubId = 20026143; name = "Katona László"; }; - MP2E = { - email = "MP2E@archlinux.us"; - github = "MP2E"; - githubId = 167708; - name = "Cray Elliott"; - }; mpcsh = { email = "m@mpc.sh"; github = "mpcsh"; @@ -22471,12 +22471,6 @@ githubId = 51886259; name = "Zokre Zyl"; }; - zombiezen = { - name = "Ross Light"; - email = "ross@zombiezen.com"; - github = "zombiezen"; - githubId = 181535; - }; zookatron = { email = "tim@zookatron.com"; github = "zookatron"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ff096943d76bb..08aa297a7c109 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -524,7 +524,6 @@ with lib.maintainers; { members = [ aanderse edwtjo - MP2E thiagokokada ]; scope = "Maintain Libretro, RetroArch and related packages."; |