movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

update.py: fix for kakoune/luarocks

Browse source
This commit is contained in:
Matthieu Coudron 2022-03-07 12:08:51 +01:00 • committed by Matthieu Coudron
parent 94fd9265df
commit 6f3482f640
2 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
maintainers/scripts/update-luarocks-packages
View file

@ -25,8 +25,8 @@ from pathlib import Path
log = logging.getLogger() log = logging.getLogger()
log.addHandler(logging.StreamHandler()) log.addHandler(logging.StreamHandler())
ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent # type: ignore
from pluginupdate import Editor, update_plugins, PluginDesc, CleanEnvironment, LOG_LEVELS, Cache from pluginupdate import Editor, update_plugins, FetchConfig, CleanEnvironment
PKG_LIST="maintainers/scripts/luarocks-packages.csv" PKG_LIST="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)" TMP_FILE="$(mktemp)"
@ -118,7 +118,7 @@ class LuaEditor(Editor):
def attr_path(self): def attr_path(self):
return "luaPackages" 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 _prefetch = generate_pkg_nix
def update() -> dict: def update() -> dict:
@ -126,14 +126,14 @@ class LuaEditor(Editor):
sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower()) sorted_plugin_specs = sorted(plugin_specs, key=lambda v: v.name.lower())
try: try:
pool = Pool(processes=proc) pool = Pool(processes=config.proc)
results = pool.map(_prefetch, sorted_plugin_specs) results = pool.map(_prefetch, sorted_plugin_specs)
finally: finally:
pass pass
self.generate_nix(results, outfile) self.generate_nix(results, outfile)
redirects = [] redirects = {}
return redirects return redirects
return update return update
@ -181,11 +181,9 @@ def generate_pkg_nix(plug: LuaPlugin):
cmd.append(plug.version) cmd.append(plug.version)
#
if plug.server != "src" and plug.server: if plug.server != "src" and plug.server:
cmd.append(f"--only-server={plug.server}") cmd.append(f"--only-server={plug.server}")
if plug.luaversion: if plug.luaversion:
with CleanEnvironment(): with CleanEnvironment():
local_pkgs = str(ROOT.resolve()) local_pkgs = str(ROOT.resolve())
@ -209,7 +207,6 @@ def main():
parser = editor.create_parser() parser = editor.create_parser()
args = parser.parse_args() args = parser.parse_args()
log.setLevel(LOG_LEVELS[args.debug])
update_plugins(editor, args) update_plugins(editor, args)

4
pkgs/applications/editors/kakoune/plugins/update.py
View file

@ -15,7 +15,7 @@ from typing import List, Tuple
from pathlib import Path from pathlib import Path
# Import plugin update library from maintainers/scripts/pluginupdate.py # 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( sys.path.insert(
0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts") 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): 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()) sorted_plugins = sorted(plugins, key=lambda v: v[2].name.lower())
with open(outfile, "w+") as f: with open(outfile, "w+") as f: