diff options
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 95 | ||||
| -rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
| -rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 13 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 2 |
4 files changed, 93 insertions, 19 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index d23b132f36be..7c9050be78bc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2218,7 +2218,7 @@ ckie = { email = "nixpkgs-0efe364@ckie.dev"; github = "ckiee"; - githubId = 2526321; + githubId = 25263210; keys = [{ longkeyid = "rsa4096/0x13E79449C0525215"; fingerprint = "539F 0655 4D35 38A5 429A E253 13E7 9449 C052 5215"; @@ -2418,6 +2418,23 @@ githubId = 5510514; name = "Conrad Mearns"; }; + corbanr = { + email = "corban@raunco.co"; + github = "CorbanR"; + githubId = 1918683; + matrix = "@corbansolo:matrix.org"; + name = "Corban Raun"; + keys = [ + { + longkeyid = "rsa4096/0xA697A56F1F151189"; + fingerprint = "6607 0B24 8CE5 64ED 22CE 0950 A697 A56F 1F15 1189"; + } + { + longkeyid = "ed25519/0x230F4AC153F90F29"; + fingerprint = "D8CB 816A B678 A4E6 1EC7 5325 230F 4AC1 53F9 0F29"; + } + ]; + }; couchemar = { email = "couchemar@yandex.ru"; github = "couchemar"; @@ -6333,6 +6350,12 @@ githubId = 37185887; name = "Calvin Kim"; }; + keldu = { + email = "mail@keldu.de"; + github = "keldu"; + githubId = 15373888; + name = "Claudius Holeksa"; + }; kennyballou = { email = "kb@devnulllabs.io"; github = "kennyballou"; @@ -7724,6 +7747,12 @@ githubId = 1187050; name = "Maximilian Huber"; }; + maximsmol = { + email = "maximsmol@gmail.com"; + github = "maximsmol"; + githubId = 1472826; + name = "Max Smolin"; + }; maxxk = { email = "maxim.krivchikov@gmail.com"; github = "maxxk"; @@ -7904,12 +7933,6 @@ github = "kira-bruneau"; githubId = 382041; }; - meutraa = { - email = "paul+nixpkgs@lost.host"; - name = "Paul Meredith"; - github = "meutraa"; - githubId = 68550871; - }; mephistophiles = { email = "mussitantesmortem@gmail.com"; name = "Maxim Zhukov"; @@ -7952,6 +7975,12 @@ githubId = 668926; name = "Maximilian Güntner"; }; + mh = { + email = "68288772+markus-heinrich@users.noreply.github.com"; + github = "markus-heinrich"; + githubId = 68288772; + name = "Markus Heinrich"; + }; mhaselsteiner = { email = "magdalena.haselsteiner@gmx.at"; github = "mhaselsteiner"; @@ -8521,6 +8550,17 @@ githubId = 25388474; name = "Matej Urbas"; }; + mvisonneau = { + name = "Maxime VISONNEAU"; + email = "maxime@visonneau.fr"; + matrix = "@maxime:visonneau.fr"; + github = "mvisonneau"; + githubId = 1761583; + keys = [{ + longkeyid = "rsa4096/0x150D6F0AE9198D24"; + fingerprint = "EC63 0CEA E8BC 5EE5 5C58 F2E3 150D 6F0A E919 8D24"; + }]; + }; mvnetbiz = { email = "mvnetbiz@gmail.com"; matrix = "@mvtva:matrix.org"; @@ -8546,6 +8586,12 @@ githubId = 9636071; name = "Myrl Hex"; }; + n0emis = { + email = "nixpkgs@n0emis.network"; + github = "n0emis"; + githubId = 22817873; + name = "Ember Keske"; + }; nadrieril = { email = "nadrieril@gmail.com"; github = "nadrieril"; @@ -8776,6 +8822,12 @@ githubId = 8214542; name = "Nicolò Balzarotti"; }; + nidabdella = { + name = "Mohamed Nidabdella"; + email = "nidabdella.mohamed@gmail.com"; + github = "nidabdella"; + githubId = 8083813; + }; NieDzejkob = { email = "kuba@kadziolka.net"; github = "NieDzejkob"; @@ -9081,6 +9133,12 @@ githubId = 158758; name = "Oliver Dunkl"; }; + ofek = { + email = "oss@ofek.dev"; + github = "ofek"; + githubId = 9677399; + name = "Ofek Lev"; + }; offline = { email = "jaka@x-truder.net"; github = "offlinehacker"; @@ -10283,6 +10341,13 @@ githubId = 6047658; name = "Ryan Horiguchi"; }; + rhysmdnz = { + email = "rhys@memes.nz"; + matrix = "@rhys:memes.nz"; + github = "rhysmdnz"; + githubId = 2162021; + name = "Rhys Davies"; + }; ribose-jeffreylau = { name = "Jeffrey Lau"; email = "jeffrey.lau@ribose.com"; @@ -10959,6 +11024,12 @@ githubId = 19472270; name = "Sebastian"; }; + sebastianblunt = { + name = "Sebastian Blunt"; + email = "nix@sebastianblunt.com"; + github = "sebastianblunt"; + githubId = 47431204; + }; sebbadk = { email = "sebastian@sebba.dk"; github = "SEbbaDK"; @@ -12817,9 +12888,9 @@ githubId = 5837359; name = "Adrian Pistol"; }; - vika_nezrimaya = { + vikanezrimaya = { email = "vika@fireburn.ru"; - github = "kisik21"; + github = "vikanezrimaya"; githubId = 7953163; name = "Vika Shleina"; keys = [{ @@ -12843,6 +12914,12 @@ githubId = 118959; name = "VinyMeuh"; }; + viraptor = { + email = "nix@viraptor.info"; + github = "viraptor"; + githubId = 188063; + name = "Stanisław Pitucha"; + }; viric = { email = "viric@viric.name"; github = "viric"; diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 23303d22c471..d69546cdf07e 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -68,7 +68,7 @@ luautf8,,,,,,pstn luazip,,,,,, lua-yajl,,,,,,pstn luuid,,,,,, -luv,,,,1.42.0-0,, +luv,,,,1.43.0-0,, lyaml,,,,,,lblasc markdown,,,,,, mediator_lua,,,,,, diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index c559d5699dff..73a233c5f103 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -25,8 +25,8 @@ from pathlib import Path log = logging.getLogger() log.addHandler(logging.StreamHandler()) -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent -from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore +from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment PKG_LIST="maintainers/scripts/luarocks-packages.csv" TMP_FILE="$(mktemp)" @@ -118,7 +118,7 @@ class LuaEditor(Editor): def attr_path(self): return "luaPackages" - def get_update(self, input_file: str, outfile: str, proc: int): + def get_update(self, input_file: str, outfile: str, config: FetchConfig): _prefetch = generate_pkg_nix def update() -> dict: @@ -126,14 +126,14 @@ class LuaEditor(Editor): sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) try: - pool = Pool(processes=proc) + pool = Pool(processes=config.proc) results = pool.map(_prefetch, sorted_plugin_specs) finally: pass self.generate_nix(results, outfile) - redirects = [] + redirects = {} return redirects return update @@ -181,11 +181,9 @@ def generate_pkg_nix(plug: LuaPlugin): cmd.append(plug.version) - # if plug.server != "src" and plug.server: cmd.append(f"--only-server={plug.server}") - if plug.luaversion: with CleanEnvironment(): local_pkgs = str(ROOT.resolve()) @@ -209,7 +207,6 @@ def main(): parser = editor.create_parser() args = parser.parse_args() - log.setLevel(LOG_LEVELS[args.debug]) update_plugins(editor, args) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c586254d7096..bf4fcc6a4a7d 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -50,6 +50,7 @@ with lib.maintainers; { DianaOlympos gleber happysalada + minijackson yurrriq ]; scope = "Maintain BEAM-related packages and modules."; @@ -64,7 +65,6 @@ with lib.maintainers; { chia = { members = [ - atemu lourkeur ]; scope = "Maintain the Chia blockchain and its dependencies"; |