diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-09 19:58:40 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2022-02-09 19:58:40 -0800 |
| commit | 39669ea2b6de398c6bacee1e653a27934c5e1c3b (patch) | |
| tree | 2ee88f16e1e0a63f3e8de69a42253cfa0b22de79 /maintainers | |
| parent | 52fc3ed6cefafb7d138d3d474ae0aa0c4cdf06b8 (diff) | |
| parent | 02197c4b5e61f73152c807cd5b8ebdafeab0cdbf (diff) | |
| download | nixpkgs-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar nixpkgs-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.gz nixpkgs-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.bz2 nixpkgs-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.lz nixpkgs-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.xz nixpkgs-39669ea2b6de398c6bacee1e653a27934c5e1c3b.tar.zst nixpkgs-39669ea2b6de398c6bacee1e653a27934c5e1c3b.zip | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/top-level/aliases.nix
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ca162d3ddba..12485241da7 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1179,14 +1179,14 @@ name = "Artturi N"; }; azahi = { - email = "azahi@teknik.io"; - matrix = "@azahi:matrix.org"; + name = "Azat Bahawi"; + email = "azat@bahawi.net"; + matrix = "@azahi:azahi.cc"; github = "azahi"; githubId = 22211000; - name = "Azat Bahawi"; keys = [{ - longkeyid = "rsa2048/0xB40FCB6608BBE3B6"; - fingerprint = "E9F3 483F 31C7 29B4 4CA2 7C38 B40F CB66 08BB E3B6"; + longkeyid = "rsa4096/0xC8C6BDDB3847F72B"; + fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; }]; }; ayazhafiz = { @@ -2382,6 +2382,13 @@ githubId = 11145016; name = "J.C."; }; + congee = { + email = "changshengwu@pm.me"; + matrix = "@congeec:matrix.org"; + github = "congee"; + name = "Changsheng Wu"; + githubId = 2083950; + }; contrun = { email = "uuuuuu@protonmail.com"; github = "contrun"; @@ -5462,6 +5469,12 @@ githubId = 221929; name = "Jean-Baptiste Giraudeau"; }; + jc = { + name = "Josh Cooper"; + email = "josh@cooper.is"; + github = "joshua-cooper"; + githubId = 35612334; + }; jceb = { name = "jceb"; email = "jceb@e-jc.de"; @@ -5590,6 +5603,16 @@ githubId = 143075; name = "James Felix Black"; }; + jfchevrette = { + email = "jfchevrette@gmail.com"; + github = "jfchevrette"; + githubId = 3001; + name = "Jean-Francois Chevrette"; + keys = [{ + longkeyid = "rsa4096/0x67A0585801290DC6"; + fingerprint = "B612 96A9 498E EECD D5E9 C0F0 67A0 5858 0129 0DC6"; + }]; + }; jflanglois = { email = "yourstruly@julienlanglois.me"; github = "jflanglois"; |