diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 241 | ||||
| -rwxr-xr-x | maintainers/scripts/fix-maintainers.pl | 14 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 5 | ||||
| -rw-r--r-- | maintainers/scripts/pluginupdate.py | 11 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 13 |
5 files changed, 245 insertions, 39 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 29e6c4b2d41a3..affa24dd9148d 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -793,6 +793,12 @@ githubId = 5053729; name = "Alias Gram"; }; + alias-dev = { + email = "alias-dev@protonmail.com"; + github = "alias-dev"; + githubId = 30437811; + name = "Alex Andrews"; + }; alibabzo = { email = "alistair.bill@gmail.com"; github = "alistairbill"; @@ -2602,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"; @@ -3695,6 +3695,12 @@ githubId = 490965; name = "Craig Swank"; }; + ctron = { + email = "ctron@dentrassi.de"; + github = "ctron"; + githubId = 202474; + name = "Jens Reimann"; + }; cust0dian = { email = "serg@effectful.software"; github = "cust0dian"; @@ -3874,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; @@ -3962,7 +3975,7 @@ }; davidarmstronglewis = { email = "davidlewis@mac.com"; - github = "davidarmstronglewis"; + github = "oceanlewis"; githubId = 6754950; name = "David Armstrong Lewis"; }; @@ -4412,6 +4425,15 @@ githubId = 14034137; name = "Mostly Void"; }; + ditsuke = { + name = "Tushar"; + email = "hello@ditsuke.com"; + github = "ditsuke"; + githubId = 72784348; + keys = [{ + fingerprint = "8FD2 153F 4889 541A 54F1 E09E 71B6 C31C 8A5A 9D21"; + }]; + }; djacu = { email = "daniel.n.baker@gmail.com"; github = "djacu"; @@ -5305,6 +5327,11 @@ githubId = 1855930; name = "Ertugrul Söylemez"; }; + esau79p = { + github = "EsAu79p"; + githubId = 21313906; + name = "EsAu"; + }; esclear = { github = "esclear"; githubId = 7432848; @@ -6306,6 +6333,16 @@ fingerprint = "D0CF 440A A703 E0F9 73CB A078 82BB 70D5 41AE 2DB4"; }]; }; + gepbird = { + email = "gutyina.gergo.2@gmail.com"; + github = "gepbird"; + githubId = 29818440; + name = "Gutyina Gergő"; + keys = [ + { fingerprint = "RoAfvqa6w1l8Vdm3W60TDXurYwJ6h03VEGD+wDNGEwc"; } + { fingerprint = "MP2UpIRtJpbFFqyucP431H/FPCfn58UhEUTro4lXtRs"; } + ]; + }; gerg-l = { email = "gregleyda@proton.me"; github = "Gerg-L"; @@ -6458,6 +6495,10 @@ githubId = 1447245; name = "Robin Gloster"; }; + gm6k = { + email = "nix@quidecco.pl"; + name = "Isidor Zeuner"; + }; gmemstr = { email = "git@gmem.ca"; github = "gmemstr"; @@ -6581,6 +6622,12 @@ githubId = 4656860; name = "Gaute Ravndal"; }; + gray-heron = { + email = "ave+nix@cezar.info"; + github = "gray-heron"; + githubId = 7032646; + name = "Cezary Siwek"; + }; graysonhead = { email = "grayson@graysonhead.net"; github = "graysonhead"; @@ -7176,6 +7223,12 @@ fingerprint = "731A 7A05 AD8B 3AE5 956A C227 4A03 18E0 4E55 5DE5"; }]; }; + hubble = { + name = "Hubble the Wolverine"; + matrix = "@hubofeverything:bark.lgbt"; + github = "the-furry-hubofeverything"; + githubId = 53921912; + }; hufman = { email = "hufman@gmail.com"; github = "hufman"; @@ -8164,6 +8217,12 @@ githubId = 6445082; name = "Joseph Lukasik"; }; + jgoux = { + email = "hi@jgoux.dev"; + github = "jgoux"; + githubId = 1443499; + name = "Julien Goux"; + }; jhh = { email = "jeff@j3ff.io"; github = "jhh"; @@ -8750,6 +8809,12 @@ githubId = 1189739; name = "Julio Borja Barra"; }; + jue89 = { + email = "me@jue.yt"; + github = "jue89"; + githubId = 6105784; + name = "Juergen Fitschen"; + }; jugendhacker = { name = "j.r"; email = "j.r@jugendhacker.de"; @@ -8894,6 +8959,15 @@ githubId = 386765; matrix = "@k900:0upti.me"; }; + kachick = { + email = "kachick1@gmail.com"; + github = "kachick"; + githubId = 1180335; + name = "Kenichi Kamiya"; + keys = [{ + fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; + }]; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; @@ -9981,6 +10055,17 @@ githubId = 3696783; name = "Leroy Hopson"; }; + liketechnik = { + name = "Florian Warzecha"; + + email = "liketechnik@disroot.org"; + github = "liketechnik"; + githubId = 24209689; + + keys = [{ + fingerprint = "92D8 A09D 03DD B774 AABD 53B9 E136 2F07 D750 DB5C"; + }]; + }; lillycham = { email = "lillycat332@gmail.com"; github = "lillycat332"; @@ -11019,12 +11104,6 @@ githubId = 4708337; name = "Marcelo A. de L. Santos"; }; - maxhille = { - email = "mh@lambdasoup.com"; - github = "maxhille"; - githubId = 693447; - name = "Max Hille"; - }; maximsmol = { email = "maximsmol@gmail.com"; github = "maximsmol"; @@ -11594,6 +11673,13 @@ githubId = 149558; name = "Merlin Gaillard"; }; + mirkolenz = { + name = "Mirko Lenz"; + email = "mirko@mirkolenz.com"; + matrix = "@mlenz:matrix.org"; + github = "mirkolenz"; + githubId = 5160954; + }; mirrexagon = { email = "mirrexagon@mirrexagon.com"; github = "mirrexagon"; @@ -12835,6 +12921,12 @@ githubId = 9939720; name = "Philippe Nguyen"; }; + npulidomateo = { + matrix = "@npulidomateo:matrix.org"; + github = "npulidomateo"; + githubId = 13149442; + name = "Nico Pulido-Mateo"; + }; nrdxp = { email = "tim.deh@pm.me"; matrix = "@timdeh:matrix.org"; @@ -14143,6 +14235,12 @@ githubId = 406946; name = "Valentin Lorentz"; }; + prominentretail = { + email = "me@jakepark.me"; + github = "ProminentRetail"; + githubId = 94048404; + name = "Jake Park"; + }; proofconstruction = { email = "source@proof.construction"; github = "proofconstruction"; @@ -14384,6 +14482,12 @@ githubId = 1332289; name = "Quentin Machu"; }; + quinn-dougherty = { + email = "quinnd@riseup.net"; + github = "quinn-dougherty"; + githubId = 39039420; + name = "Quinn Dougherty"; + }; qyliss = { email = "hi@alyssa.is"; github = "alyssais"; @@ -14714,6 +14818,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"; @@ -14786,6 +14896,12 @@ githubId = 42619; name = "Wei-Ming Yang"; }; + rickvanprim = { + email = "me@rickvanprim.com"; + github = "rickvanprim"; + githubId = 13792812; + name = "James Leitch"; + }; rickynils = { email = "rickynils@gmail.com"; github = "rickynils"; @@ -14940,6 +15056,12 @@ githubId = 496447; name = "Robert Hensing"; }; + robert-manchester = { + email = "robert.manchester@gmail.com"; + github = "robert-manchester"; + githubId = 86313040; + name = "Robert Manchester"; + }; robertodr = { email = "roberto.diremigio@gmail.com"; github = "robertodr"; @@ -15106,15 +15228,6 @@ }]; name = "Rahul Butani"; }; - rs0vere = { - email = "rs0vere@proton.me"; - github = "rs0vere"; - githubId = 140035635; - keys = [{ - fingerprint = "C6D8 B5C2 FA79 901B DCCF 95E1 FEC4 5C5A ED00 C58D"; - }]; - name = "Red Star Over Earth"; - }; rski = { name = "rski"; email = "rom.skiad+nix@gmail.com"; @@ -15139,6 +15252,12 @@ githubId = 47790121; name = "Ryan Burns"; }; + rtimush = { + email = "rtimush@gmail.com"; + github = "rtimush"; + githubId = 831307; + name = "Roman Timushev"; + }; rtreffer = { email = "treffer+nixos@measite.de"; github = "rtreffer"; @@ -15255,6 +15374,12 @@ fingerprint = "E4F4 1EAB BF0F C785 06D8 62EF EF68 CF41 D42A 593D"; }]; }; + ryangibb = { + email = "ryan@freumh.org"; + github = "ryangibb"; + githubId = 22669046; + name = "Ryan Gibb"; + }; ryanorendorff = { github = "ryanorendorff"; githubId = 12442942; @@ -15370,7 +15495,7 @@ }; SamirTalwar = { email = "lazy.git@functional.computer"; - github = "SamirTalwar"; + github = "abstracte"; githubId = 47852; name = "Samir Talwar"; }; @@ -15524,6 +15649,12 @@ githubId = 3958212; name = "Tom Sorlie"; }; + schinmai-akamai = { + email = "schinmai@akamai.com"; + github = "schinmai-akamai"; + githubId = 70169773; + name = "Tarun Chinmai Sekar"; + }; schmitthenner = { email = "development@schmitthenner.eu"; github = "fkz"; @@ -16320,6 +16451,16 @@ fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; }]; }; + soispha = { + name = "Soispha"; + email = "soispha@vhack.eu"; + matrix = "@soispha:vhack.eu"; + github = "soispha"; + githubId = 132207423; + keys = [{ + fingerprint = "9606 FC74 9FCE 1636 0723 D4AD A5E9 4010 C3A6 42AD"; + }]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; @@ -16384,6 +16525,11 @@ fingerprint = "75F0 AB7C FE01 D077 AEE6 CAFD 353E 4A18 EE0F AB72"; }]; }; + spacefault = { + github = "spacefault"; + githubId = 74156492; + name = "spacefault"; + }; spacefrogg = { email = "spacefrogg-nixos@meterriblecrew.net"; github = "spacefrogg"; @@ -17785,12 +17931,6 @@ githubId = 10110; name = "Travis B. Hartwell"; }; - travisdavis-ops = { - email = "travisdavismedia@gmail.com"; - github = "TravisDavis-ops"; - githubId = 52011418; - name = "Travis Davis"; - }; traxys = { email = "quentin+dev@familleboyer.net"; github = "traxys"; @@ -17876,6 +18016,12 @@ githubId = 15064765; name = "tshaynik"; }; + tsowell = { + email = "tom@ldtlb.com"; + github = "tsowell"; + githubId = 4044033; + name = "Thomas Sowell"; + }; ttuegel = { email = "ttuegel@mailbox.org"; github = "ttuegel"; @@ -18000,6 +18146,12 @@ githubId = 1983821; name = "Eric Wolf"; }; + u2x1 = { + email = "u2x1@outlook.com"; + github = "u2x1"; + githubId = 30677291; + name = "u2x1"; + }; uakci = { name = "uakci"; email = "uakci@uakci.pl"; @@ -18018,6 +18170,16 @@ githubId = 1607770; name = "Ulrik Strid"; }; + unclamped = { + name = "Maru"; + email = "clear6860@tutanota.com"; + matrix = "@unhidden0174:matrix.org"; + github = "unclamped"; + githubId = 104658278; + keys = [{ + fingerprint = "57A2 CC43 3068 CB62 89C1 F1DA 9137 BB2E 77AD DE7E"; + }]; + }; unclechu = { name = "Viacheslav Lotsmanov"; email = "lotsmanov89@gmail.com"; @@ -18309,6 +18471,15 @@ githubId = 245573; name = "Dmitry Kalinkin"; }; + vgskye = { + name = "Skye Green"; + email = "me@skye.vg"; + github = "vgskye"; + githubId = 116078858; + keys = [{ + fingerprint = "CDEA 7E04 69E3 0885 A754 4B05 0104 BC05 F41B 77B8"; + }]; + }; victormeriqui = { name = "Victor Meriqui"; email = "victor.meriqui@ororatech.com"; @@ -19203,6 +19374,11 @@ github = "ymeister"; githubId = 47071325; }; + ymstnt = { + name = "YMSTNT"; + github = "ymstnt"; + githubId = 21342713; + }; yoavlavi = { email = "yoav@yoavlavi.com"; github = "yoav-lavi"; @@ -19235,6 +19411,13 @@ github = "YorikSar"; githubId = 428074; }; + YoshiRulz = { + name = "YoshiRulz"; + email = "OSSYoshiRulz+Nixpkgs@gmail.com"; + matrix = "@YoshiRulz:matrix.org"; + github = "YoshiRulz"; + githubId = 13409956; + }; yrashk = { email = "yrashk@gmail.com"; github = "yrashk"; diff --git a/maintainers/scripts/fix-maintainers.pl b/maintainers/scripts/fix-maintainers.pl index a83df9ec0cf0f..c953cff5cc487 100755 --- a/maintainers/scripts/fix-maintainers.pl +++ b/maintainers/scripts/fix-maintainers.pl @@ -13,12 +13,15 @@ STDOUT->autoflush(1); my $ua = LWP::UserAgent->new(); +if (!defined $ENV{GH_TOKEN}) { + die "Set GH_TOKEN before running this script"; +} + keys %$maintainers_json; # reset the internal iterator so a prior each() doesn't affect the loop while(my($k, $v) = each %$maintainers_json) { my $current_user = %$v{'github'}; if (!defined $current_user) { print "$k has no github handle\n"; - next; } my $github_id = %$v{'githubId'}; if (!defined $github_id) { @@ -37,13 +40,16 @@ while(my($k, $v) = each %$maintainers_json) { sleep($ratelimit_reset - time() + 5); } if ($resp->code != 200) { - print $current_user . " likely deleted their github account\n"; + print "$k likely deleted their github account\n"; next; } my $resp_json = from_json($resp->content); my $api_user = %$resp_json{"login"}; - if (lc($current_user) ne lc($api_user)) { - print $current_user . " is now known on github as " . $api_user . ". Editing maintainer-list.nix…\n"; + if (!defined $current_user) { + print "$k is known on github as $api_user.\n"; + } + elsif (lc($current_user) ne lc($api_user)) { + print "$k is now known on github as $api_user. Editing maintainer-list.nix…\n"; my $file = path($maintainers_list_nix); my $data = $file->slurp_utf8; $data =~ s/github = "$current_user";$/github = "$api_user";/m; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 3ce3f3d734337..5897948a9f83d 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -34,7 +34,6 @@ loadkit,,,,,,alerque lpeg,,,,,,vyp lpeg_patterns,,,,,, lpeglabel,,,,1.6.0,, -lpty,,,,,, lrexlib-gnu,,,,,, lrexlib-pcre,,,,,,vyp lrexlib-posix,,,,,, @@ -72,6 +71,7 @@ lualogging,,,,,, luaossl,,,,,5.1, luaposix,,,,34.1.1-1,,vyp lblasc luarepl,,,,,, +luarocks-build-rust-mlua,,,,,,mrcjkb luasec,,,,,,flosse luasocket,,,,,, luasql-sqlite3,,,,,,vyp @@ -92,6 +92,7 @@ mediator_lua,,,,,, middleclass,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn +nui-nvim,,,,,,mrcjkb nvim-client,https://github.com/neovim/lua-client.git,,,,, nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque @@ -109,5 +110,7 @@ teal-language-server,,,http://luarocks.org/dev,,, telescope.nvim,,,,,5.1, telescope-manix,,,,,, tl,,,,,,mephistophiles +toml,,,,,,mrcjkb +toml-edit,,,,,5.1,mrcjkb vstruct,https://github.com/ToxicFrog/vstruct.git,,,,, vusted,,,,,,figsoda diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 18b354f0be9c6..52e9af399709b 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -327,7 +327,6 @@ def run_nix_expr(expr, nixpkgs: str): :param expr nix expression to fetch current plugins :param nixpkgs Path towards a nixpkgs checkout ''' - # local_pkgs = str(Path(__file__).parent.parent.parent) with CleanEnvironment(nixpkgs) as nix_path: cmd = [ "nix", @@ -341,8 +340,8 @@ def run_nix_expr(expr, nixpkgs: str): "--nix-path", nix_path, ] - log.debug("Running command %s", " ".join(cmd)) - out = subprocess.check_output(cmd) + log.debug("Running command: %s", " ".join(cmd)) + out = subprocess.check_output(cmd, timeout=90) data = json.loads(out) return data @@ -572,7 +571,6 @@ class CleanEnvironment(object): self.empty_config = NamedTemporaryFile() self.empty_config.write(b"{}") self.empty_config.flush() - # os.environ["NIXPKGS_CONFIG"] = self.empty_config.name return f"localpkgs={self.local_pkgs}" def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None: @@ -788,8 +786,11 @@ def update_plugins(editor: Editor, args): autocommit = not args.no_commit if autocommit: + from datetime import date editor.nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) - commit(editor.nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) + updated = date.today().strftime('%m-%d-%Y') + + commit(editor.nixpkgs_repo, f"{editor.attr_path}: updated the {updated}", [args.outfile]) if redirects: update() diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 6b90ce30588be..d5705a294aafa 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -611,6 +611,7 @@ with lib.maintainers; { minimal-bootstrap = { members = [ + alejandrosame artturin emilytrau ericson2314 @@ -682,6 +683,18 @@ with lib.maintainers; { shortName = "Numtide team"; }; + ocaml = { + members = [ + alizter + ]; + githubTeams = [ + "ocaml" + ]; + scope = "Maintain the OCaml compiler and package set."; + shortName = "OCaml"; + enableFeatureFreezePing = true; + }; + openstack = { members = [ SuperSandro2000 |