diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-05 00:13:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-05 00:13:14 +0000 |
| commit | 85f6f759598316052872e46c1cf1ccd4a6976ae3 (patch) | |
| tree | 1e5e50a9d22387d08c7d78cd2808098c02c707f8 /maintainers | |
| parent | a09e41ed5a7c1424c4dc483046e67afae1994a39 (diff) | |
| parent | 231e60ee5c1b1f1fcbec7f867e3f57731ccc661e (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 12 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 13 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 876c7531a992f..40c1c894f955c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1411,6 +1411,12 @@ githubId = 58516559; name = "Alexander Rezvov"; }; + argrat = { + email = "n.bertazzo@protonmail.com"; + github = "argrat"; + githubId = 98821629; + name = "Nicolò Bertazzo"; + }; arian-d = { email = "arianxdehghani@gmail.com"; github = "arian-d"; @@ -19179,6 +19185,12 @@ githubId = 43315; name = "William Roe"; }; + wladmis = { + email = "dev@wladmis.org"; + github = "wladmis"; + githubId = 5000261; + name = "Wladmis"; + }; wldhx = { email = "wldhx+nixpkgs@wldhx.me"; github = "wldhx"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5a205f3cb22ee..ea5f4a53e1d12 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -440,6 +440,7 @@ with lib.maintainers; { members = [ GaetanLepage natsukium + thomasjm ]; scope = "Maintain Jupyter and related packages."; shortName = "Jupyter"; |