diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-12-04 00:13:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-04 00:13:14 +0000 |
| commit | 7d0125bd81dd1f55d1ee6ae7ad34851537b9b9f0 (patch) | |
| tree | 5589c8870433c67a7d71faf71b5819f620a277cc /maintainers | |
| parent | 5f1da6e04566d45c8f8d05d938e619c93e53a4c3 (diff) | |
| parent | f4001d4551edb8996289778acf7fd0841871f2e5 (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 37 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 37 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 445aed56fe88..5ce24431c00a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2469,6 +2469,12 @@ githubId = 37907; name = "Julian Stecklina"; }; + bloveless = { + email = "brennon.loveless@gmail.com"; + github = "bloveless"; + githubId = 535135; + name = "Brennon Loveless"; + }; bluescreen303 = { email = "mathijs@bluescreen303.nl"; github = "bluescreen303"; @@ -12247,7 +12253,7 @@ moni = { email = "lythe1107@gmail.com"; matrix = "@fortuneteller2k:matrix.org"; - github = "moni"; + github = "moni-dz"; githubId = 20619776; name = "moni"; }; @@ -13943,6 +13949,18 @@ githubId = 6931743; name = "pasqui23"; }; + passivelemon = { + email = "jeremyseber@gmail.com"; + github = "PassiveLemon"; + githubId = 72527881; + name = "PassiveLemon"; + }; + patricksjackson = { + email = "patrick@jackson.dev"; + github = "patricksjackson"; + githubId = 160646; + name = "Patrick Jackson"; + }; patryk27 = { email = "pwychowaniec@pm.me"; github = "Patryk27"; @@ -17266,6 +17284,12 @@ githubId = 327943; name = "Scott Zhu Reeves"; }; + starzation = { + email = "nixpkgs@starzation.net"; + github = "starzation"; + githubId = 145975416; + name = "Starzation"; + }; stasjok = { name = "Stanislav Asunkin"; email = "nixpkgs@stasjok.ru"; @@ -18784,6 +18808,11 @@ githubId = 347983; name = "Udo Spallek"; }; + ufUNnxagpM = { + github = "ufUNnxagpM"; + githubId = 12422133; + name = "Chromo-residuum-opec"; + }; ulrikstrid = { email = "ulrik.strid@outlook.com"; github = "ulrikstrid"; @@ -19771,6 +19800,12 @@ githubId = 3992240; name = "Elijah Rum"; }; + x0ba = { + name = "x0ba"; + email = "dax@omg.lol"; + github = "x0ba"; + githubId = 64868985; + }; x3ro = { name = "^x3ro"; email = "nix@x3ro.dev"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 55037d9a7204..389aca1123b6 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -317,6 +317,7 @@ with lib.maintainers; { das-g imincik nh2 + nialov sikmir willcohen ]; |