diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-04-10 12:12:56 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-04-10 12:12:56 +0200 |
| commit | 1ab03c3a76dd142a44c27951018f145ff78fb57e (patch) | |
| tree | 3b5d5847cddc04766e5a755a33bbcc0f0b9ab88c /maintainers | |
| parent | 2e6fb229923cc2fd7275d26ea87f22898bdc24fa (diff) | |
| parent | 807ca93fadd5197c2260490de0c76e500562dc05 (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 29 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 9 |
2 files changed, 38 insertions, 0 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0ad908182ad9..1a4079300c8a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3239,6 +3239,12 @@ githubId = 4458; name = "Ivan Kozik"; }; + ivan-timokhin = { + email = "nixpkgs@ivan.timokhin.name"; + name = "Ivan Timokhin"; + github = "ivan-timokhin"; + githubId = 9802104; + }; ivan-tkatchev = { email = "tkatchev@gmail.com"; name = "Ivan Tkatchev"; @@ -5600,6 +5606,12 @@ githubId = 101514; name = "Orivej Desh"; }; + oro = { + email = "marco@orovecchia.at"; + github = "oro"; + githubId = 357005; + name = "Marco Orovecchia"; + }; osener = { email = "ozan@ozansener.com"; github = "osener"; @@ -6527,6 +6539,12 @@ githubId = 766350; name = "Richard Zetterberg"; }; + s1341 = { + email = "s1341@shmarya.net"; + name = "Shmarya Rubenstein"; + github = "s1341"; + githubId = 5682183; + }; samdoshi = { email = "sam@metal-fish.co.uk"; github = "samdoshi"; @@ -8203,6 +8221,11 @@ fingerprint = "85F8 E850 F8F2 F823 F934 535B EC50 6589 9AEA AF4C"; }]; }; + yvesf = { + email = "yvesf+nix@xapek.org"; + github = "yvesf"; + name = "Yves Fischer"; + }; yvt = { email = "i@yvt.jp"; github = "yvt"; @@ -8403,4 +8426,10 @@ github = "ymeister"; githubId = 47071325; }; + cpcloud = { + name = "Phillip Cloud"; + email = "417981+cpcloud@users.noreply.github.com"; + github = "cpcloud"; + githubId = 417981; + }; } diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 1d8b291978b3..7efff7f45eca 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -30,4 +30,13 @@ with lib.maintainers; { ]; scope = "Maintain GNOME desktop environment and platform."; }; + + podman = { + members = [ + saschagrunert + vdemeester + zowoq + ]; + scope = "Maintain podman related packages."; + }; } |