diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-09-11 15:24:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-09-16 22:14:45 +0000 |
| commit | 89c4dccbd5f33f71808d4b1baafe619696af1162 (patch) | |
| tree | fb1b8d3a2f171164a05d404ab2340cfb1a9d3e21 /nixpkgs/maintainers | |
| parent | 8920a0e4d962a919238bab69ddc607d7f3396f70 (diff) | |
| parent | e19054ab3cd5b7cc9a01d0efc71c8fe310541065 (diff) | |
| download | nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.gz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.bz2 nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.lz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.xz nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.tar.zst nixlib-89c4dccbd5f33f71808d4b1baafe619696af1162.zip | |
Merge commit 'e19054ab3cd5b7cc9a01d0efc71c8fe310541065'
Diffstat (limited to 'nixpkgs/maintainers')
| -rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 48 | ||||
| -rw-r--r-- | nixpkgs/maintainers/scripts/luarocks-packages.csv | 2 |
2 files changed, 48 insertions, 2 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 7298ed804bbf..a5b7ce5eaa47 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/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"; @@ -2091,7 +2101,7 @@ githubId = 2817965; name = "f--t"; }; - f-breidenstein = { + fleaz = { email = "mail@felixbreidenstein.de"; github = "fleaz"; githubId = 2489598; @@ -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"; @@ -3229,6 +3249,12 @@ githubId = 1047859; name = "Kaz Wesley"; }; + kcalvinalvin = { + email = "calvin@kcalvinalvin.info"; + github = "kcalvinalvin"; + githubId = 37185887; + name = "Calvin Kim"; + }; kentjames = { email = "jameschristopherkent@gmail.com"; github = "kentjames"; @@ -4584,6 +4610,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"; @@ -4756,6 +4788,12 @@ githubId = 11016164; name = "Fedor Pakhomov"; }; + pamplemousse = { + email = "xav.maso@gmail.com"; + github = "Pamplemousse"; + githubId = 2647236; + name = "Xavier Maso"; + }; panaeon = { email = "vitalii.voloshyn@gmail.com"; github = "panaeon"; @@ -5409,6 +5447,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"; diff --git a/nixpkgs/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv index 0ec9ff3d84d9..a6fbcd5a0beb 100644 --- a/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -52,7 +52,9 @@ luasocket,,,,, luasql-sqlite3,,,,,vyp luassert,,,,, luasystem,,,,, +luautf8,,,,,pstn luazip,,,,, +lua-yajl,,,,,pstn luuid,,,,, luv,,,,, markdown,,,,, |