diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-01-31 13:25:41 +0100 |
|---|---|---|
| committer | sternenseemann <sternenseemann@systemli.org> | 2023-01-31 13:25:41 +0100 |
| commit | c57b63152ac3e95f76c892c747670b75900df963 (patch) | |
| tree | 281e3c1e24c41428cf44bc7fce8c12d6cdbedfb3 /maintainers | |
| parent | a16864e2bfd4c89677e539ff17a325d5785f98cc (diff) | |
| parent | d289affac300cee2ff1567eec8b763e4f3944a0e (diff) | |
| download | nixpkgs-c57b63152ac3e95f76c892c747670b75900df963.tar nixpkgs-c57b63152ac3e95f76c892c747670b75900df963.tar.gz nixpkgs-c57b63152ac3e95f76c892c747670b75900df963.tar.bz2 nixpkgs-c57b63152ac3e95f76c892c747670b75900df963.tar.lz nixpkgs-c57b63152ac3e95f76c892c747670b75900df963.tar.xz nixpkgs-c57b63152ac3e95f76c892c747670b75900df963.tar.zst nixpkgs-c57b63152ac3e95f76c892c747670b75900df963.zip | |
Merge remote-tracking branch 'origin/master' into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 22 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 4 |
2 files changed, 25 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bdf93d4e6d2..f67493a332d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2530,6 +2530,12 @@ githubId = 89596; name = "Florian Friesdorf"; }; + ChaosAttractor = { + email = "lostattractor@gmail.com"; + github = "LostAttractor"; + githubId = 46527539; + name = "ChaosAttractor"; + }; chekoopa = { email = "chekoopa@mail.ru"; github = "chekoopa"; @@ -13990,6 +13996,13 @@ githubId = 2666479; name = "Y Nguyen"; }; + superherointj = { + name = "Sérgio Marcelo"; + email = "sergiomarcelo+nixpkgs@ya.ru"; + matrix = "@superherointj:matrix.org"; + github = "superherointj"; + githubId = 5861043; + }; SuperSandro2000 = { email = "sandro.jaeckel@gmail.com"; matrix = "@sandro:supersandro.de"; @@ -14124,6 +14137,15 @@ githubId = 5991987; name = "Alexander Sosedkin"; }; + t4ccer = { + email = "t4ccer@gmail.com"; + github = "t4ccer"; + githubId = 64430288; + name = "Tomasz Maciosowski"; + keys = [{ + fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19"; + }]; + }; tadeokondrak = { email = "me@tadeo.ca"; github = "tadeokondrak"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index b813948db1d..49ddf1f10be 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -698,9 +698,11 @@ with lib.maintainers; { rust = { members = [ - andir + figsoda lnl7 mic92 + tjni + winter zowoq ]; scope = "Maintain the Rust compiler toolchain and nixpkgs integration."; |