diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-03-15 00:12:36 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-15 00:12:36 +0000 |
| commit | cb97fed5722648882d1b4a03df0b67681909fb68 (patch) | |
| tree | 551d024ab7ffc87b4774722e341f0eb983e8768d /maintainers | |
| parent | 9f98a38f2e6c84fb4c30fdc9d2bac56435cfb152 (diff) | |
| parent | b188cc65d276214562fb5ed6b315e3e46a8c2a2e (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 31 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 1 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 8 |
3 files changed, 21 insertions, 19 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 33d88965d81be..ef3ce19da9c82 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -6267,16 +6267,6 @@ githubId = 541748; name = "Felipe Espinoza"; }; - federicoschonborn = { - name = "Federico Damián Schonborn"; - email = "fdschonborn@gmail.com"; - github = "FedericoSchonborn"; - githubId = 62166915; - matrix = "@FedericoDSchonborn:matrix.org"; - keys = [ - { fingerprint = "517A 8A6A 09CA A11C 9667 CEE3 193F 70F1 5C9A B0A0"; } - ]; - }; fedx-sudo = { email = "fedx-sudo@pm.me"; github = "FedX-sudo"; @@ -7060,6 +7050,12 @@ github = "getpsyched"; githubId = 43472218; }; + getreu = { + email = "getreu@web.de"; + github = "getreu"; + githubId = 579082; + name = "Jens Getreu"; + }; gfrascadorio = { email = "gfrascadorio@tutanota.com"; github = "gfrascadorio"; @@ -17625,15 +17621,6 @@ matrix = "@shamrocklee:matrix.org"; name = "Yueh-Shun Li"; }; - shanesveller = { - email = "shane@sveller.dev"; - github = "shanesveller"; - githubId = 831; - keys = [{ - fingerprint = "F83C 407C ADC4 5A0F 1F2F 44E8 9210 C218 023C 15CD"; - }]; - name = "Shane Sveller"; - }; shard7 = { email = "sh7user@gmail.com"; github = "shard77"; @@ -19958,6 +19945,12 @@ fingerprint = "E631 8869 586F 99B4 F6E6 D785 5942 58F0 389D 2802"; }]; }; + twitchy0 = { + email = "code@nitinpassa.com"; + github = "twitchy0"; + githubId = 131159000; + name = "Nitin Passa"; + }; twitchyliquid64 = { name = "Tom"; email = "twitchyliquid64@ciphersink.net"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 939905ab81d9d..325b2f30f0473 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -116,6 +116,7 @@ stdlib,,,,41.2.2,,vyp teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, telescope-manix,,,,,, +tiktoken_core,,,,,,natsukium tl,,,,,,mephistophiles toml,,,,,,mrcjkb toml-edit,,,,,5.1,mrcjkb diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 000b1300ac462..8e9194fd6371b 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -96,6 +96,14 @@ with lib.maintainers; { shortName = "Blockchains"; }; + budgie = { + members = [ + bobby285271 + ]; + scope = "Maintain Budgie desktop environment"; + shortName = "Budgie"; + }; + buildbot = { members = [ lopsided98 |