From 8374c8167f365ef4acd62fb44d0ad0448a3cb033 Mon Sep 17 00:00:00 2001 From: mohamed Date: Wed, 23 Feb 2022 17:56:08 +0100 Subject: Python3Packages.pymc3: fix dependecies python38Packages.pymc3: set broken flag to false [UPDATE] maintainers list [UPDATE] remove test imports --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 5e20969554d5..dd8bb5c76ce6 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13977,4 +13977,10 @@ github = "nigelgbanks"; githubId = 487373; }; + nidabdella = { + name = "Mohamed Nidabdella"; + email = "nidabdella.mohamed@gmail.com"; + github = "nidabdella"; + githubId = 8083813; + }; } -- cgit 1.4.1 From 80848ac30b145e9f98e4915328c151b214ce75f5 Mon Sep 17 00:00:00 2001 From: maximsmol Date: Tue, 8 Mar 2022 10:27:36 +0800 Subject: maintainers: add maximsmol --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e803c5ceb4d3..41f985f9381c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7747,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"; -- cgit 1.4.1 From c32d5cf7ca340f4ea0516b5db64ec9e027ae74ca Mon Sep 17 00:00:00 2001 From: mohamed Date: Fri, 4 Mar 2022 16:08:54 +0100 Subject: maintainers: add nidabdella --- maintainers/maintainer-list.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'maintainers') diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index dd8bb5c76ce6..7f754914305e 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8770,6 +8770,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"; @@ -13977,10 +13983,4 @@ github = "nigelgbanks"; githubId = 487373; }; - nidabdella = { - name = "Mohamed Nidabdella"; - email = "nidabdella.mohamed@gmail.com"; - github = "nidabdella"; - githubId = 8083813; - }; } -- cgit 1.4.1 From 6f3482f640b892e68c16bf8a59bffdbab2f5d4cd Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 7 Mar 2022 12:08:51 +0100 Subject: update.py: fix for kakoune/luarocks --- maintainers/scripts/update-luarocks-packages | 13 +++++-------- pkgs/applications/editors/kakoune/plugins/update.py | 4 ++-- 2 files changed, 7 insertions(+), 10 deletions(-) (limited to 'maintainers') 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/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py index 9f5f64f9e5b3..dd8765db28a4 100755 --- a/pkgs/applications/editors/kakoune/plugins/update.py +++ b/pkgs/applications/editors/kakoune/plugins/update.py @@ -15,7 +15,7 @@ from typing import List, Tuple from pathlib import Path # Import plugin update library from maintainers/scripts/pluginupdate.py -ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) +ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))) # type: ignore sys.path.insert( 0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") ) @@ -42,7 +42,7 @@ HEADER = "# This file has been generated by ./pkgs/applications/editors/kakoune/ class KakouneEditor(pluginupdate.Editor): - def generate_nix(plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): + def generate_nix(self, plugins: List[Tuple[str, str, pluginupdate.Plugin]], outfile: str): sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower()) with open(outfile, "w+") as f: -- cgit 1.4.1 From a383bcb3c44d6b790a5c6ea0140d2e8392bd7010 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Mon, 7 Mar 2022 14:31:30 +0100 Subject: luaPackages.luv: 1.42.0 -> 1.43.0 --- maintainers/scripts/luarocks-packages.csv | 2 +- pkgs/development/lua-modules/generated-packages.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'maintainers') 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/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c4442f1fd795..71d85a776bb2 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2033,14 +2033,14 @@ luv = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast }: buildLuarocksPackage { pname = "luv"; - version = "1.42.0-0"; + version = "1.43.0-0"; knownRockspec = (fetchurl { - url = "https://luarocks.org/luv-1.42.0-0.rockspec"; - sha256 = "0pr2gjjnm60w0csb0dacrjalan7ifsfw4lki4ykxx1f4m5snam09"; + url = "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/luv-1.43.0-0.rockspec"; + sha256 = "0z5a7yp20xbb3f9w73skm9fj89gxxqv72nrxjq3kycsc6c2v3m8f"; }).outPath; src = fetchurl { - url = "https://github.com/luvit/luv/releases/download/1.42.0-0/luv-1.42.0-0.tar.gz"; - sha256 = "0dkzjkkm0h516ag6sfz5iji761y9slrcfw325f39zkda1sfql8mm"; + url = "https://github.com/luvit/luv/releases/download/1.43.0-0/luv-1.43.0-0.tar.gz"; + sha256 = "1qlx1r79sfn8r20yx19bhdr0v58ykpwgwzy5vma9p2ngrlynyyjn"; }; disabled = with lua; (luaOlder "5.1"); -- cgit 1.4.1 From 4be38339c817266162de178c556bc899b3a36dab Mon Sep 17 00:00:00 2001 From: Atemu Date: Tue, 8 Mar 2022 14:26:58 +0100 Subject: maintainers/teams: remove Atemu from chia team I no longer use chia and am not particularly familiar with the packaging either --- maintainers/team-list.nix | 1 - 1 file changed, 1 deletion(-) (limited to 'maintainers') diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index c586254d7096..1b4b2f8b6f60 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -64,7 +64,6 @@ with lib.maintainers; { chia = { members = [ - atemu lourkeur ]; scope = "Maintain the Chia blockchain and its dependencies"; -- cgit 1.4.1