diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-26 23:38:55 +0000 |
commit | 02e12559a420f8c544b2facc4931904900a05518 (patch) | |
tree | ba39d8fa9e874b935d204e74accfed5caaccf0fa /nixpkgs/maintainers | |
parent | 542f80867c380b0ac79250b6e5358dda8bc49e0d (diff) | |
parent | 3d085a399c436a41d875801619e8f976b8519196 (diff) | |
download | nixlib-02e12559a420f8c544b2facc4931904900a05518.tar nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.gz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.bz2 nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.lz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.xz nixlib-02e12559a420f8c544b2facc4931904900a05518.tar.zst nixlib-02e12559a420f8c544b2facc4931904900a05518.zip |
Merge commit '3d085a399c436a41d875801619e8f976b8519196'
Diffstat (limited to 'nixpkgs/maintainers')
-rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 40 | ||||
-rw-r--r-- | nixpkgs/maintainers/scripts/luarocks-packages.csv | 6 | ||||
-rwxr-xr-x | nixpkgs/maintainers/scripts/update-luarocks-packages | 2 |
3 files changed, 40 insertions, 8 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 2730218f48f7..3ed31c9ce919 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -40,12 +40,6 @@ See `./scripts/check-maintainer-github-handles.sh` for an example on how to work with this data. */ { - "00-matt" = { - name = "Matt Smith"; - email = "matt@offtopica.uk"; - github = "00-matt"; - githubId = 48835712; - }; "0x4A6F" = { email = "0x4A6F@shackspace.de"; name = "Joachim Ernst"; @@ -600,6 +594,12 @@ githubId = 1296771; name = "Anders Riutta"; }; + arnoldfarkas = { + email = "arnold.farkas@gmail.com"; + github = "arnoldfarkas"; + githubId = 59696216; + name = "Arnold Farkas"; + }; arobyn = { email = "shados@shados.net"; github = "shados"; @@ -2405,6 +2405,12 @@ githubId = 415760; name = "Jonas Höglund"; }; + fishi0x01 = { + email = "fishi0x01@gmail.com"; + github = "fishi0x01"; + githubId = 10799507; + name = "Karl Fischer"; + }; Flakebi = { email = "flakebi@t-online.de"; github = "Flakebi"; @@ -3818,6 +3824,12 @@ githubId = 787421; name = "Kevin Quick"; }; + kraem = { + email = "me@kraem.xyz"; + github = "kraem"; + githubId = 26622971; + name = "Ronnie Ebrin"; + }; kragniz = { email = "louis@kragniz.eu"; github = "kragniz"; @@ -5431,6 +5443,12 @@ githubId = 3250809; name = "Milan Pässler"; }; + petercommand = { + email = "petercommand@gmail.com"; + github = "petercommand"; + githubId = 1260660; + name = "petercommand"; + }; peterhoeg = { email = "peter@hoeg.com"; github = "peterhoeg"; @@ -6175,6 +6193,16 @@ githubId = 6022042; name = "Sam Parkinson"; }; + samlich = { + email = "nixos@samli.ch"; + github = "samlich"; + githubId = 1349989; + name = "samlich"; + keys = [{ + longkeyid = "rsa4096/B1568953B1939F1C"; + fingerprint = "AE8C 0836 FDF6 3FFC 9580 C588 B156 8953 B193 9F1C"; + }]; + }; samrose = { email = "samuel.rose@gmail.com"; github = "samrose"; diff --git a/nixpkgs/maintainers/scripts/luarocks-packages.csv b/nixpkgs/maintainers/scripts/luarocks-packages.csv index 526a928438d2..01e3150ede13 100644 --- a/nixpkgs/maintainers/scripts/luarocks-packages.csv +++ b/nixpkgs/maintainers/scripts/luarocks-packages.csv @@ -11,13 +11,14 @@ compat53,,,,,vcunat coxpcall,,,1.17.0-1,, cqueues,,,,,vcunat cyrussasl,,,,,vcunat -digestif,,http://luarocks.org/dev,,lua5_3, +digestif,,,,lua5_3, dkjson,,,,, fifo,,,,, http,,,,,vcunat inspect,,,,, ldoc,,,,, lgi,,,,, +linenoise,,,,, ljsyscall,,,,lua5_1,lblasc lpeg,,,,,vyp lpeg_patterns,,,,, @@ -43,6 +44,7 @@ luadbi-mysql,,,,, luadbi-postgresql,,,,, luadbi-sqlite3,,,,, luadoc,,,,, +luaepnf,,,,, luaevent,,,,, luaexpat,,,1.3.0-1,,arobyn flosse luaffi,,http://luarocks.org/dev,,, @@ -50,6 +52,7 @@ luafilesystem,,,1.7.0-2,,flosse vcunat lualogging,,,,, luaossl,,,,lua5_1,vcunat luaposix,,,,,vyp lblasc +luarepl,,,,, luasec,,,,,flosse luasocket,,,,, luasql-sqlite3,,,,,vyp @@ -72,3 +75,4 @@ std__debug,std._debug,,,, std_normalize,std.normalize,,,, stdlib,,,,,vyp pulseaudio,,,,,doronbehar +vstruct,,,,, diff --git a/nixpkgs/maintainers/scripts/update-luarocks-packages b/nixpkgs/maintainers/scripts/update-luarocks-packages index 1a31d71086fa..5c42080745eb 100755 --- a/nixpkgs/maintainers/scripts/update-luarocks-packages +++ b/nixpkgs/maintainers/scripts/update-luarocks-packages @@ -19,7 +19,7 @@ export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" # 10 is a pretty arbitrary number of simultaneous jobs, but it is generally # impolite to hit a webserver with *too* many simultaneous connections :) -PARALLEL_JOBS=10 +PARALLEL_JOBS=1 exit_trap() { local lc="$BASH_COMMAND" rc=$? |