diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
| commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
| tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /maintainers/maintainer-list.nix | |
| parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
| parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) | |
| download | nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.gz nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.bz2 nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.lz nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.xz nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.zst nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'maintainers/maintainer-list.nix')
| -rw-r--r-- | maintainers/maintainer-list.nix | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 397bec6057dc..7c95ab8b8ec5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1225,11 +1225,15 @@ githubId = 25088352; name = "Christian Kögler"; }; - ckampka = { + kampka = { email = "christian@kampka.net"; github = "kampka"; githubId = 422412; name = "Christian Kampka"; + keys = [{ + longkeyid = "ed25519/0x1CBE9645DD68E915"; + fingerprint = "F7FA 0BD0 8775 337C F6AB 4A14 1CBE 9645 DD68 E915"; + }]; }; ckauhaus = { email = "kc@flyingcircus.io"; @@ -1633,6 +1637,12 @@ githubId = 10913120; name = "Dje4321"; }; + dkabot = { + email = "dkabot@dkabot.com"; + github = "dkabot"; + githubId = 1316469; + name = "Naomi Morse"; + }; dmalikov = { email = "malikov.d.y@gmail.com"; github = "dmalikov"; @@ -3069,6 +3079,16 @@ githubId = 8735102; name = "John Ramsden"; }; + jojosch = { + name = "Johannes Schleifenbaum"; + email = "johannes@js-webcoding.de"; + github = "jojosch"; + githubId = 327488; + keys = [{ + longkeyid = "ed25519/059093B1A278BCD0"; + fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0"; + }]; + }; joko = { email = "ioannis.koutras@gmail.com"; github = "jokogr"; @@ -4584,6 +4604,12 @@ githubId = 9939720; name = "Philippe Nguyen"; }; + nrdxp = { + email = "tim.deh@pm.me"; + github = "nrdxp"; + githubId = 34083928; + name = "Tim DeHerrera"; + }; nshalman = { email = "nahamu@gmail.com"; github = "nshalman"; @@ -5409,6 +5435,12 @@ githubId = 852967; name = "Russell O'Connor"; }; + roelvandijk = { + email = "roel@lambdacube.nl"; + github = "roelvandijk"; + githubId = 710906; + name = "Roel van Dijk"; + }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; |