diff options
| author | Matthieu Coudron <mcoudron@hotmail.com> | 2022-09-06 23:43:12 +0200 |
|---|---|---|
| committer | Matthieu Coudron <mcoudron@hotmail.com> | 2022-09-11 21:25:44 +0200 |
| commit | cbcb40589c1ebcaea8ff741e6431a2050c5e8caf (patch) | |
| tree | 3d38097c58944f5b4eb98e7680f49b5eade7af27 /maintainers/scripts/update-luarocks-packages | |
| parent | a7fb06c2da708e39169059a797ba7c0cb8433256 (diff) | |
update-luarocks-package: better way to specify lua version
instead of running luarocks with the requested interpreter, we can ask any interpreter to search for a specific version via --lua-version. It avoids building/running different luarocks-nix just for that.
use tagged release of nvim-cmp
Diffstat (limited to 'maintainers/scripts/update-luarocks-packages')
| -rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index cab63ca44e38..f34aa53626da 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -161,7 +161,10 @@ def generate_pkg_nix(plug: LuaPlugin): custom_env = os.environ.copy() custom_env['LUAROCKS_CONFIG'] = LUAROCKS_CONFIG - cmd = [ "luarocks", "nix"] + # we add --dev else luarocks wont find all the "scm" (=dev) versions of the + # packages + # , "--dev" + cmd = [ "luarocks", "nix" ] if plug.maintainers: cmd.append(f"--maintainers={plug.maintainers}") @@ -185,13 +188,7 @@ def generate_pkg_nix(plug: LuaPlugin): cmd.append(f"--only-server={plug.server}") if plug.luaversion: - with CleanEnvironment(): - local_pkgs = str(ROOT.resolve()) - cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"] - - log.debug("running %s", ' '.join(cmd2)) - lua_drv_path=subprocess.check_output(cmd2, text=True).strip() - cmd.append(f"--lua-dir={lua_drv_path}/bin") + cmd.append(f"--lua-version={plug.luaversion}") log.debug("running %s", ' '.join(cmd)) |