diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-20 06:35:22 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-20 06:35:22 +0000 |
| commit | 34db746ff9f9afef1fe5e2c2809807f79a3732fb (patch) | |
| tree | 6fbad7d4536a9a51789d1fc2e40e940b4ad3bda9 /maintainers | |
| parent | cad1b2525d506ce75b9e3de3343a63722f2063e9 (diff) | |
| parent | 3342d1a9a985e9f1456ebdab9fde2514c1716341 (diff) | |
| download | nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.gz nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.bz2 nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.lz nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.xz nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.tar.zst nixpkgs-34db746ff9f9afef1fe5e2c2809807f79a3732fb.zip | |
Merge staging-next into staging
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 19 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 14 insertions, 6 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eeb7bb0889d..7fe2ed736f3 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2608,12 +2608,6 @@ githubId = 200617; name = "Ben Sima"; }; - bstrik = { - email = "dutchman55@gmx.com"; - github = "bstrik"; - githubId = 7716744; - name = "Berno Strik"; - }; btlvr = { email = "btlvr@protonmail.com"; github = "btlvr"; @@ -3886,6 +3880,13 @@ githubId = 107034852; name = "Daniyal Suri"; }; + dannixon = { + email = "dan@dan-nixon.com"; + github = "DanNixon"; + githubId = 4037377; + name = "Dan Nixon"; + matrix = "@dannixon:matrix.org"; + }; dansbandit = { github = "dansbandit"; githubId = 4530687; @@ -14804,6 +14805,12 @@ githubId = 165283; name = "Alexey Kutepov"; }; + rexxDigital = { + email = "joellarssonpriv@gmail.com"; + github = "rexxDigital"; + githubId = 44014925; + name = "Rexx Larsson"; + }; rgnns = { email = "jglievano@gmail.com"; github = "rgnns"; diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 02609d2986b..85a6227634f 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -612,6 +612,7 @@ with lib.maintainers; { minimal-bootstrap = { members = [ + alejandrosame artturin emilytrau ericson2314 |