diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-03-14 12:33:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2022-03-14 12:33:16 +0000 |
| commit | d7e181ff83f28f2e4b270deef08d7479c2d2bdfd (patch) | |
| tree | c3096e5483a314792534ad54c83489009851bc7b /maintainers | |
| parent | 2cc5ec86571c6f22ecb9d49f48b0b1ee2e160b52 (diff) | |
| parent | 0ed928e4aba48923f8a198c53ab445fbf8bd06c4 (diff) | |
| download | nixlib-d7e181ff83f28f2e4b270deef08d7479c2d2bdfd.tar nixlib-d7e181ff83f28f2e4b270deef08d7479c2d2bdfd.tar.gz nixlib-d7e181ff83f28f2e4b270deef08d7479c2d2bdfd.tar.bz2 nixlib-d7e181ff83f28f2e4b270deef08d7479c2d2bdfd.tar.lz nixlib-d7e181ff83f28f2e4b270deef08d7479c2d2bdfd.tar.xz nixlib-d7e181ff83f28f2e4b270deef08d7479c2d2bdfd.tar.zst nixlib-d7e181ff83f28f2e4b270deef08d7479c2d2bdfd.zip | |
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts: pkgs/development/compilers/ocaml/4.12.nix pkgs/development/python-modules/oci/default.nix pkgs/tools/admin/bubblewrap/default.nix
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f141a9b06b66..99b64520ffa7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1688,6 +1688,12 @@ githubId = 355401; name = "Brian Hicks"; }; + brianmcgee = { + name = "Brian McGee"; + email = "brian@41north.dev"; + github = "brianmcgee"; + githubId = 1173648; + }; Br1ght0ne = { email = "brightone@protonmail.com"; github = "Br1ght0ne"; @@ -5631,6 +5637,12 @@ github = "jduan"; githubId = 452450; }; + jdupak = { + name = "Jakub Dupak"; + email = "dev@jakubdupak.com"; + github = "jdupak"; + githubId = 22683640; + }; jecaro = { email = "jeancharles.quillet@gmail.com"; github = "jecaro"; @@ -7223,6 +7235,12 @@ githubId = 1267527; name = "Daniel Firth"; }; + lodi = { + email = "anthony.lodi@gmail.com"; + github = "lodi"; + githubId = 918448; + name = "Anthony Lodi"; + }; lopsided98 = { email = "benwolsieffer@gmail.com"; github = "lopsided98"; |