diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-02-22 00:37:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-22 00:37:52 +0000 |
| commit | d8f2a7bf5ce44fc6311d3a1b641a269810236dec (patch) | |
| tree | 1bdf07d329c32cbbc862f7b8602f3702e1494046 /maintainers | |
| parent | 93b17c1b4d29ca2f42b04f1413cf3557efe18a06 (diff) | |
| parent | 22ab9f3a8ea8a0f4e495b74ac30af5273400a2d5 (diff) | |
| download | nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.gz nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.bz2 nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.lz nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.xz nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.tar.zst nixpkgs-d8f2a7bf5ce44fc6311d3a1b641a269810236dec.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7024b0089b1..25ae516dbe6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1603,12 +1603,6 @@ githubId = 89596; name = "Florian Friesdorf"; }; - charvp = { - email = "nixpkgs@cvpetegem.be"; - github = "charvp"; - githubId = 42220376; - name = "Charlotte Van Petegem"; - }; chattered = { email = "me@philscotted.com"; name = "Phil Scott"; @@ -1717,6 +1711,12 @@ githubId = 2245737; name = "Christopher Mark Poole"; }; + chvp = { + email = "nixpkgs@cvpetegem.be"; + github = "chvp"; + githubId = 42220376; + name = "Charlotte Van Petegem"; + }; ciil = { email = "simon@lackerbauer.com"; github = "ciil"; @@ -8331,6 +8331,12 @@ githubId = 2320433; name = "Sam Boosalis"; }; + sbruder = { + email = "nixos@sbruder.de"; + github = "sbruder"; + githubId = 15986681; + name = "Simon Bruder"; + }; scalavision = { email = "scalavision@gmail.com"; github = "scalavision"; |