update-luarocks-packages: use pluginupdate.py

Trying to reuse the update scripts used by kakoune/vim to provide the
user with an unified convergence. Some stuff doesn't work yet (parallel
download, caching) but I (anyone else welcome to try too) will improve
it in other PRs.

+666 -518
+1 -1
doc/languages-frameworks/vim.section.md
··· 309 309 310 310 ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} 311 311 312 - Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. 312 + Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. 313 313 314 314 Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: 315 315
+87 -89
maintainers/scripts/luarocks-packages.csv
··· 1 - # nix name,luarocks name,server,version,luaversion,maintainers 2 - alt-getopt,,,,,arobyn 3 - ansicolors,,,,, 4 - argparse,,,,, 5 - basexx,,,,, 6 - binaryheap,,,,,vcunat 7 - bit32,,,,lua5_1,lblasc 8 - busted,,,,, 9 - cassowary,,,,,marsam alerque 10 - cjson,lua-cjson,,,, 11 - compat53,,,,,vcunat 12 - cosmo,,,,,marsam 13 - coxpcall,,,1.17.0-1,, 14 - cqueues,,,,,vcunat 15 - cyrussasl,,,,, 16 - digestif,,,,lua5_3, 17 - dkjson,,,,, 18 - fifo,,,,, 19 - gitsigns.nvim,,,,lua5_1, 20 - http,,,,,vcunat 21 - inspect,,,,, 22 - ldbus,,http://luarocks.org/dev,,, 23 - ldoc,,,,, 24 - lgi,,,,, 25 - linenoise,,,,, 26 - ljsyscall,,,,lua5_1,lblasc 27 - lpeg,,,,,vyp 28 - lpeg_patterns,,,,, 29 - lpeglabel,,,,, 30 - lpty,,,,, 31 - lrexlib-gnu,,,,, 32 - lrexlib-pcre,,,,,vyp 33 - lrexlib-posix,,,,, 34 - ltermbox,,,,, 35 - lua-cmsgpack,,,,, 36 - lua-iconv,,,,, 37 - lua-lsp,,http://luarocks.org/dev,,, 38 - lua-messagepack,,,,, 39 - lua-resty-http,,,,, 40 - lua-resty-jwt,,,,, 41 - lua-resty-openidc,,,,, 42 - lua-resty-openssl,,,,, 43 - lua-resty-session,,,,, 44 - lua-term,,,,, 45 - lua-toml,,,,, 46 - lua-zlib,,,,,koral 47 - lua_cliargs,,,,, 48 - luabitop,,,,, 49 - luacheck,,,,, 50 - luacov,,,,, 51 - luadbi,,,,, 52 - luadbi-mysql,,,,, 53 - luadbi-postgresql,,,,, 54 - luadbi-sqlite3,,,,, 55 - luadoc,,,,, 56 - luaepnf,,,,, 57 - luaevent,,,,, 58 - luaexpat,,,1.3.0-1,,arobyn flosse 59 - luaffi,,http://luarocks.org/dev,,, 60 - luafilesystem,,,1.7.0-2,,flosse 61 - lualogging,,,,, 62 - luaossl,,,,lua5_1, 63 - luaposix,,,,,vyp lblasc 64 - luarepl,,,,, 65 - luasec,,,,,flosse 66 - luasocket,,,,, 67 - luasql-sqlite3,,,,,vyp 68 - luassert,,,,, 69 - luasystem,,,,, 70 - luautf8,,,,,pstn 71 - luazip,,,,, 72 - lua-yajl,,,,,pstn 73 - luuid,,,,, 74 - luv,,,,, 75 - lyaml,,,,,lblasc 76 - markdown,,,,, 77 - mediator_lua,,,,, 78 - mpack,,,,, 79 - moonscript,,,,,arobyn 80 - nvim-client,,,,, 81 - penlight,,,,, 82 - plenary.nvim,,,,lua5_1, 83 - rapidjson,,,,, 84 - readline,,,,, 85 - say,,,,, 86 - std-_debug,std._debug,,,, 87 - std_normalize,std.normalize,,,, 88 - stdlib,,,,,vyp 89 - vstruct,,,,, 1 + name,server,version,luaversion,maintainers 2 + bit32,,,lua5_1,lblasc 3 + argparse,,,, 4 + basexx,,,, 5 + binaryheap,,,,vcunat 6 + busted,,,, 7 + cassowary,,,,marsam alerque 8 + compat53,,,,vcunat 9 + cosmo,,,,marsam 10 + coxpcall,,1.17.0-1,, 11 + cqueues,,,,vcunat 12 + cyrussasl,,,, 13 + digestif,,,lua5_3, 14 + dkjson,,,, 15 + fifo,,,, 16 + gitsigns.nvim,,,lua5_1, 17 + http,,,,vcunat 18 + inspect,,,, 19 + ldbus,http://luarocks.org/dev,,, 20 + ldoc,,,, 21 + lgi,,,, 22 + linenoise,,,, 23 + ljsyscall,,,lua5_1,lblasc 24 + lpeg,,,,vyp 25 + lpeg_patterns,,,, 26 + lpeglabel,,,, 27 + lpty,,,, 28 + lrexlib-gnu,,,, 29 + lrexlib-pcre,,,,vyp 30 + lrexlib-posix,,,, 31 + ltermbox,,,, 32 + lua-cjson,,,, 33 + lua-cmsgpack,,,, 34 + lua-iconv,,,, 35 + lua-lsp,http://luarocks.org/dev,,, 36 + lua-messagepack,,,, 37 + lua-resty-http,,,, 38 + lua-resty-jwt,,,, 39 + lua-resty-openidc,,,, 40 + lua-resty-openssl,,,, 41 + lua-resty-session,,,, 42 + lua-term,,,, 43 + lua-toml,,,, 44 + lua-zlib,,,,koral 45 + lua_cliargs,,,, 46 + luabitop,,,, 47 + luacheck,,,, 48 + luacov,,,, 49 + luadbi,,,, 50 + luadbi-mysql,,,, 51 + luadbi-postgresql,,,, 52 + luadbi-sqlite3,,,, 53 + luadoc,,,, 54 + luaepnf,,,, 55 + luaevent,,,, 56 + luaexpat,,1.3.0-1,,arobyn flosse 57 + luaffi,http://luarocks.org/dev,,, 58 + luafilesystem,,1.7.0-2,,flosse 59 + lualogging,,,, 60 + luaossl,,,lua5_1, 61 + luaposix,,,,vyp lblasc 62 + luarepl,,,, 63 + luasec,,,,flosse 64 + luasocket,,,, 65 + luasql-sqlite3,,,,vyp 66 + luassert,,,, 67 + luasystem,,,, 68 + luautf8,,,,pstn 69 + luazip,,,, 70 + lua-yajl,,,,pstn 71 + luuid,,,, 72 + luv,,,, 73 + lyaml,,,,lblasc 74 + markdown,,,, 75 + mediator_lua,,,, 76 + mpack,,,, 77 + moonscript,,,,arobyn 78 + nvim-client,,,, 79 + penlight,,,, 80 + plenary.nvim,,,lua5_1, 81 + rapidjson,,,, 82 + readline,,,, 83 + say,,,, 84 + std._debug,,,, 85 + std.normalize,,,, 86 + stdlib,,,,vyp 87 + vstruct,,,,
+56 -22
maintainers/scripts/pluginupdate.py
··· 28 28 from typing import Dict, List, Optional, Tuple, Union, Any, Callable 29 29 from urllib.parse import urljoin, urlparse 30 30 from tempfile import NamedTemporaryFile 31 + from dataclasses import dataclass 31 32 32 33 import git 33 34 ··· 81 82 if token is not None: 82 83 headers["Authorization"] = f"token {token}" 83 84 return urllib.request.Request(url, headers=headers) 85 + 86 + @dataclass 87 + class PluginDesc: 88 + owner: str 89 + repo: str 90 + branch: str 91 + alias: str 84 92 85 93 86 94 class Repo: ··· 195 203 name: str, 196 204 root: Path, 197 205 get_plugins: str, 206 + # TODO modifier pour accepter un plugin 198 207 generate_nix: Callable[[List[Tuple[str, str, Plugin]], str], None], 199 208 default_in: Optional[Path] = None, 200 209 default_out: Optional[Path] = None, 201 210 deprecated: Optional[Path] = None, 202 211 cache_file: Optional[str] = None, 203 212 ): 213 + log.debug("get_plugins:", get_plugins) 204 214 self.name = name 205 215 self.root = root 206 216 self.get_plugins = get_plugins 207 - self.generate_nix = generate_nix 217 + self._generate_nix = generate_nix 208 218 self.default_in = default_in or root.joinpath(f"{name}-plugin-names") 209 219 self.default_out = default_out or root.joinpath("generated.nix") 210 220 self.deprecated = deprecated or root.joinpath("deprecated.json") 211 221 self.cache_file = cache_file or f"{name}-plugin-cache.json" 212 222 223 + def get_current_plugins(self): 224 + """To fill the cache""" 225 + return get_current_plugins(self) 226 + 227 + def load_plugin_spec(self, plugin_file) -> List[PluginDesc]: 228 + return load_plugin_spec(plugin_file) 229 + 230 + def generate_nix(self, plugins, outfile): 231 + '''Returns nothing for now, writes directly to outfile''' 232 + self._generate_nix(plugins, outfile) 233 + 234 + def get_update(self, input_file: str, outfile: str, proc: int): 235 + return get_update(input_file, outfile, proc, editor=self) 236 + 237 + @property 238 + def attr_path(self): 239 + return self.name + "Plugins" 240 + 241 + def rewrite_input(self, *args, **kwargs): 242 + return rewrite_input(*args, **kwargs) 243 + 244 + 245 + 213 246 214 247 class CleanEnvironment(object): 215 248 def __enter__(self) -> None: ··· 228 261 229 262 def get_current_plugins(editor: Editor) -> List[Plugin]: 230 263 with CleanEnvironment(): 231 - out = subprocess.check_output(["nix", "eval", "--json", editor.get_plugins]) 264 + cmd = ["nix", "eval", "--json", editor.get_plugins] 265 + log.debug("Running command %s", cmd) 266 + out = subprocess.check_output(cmd) 232 267 data = json.loads(out) 233 268 plugins = [] 234 269 for name, attr in data.items(): ··· 244 279 alias: Optional[str], 245 280 cache: "Optional[Cache]" = None, 246 281 ) -> Tuple[Plugin, Dict[str, str]]: 247 - log.info("Prefetching plugin %s", repo_name) 282 + log.info(f"Fetching last commit for plugin {user}/{repo_name}@{branch}") 248 283 repo = Repo(user, repo_name, branch, alias) 249 284 commit, date = repo.latest_commit() 250 285 has_submodules = repo.has_submodules() 251 286 cached_plugin = cache[commit] if cache else None 252 287 if cached_plugin is not None: 288 + log.debug("Cache hit !") 253 289 cached_plugin.name = alias or repo_name 254 290 cached_plugin.date = date 255 291 return cached_plugin, repo.redirect ··· 306 342 307 343 sys.exit(1) 308 344 309 - 310 - def parse_plugin_line(line: str) -> Tuple[str, str, str, Optional[str]]: 345 + def parse_plugin_line(line: str) -> PluginDesc: 311 346 branch = "master" 312 347 alias = None 313 348 name, repo = line.split("/") ··· 317 352 if "@" in repo: 318 353 repo, branch = repo.split("@") 319 354 320 - return (name.strip(), repo.strip(), branch.strip(), alias) 355 + return PluginDesc(name.strip(), repo.strip(), branch.strip(), alias) 321 356 322 357 323 - def load_plugin_spec(plugin_file: str) -> List[Tuple[str, str, str, Optional[str]]]: 358 + def load_plugin_spec(plugin_file: str) -> List[PluginDesc]: 324 359 plugins = [] 325 360 with open(plugin_file) as f: 326 361 for line in f: 327 362 plugin = parse_plugin_line(line) 328 - if not plugin[0]: 363 + if not plugin.owner: 329 364 msg = f"Invalid repository {line}, must be in the format owner/repo[ as alias]" 330 365 print(msg, file=sys.stderr) 331 366 sys.exit(1) ··· 387 422 388 423 389 424 def prefetch( 390 - args: Tuple[str, str, str, Optional[str]], cache: Cache 425 + args: PluginDesc, cache: Cache 391 426 ) -> Tuple[str, str, Union[Exception, Plugin], dict]: 392 - assert len(args) == 4 393 - owner, repo, branch, alias = args 427 + owner, repo = args.owner, args.repo 394 428 try: 395 - plugin, redirect = prefetch_plugin(owner, repo, branch, alias, cache) 429 + plugin, redirect = prefetch_plugin(owner, repo, args.branch, args.alias, cache) 396 430 cache[plugin.commit] = plugin 397 431 return (owner, repo, plugin, redirect) 398 432 except Exception as e: ··· 433 467 with open(input_file, "w") as f: 434 468 f.writelines(lines) 435 469 436 - 470 + # TODO move to Editor ? 437 471 def parse_args(editor: Editor): 438 472 parser = argparse.ArgumentParser( 439 473 description=( ··· 446 480 dest="add_plugins", 447 481 default=[], 448 482 action="append", 449 - help=f"Plugin to add to {editor.name}Plugins from Github in the form owner/repo", 483 + help=f"Plugin to add to {editor.attr_path} from Github in the form owner/repo", 450 484 ) 451 485 parser.add_argument( 452 486 "--input-names", ··· 493 527 494 528 495 529 def get_update(input_file: str, outfile: str, proc: int, editor: Editor): 496 - cache: Cache = Cache(get_current_plugins(editor), editor.cache_file) 530 + cache: Cache = Cache(editor.get_current_plugins(), editor.cache_file) 497 531 _prefetch = functools.partial(prefetch, cache=cache) 498 532 499 533 def update() -> dict: 500 - plugin_names = load_plugin_spec(input_file) 534 + plugin_names = editor.load_plugin_spec(input_file) 501 535 502 536 try: 503 537 pool = Pool(processes=proc) ··· 522 556 523 557 log.info("Start updating plugins") 524 558 nixpkgs_repo = git.Repo(editor.root, search_parent_directories=True) 525 - update = get_update(args.input_file, args.outfile, args.proc, editor) 559 + update = editor.get_update(args.input_file, args.outfile, args.proc) 526 560 527 561 redirects = update() 528 - rewrite_input(args.input_file, editor.deprecated, redirects) 562 + editor.rewrite_input(args.input_file, editor.deprecated, redirects) 529 563 530 564 autocommit = not args.no_commit 531 565 532 566 if autocommit: 533 - commit(nixpkgs_repo, f"{editor.name}Plugins: update", [args.outfile]) 567 + commit(nixpkgs_repo, f"{editor.attr_path}: update", [args.outfile]) 534 568 535 569 if redirects: 536 570 update() 537 571 if autocommit: 538 572 commit( 539 573 nixpkgs_repo, 540 - f"{editor.name}Plugins: resolve github repository redirects", 574 + f"{editor.attr_path}: resolve github repository redirects", 541 575 [args.outfile, args.input_file, editor.deprecated], 542 576 ) 543 577 544 578 for plugin_line in args.add_plugins: 545 - rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) 579 + editor.rewrite_input(args.input_file, editor.deprecated, append=(plugin_line + "\n",)) 546 580 update() 547 581 plugin = fetch_plugin_from_pluginline(plugin_line) 548 582 if autocommit: 549 583 commit( 550 584 nixpkgs_repo, 551 - "{editor}Plugins.{name}: init at {version}".format( 585 + "{editor.attr_path}.{name}: init at {version}".format( 552 586 editor=editor.name, name=plugin.normalized_name, version=plugin.version 553 587 ), 554 588 [args.outfile, args.input_file],
+150 -111
maintainers/scripts/update-luarocks-packages
··· 1 1 #!/usr/bin/env nix-shell 2 - #!nix-shell update-luarocks-shell.nix -i bash 2 + #!nix-shell -p nix-prefetch-git luarocks-nix python3 python3Packages.GitPython nix -i python3 3 + 4 + # format: 5 + # $ nix run nixpkgs.python3Packages.black -c black update.py 6 + # type-check: 7 + # $ nix run nixpkgs.python3Packages.mypy -c mypy update.py 8 + # linted: 9 + # $ nix run nixpkgs.python3Packages.flake8 -c flake8 --ignore E501,E265,E402 update.py 10 + 11 + import inspect 12 + import os 13 + import tempfile 14 + import shutil 15 + from dataclasses import dataclass 16 + import subprocess 17 + import csv 18 + import logging 3 19 4 - # You'll likely want to use 5 - # `` 6 - # nixpkgs $ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix 7 - # `` 8 - # to update all libraries in that folder. 9 - # to debug, redirect stderr to stdout with 2>&1 20 + from typing import List 21 + from pathlib import Path 10 22 11 - # stop the script upon C-C 12 - set -eu -o pipefail 23 + LOG_LEVELS = { 24 + logging.getLevelName(level): level for level in [ 25 + logging.DEBUG, logging.INFO, logging.WARN, logging.ERROR ] 26 + } 13 27 14 - CSV_FILE="maintainers/scripts/luarocks-packages.csv" 28 + log = logging.getLogger() 29 + log.addHandler(logging.StreamHandler()) 30 + 31 + ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe())))).parent.parent 32 + from pluginupdate import Editor, parse_args, update_plugins, PluginDesc, CleanEnvironment 33 + 34 + PKG_LIST="maintainers/scripts/luarocks-packages.csv" 15 35 TMP_FILE="$(mktemp)" 16 - # Set in the update-luarocks-shell.nix 17 - NIXPKGS_PATH="$LUAROCKS_NIXPKGS_PATH" 18 - export LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" 36 + GENERATED_NIXFILE="pkgs/development/lua-modules/generated-packages.nix" 37 + LUAROCKS_CONFIG="$NIXPKGS_PATH/maintainers/scripts/luarocks-config.lua" 38 + 39 + HEADER = """ 40 + /* {GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! 41 + Regenerate it with: 42 + nixpkgs$ ./maintainers/scripts/update-luarocks-packages 19 43 20 - # 10 is a pretty arbitrary number of simultaneous jobs, but it is generally 21 - # impolite to hit a webserver with *too* many simultaneous connections :) 22 - PARALLEL_JOBS=1 44 + You can customize the generated packages in pkgs/development/lua-modules/overrides.nix 45 + */ 46 + """.format(GENERATED_NIXFILE=GENERATED_NIXFILE) 23 47 24 - exit_trap() { 25 - local lc="$BASH_COMMAND" rc=$? 26 - test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2 48 + FOOTER=""" 27 49 } 50 + /* GENERATED - do not edit this file */ 51 + """ 28 52 29 - print_help() { 30 - echo "Usage: $0 <GENERATED_FILE>" 31 - echo "(most likely pkgs/development/lua-modules/generated-packages.nix)" 32 - echo "" 33 - echo " -c <CSV_FILE> to set the list of luarocks package to generate" 34 - exit 1 35 - } 53 + @dataclass 54 + class LuaPlugin: 55 + name: str 56 + version: str 57 + server: str 58 + luaversion: str 59 + maintainers: str 60 + 61 + @property 62 + def normalized_name(self) -> str: 63 + return self.name.replace(".", "-") 64 + 65 + # rename Editor to LangUpdate/ EcosystemUpdater 66 + class LuaEditor(Editor): 67 + def get_current_plugins(self): 68 + return [] 69 + 70 + def load_plugin_spec(self, input_file) -> List[PluginDesc]: 71 + luaPackages = [] 72 + csvfilename=input_file 73 + log.info("Loading package descriptions from %s", csvfilename) 74 + 75 + 76 + with open(csvfilename, newline='') as csvfile: 77 + reader = csv.DictReader(csvfile,) 78 + for row in reader: 79 + # name,server,version,luaversion,maintainers 80 + plugin = LuaPlugin(**row) 81 + luaPackages.append(plugin) 82 + return luaPackages 83 + 84 + @property 85 + def attr_path(self): 86 + return "luaPackages" 87 + 88 + def get_update(self, input_file: str, outfile: str, _: int): 89 + 90 + def update() -> dict: 91 + plugin_specs = self.load_plugin_spec(input_file) 92 + 93 + self.generate_nix(plugin_specs, outfile) 94 + 95 + redirects = [] 96 + return redirects 97 + 98 + return update 99 + 100 + def rewrite_input(self, *args, **kwargs): 101 + # not implemented yet 102 + pass 103 + 104 + def generate_nix( 105 + plugins: List[LuaPlugin], 106 + outfilename: str 107 + ): 108 + sorted_plugins = sorted(plugins, key=lambda v: v.name.lower()) 109 + 110 + # plug = {} 111 + # selon le manifest luarocks.org/manifest 112 + def _generate_pkg_nix(plug): 113 + cmd = [ "luarocks", "nix", plug.name] 114 + if plug.server: 115 + cmd.append(f"--only-server={plug.server}") 36 116 37 - if [ $# -lt 1 ]; then 38 - print_help 39 - exit 1 40 - fi 117 + if plug.maintainers: 118 + cmd.append(f"--maintainers={plug.maintainers}") 41 119 42 - trap exit_trap EXIT 120 + if plug.version: 121 + cmd.append(plug.version) 43 122 44 - while getopts ":hc:" opt; do 45 - case $opt in 46 - h) 47 - print_help 48 - ;; 49 - c) 50 - echo "Loading package list from $OPTARG !" >&2 51 - CSV_FILE="$OPTARG" 52 - ;; 53 - \?) 54 - echo "Invalid option: -$OPTARG" >&2 55 - ;; 56 - esac 57 - shift $((OPTIND - 1)) 58 - done 123 + if plug.luaversion: 124 + with CleanEnvironment(): 125 + local_pkgs = str(ROOT.resolve()) 126 + cmd2 = ["nix-build", "--no-out-link", local_pkgs, "-A", f"{plug.luaversion}"] 59 127 60 - GENERATED_NIXFILE="$1" 128 + log.debug("running %s", cmd2) 129 + lua_drv_path=subprocess.check_output(cmd2, text=True).strip() 130 + cmd.append(f"--lua-dir={lua_drv_path}/bin") 61 131 62 - HEADER=" 63 - /* ${GENERATED_NIXFILE} is an auto-generated file -- DO NOT EDIT! 64 - Regenerate it with: 65 - nixpkgs$ ${0} ${GENERATED_NIXFILE} 132 + log.debug("running %s", cmd) 133 + output = subprocess.check_output(cmd, text=True) 134 + return output 66 135 67 - These packages are manually refined in lua-overrides.nix 68 - */ 69 - { self, stdenv, lib, fetchurl, fetchgit, pkgs, ... } @ args: 136 + with tempfile.NamedTemporaryFile("w+") as f: 137 + f.write(HEADER) 138 + f.write(""" 139 + { self, stdenv, lib, fetchurl, fetchgit, ... } @ args: 70 140 self: super: 71 141 with self; 72 142 { 73 - " 143 + """) 74 144 75 - FOOTER=" 76 - } 77 - /* GENERATED */ 78 - " 145 + for plugin in sorted_plugins: 79 146 80 - function convert_pkg() { 81 - nix_pkg_name="$1" 82 - lua_pkg_name="$2" 83 - server="$3" 84 - pkg_version="$4" 85 - lua_version="$5" 86 - maintainers="$6" 147 + nix_expr = _generate_pkg_nix(plugin) 148 + f.write(f"{plugin.normalized_name} = {nix_expr}" 149 + ) 150 + f.write(FOOTER) 151 + f.flush() 87 152 88 - if [ "${nix_pkg_name:0:1}" == "#" ]; then 89 - echo "Skipping comment ${*}" >&2 90 - return 91 - fi 153 + # if everything went fine, move the generated file to its destination 154 + # using copy since move doesn't work across disks 155 + shutil.copy(f.name, outfilename) 156 + 157 + print(f"updated {outfilename}") 158 + 159 + def load_plugin_spec(): 160 + pass 92 161 93 - # Normalize package name 94 - nix_pkg_name_normalized=$(sed 's/\./-/' <(echo "$nix_pkg_name")) 162 + 163 + def main(): 95 164 96 - if [ -z "$lua_pkg_name" ]; then 97 - echo "Using nix_name as lua_pkg_name for '$nix_pkg_name'" >&2 98 - lua_pkg_name="$nix_pkg_name" 99 - fi 165 + editor = LuaEditor("lua", ROOT, '', generate_nix, 166 + default_in = ROOT.joinpath(PKG_LIST), 167 + default_out = ROOT.joinpath(GENERATED_NIXFILE) 168 + ) 100 169 101 - echo "Building expression for $lua_pkg_name (version $pkg_version) from server [$server]" >&2 102 - luarocks_args=(nix) 103 - if [[ -n $server ]]; then 104 - luarocks_args+=("--only-server=$server") 105 - fi 106 - if [[ -n $maintainers ]]; then 107 - luarocks_args+=("--maintainers=$maintainers") 108 - fi 109 - if [[ -n $lua_version ]]; then 110 - lua_drv_path=$(nix-build --no-out-link "$NIXPKGS_PATH" -A "$lua_version") 111 - luarocks_args+=("--lua-dir=$lua_drv_path/bin") 112 - fi 113 - luarocks_args+=("$lua_pkg_name") 114 - if [[ -n $pkg_version ]]; then 115 - luarocks_args+=("$pkg_version") 116 - fi 117 - echo "Running 'luarocks ${luarocks_args[*]}'" >&2 118 - if drv="$nix_pkg_name_normalized = $(luarocks "${luarocks_args[@]}")"; then 119 - echo "$drv" 120 - else 121 - echo "Failed to convert $nix_pkg_name" >&2 122 - return 1 123 - fi 124 - } 170 + args = parse_args(editor) 171 + log.setLevel(LOG_LEVELS[args.debug]) 125 172 126 - # params needed when called via callPackage 127 - echo "$HEADER" | tee "$TMP_FILE" 173 + update_plugins(editor) 128 174 129 - # Ensure parallel can run our bash function 130 - export -f convert_pkg 131 - export SHELL=bash 132 - # Read each line in the csv file and run convert_pkg for each, in parallel 133 - parallel --group --keep-order --halt now,fail=1 --jobs "$PARALLEL_JOBS" --colsep ',' convert_pkg {} <"$CSV_FILE" | tee -a "$TMP_FILE" 134 175 135 - # close the set 136 - echo "$FOOTER" | tee -a "$TMP_FILE" 176 + if __name__ == "__main__": 137 177 138 - cp "$TMP_FILE" "$GENERATED_NIXFILE" 178 + main() 139 179 140 - # vim: set ts=4 sw=4 ft=sh:
+368 -295
pkgs/development/lua-modules/generated-packages.nix
··· 1 1 2 2 /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! 3 3 Regenerate it with: 4 - nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix 4 + nixpkgs$ ./maintainers/scripts/update-luarocks-packages 5 5 6 - These packages are manually refined in lua-overrides.nix 6 + You can customize the generated packages in pkgs/development/lua-modules/overrides.nix 7 7 */ 8 - { self, lib, fetchurl, fetchgit, pkgs, ... } @ args: 8 + 9 + { self, stdenv, lib, fetchurl, fetchgit, ... } @ args: 9 10 self: super: 10 11 with self; 11 12 { 12 - 13 - alt-getopt = buildLuarocksPackage { 14 - pname = "alt-getopt"; 15 - version = "0.8.0-1"; 16 - 17 - src = fetchurl { 18 - url = "mirror://luarocks/alt-getopt-0.8.0-1.src.rock"; 19 - sha256 = "1mi97dqb97sf47vb6wrk12yf1yxcaz0asr9gbgwyngr5n1adh5i3"; 20 - }; 21 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 22 - propagatedBuildInputs = [ lua ]; 23 - 24 - meta = with lib; { 25 - homepage = "https://github.com/cheusov/lua-alt-getopt"; 26 - description = "Process application arguments the same way as getopt_long"; 27 - maintainers = with maintainers; [ arobyn ]; 28 - license.fullName = "MIT/X11"; 29 - }; 30 - }; 31 - ansicolors = buildLuarocksPackage { 32 - pname = "ansicolors"; 33 - version = "1.0.2-3"; 34 - 35 - src = fetchurl { 36 - url = "mirror://luarocks/ansicolors-1.0.2-3.src.rock"; 37 - sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; 38 - }; 39 - disabled = (luaOlder "5.1"); 40 - propagatedBuildInputs = [ lua ]; 41 - 42 - meta = with lib; { 43 - homepage = "https://github.com/kikito/ansicolors.lua"; 44 - description = "Library for color Manipulation."; 45 - license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 46 - }; 47 - }; 48 13 argparse = buildLuarocksPackage { 49 14 pname = "argparse"; 50 - version = "0.7.0-1"; 15 + version = "0.7.1-1"; 51 16 52 17 src = fetchurl { 53 - url = "mirror://luarocks/argparse-0.7.0-1.src.rock"; 54 - sha256 = "1jvar543d21x7wq8rxxaaf7h1ricd7zvxc16xwjblwa9ffgcmcs7"; 18 + url = "https://luarocks.org/argparse-0.7.1-1.src.rock"; 19 + sha256 = "0ybqh5jcb9v8f5xpq05av4hzrbk3vfvqrjj9cgmhm8l66mjd0c7a"; 55 20 }; 56 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 21 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 57 22 propagatedBuildInputs = [ lua ]; 58 23 59 24 meta = with lib; { ··· 62 27 license.fullName = "MIT"; 63 28 }; 64 29 }; 30 + 65 31 basexx = buildLuarocksPackage { 66 32 pname = "basexx"; 67 33 version = "0.4.1-1"; 68 34 69 35 knownRockspec = (fetchurl { 70 - url = "mirror://luarocks/basexx-0.4.1-1.rockspec"; 36 + url = "https://luarocks.org/basexx-0.4.1-1.rockspec"; 71 37 sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; 72 38 }).outPath; 73 39 ··· 85 51 license.fullName = "MIT"; 86 52 }; 87 53 }; 54 + 88 55 binaryheap = buildLuarocksPackage { 89 56 pname = "binaryheap"; 90 57 version = "0.4-1"; 91 58 92 59 src = fetchurl { 93 - url = "mirror://luarocks/binaryheap-0.4-1.src.rock"; 60 + url = "https://luarocks.org/binaryheap-0.4-1.src.rock"; 94 61 sha256 = "11rd8r3bpinfla2965jgjdv1hilqdc1q6g1qla5978d7vzg19kpc"; 95 62 }; 96 63 disabled = (luaOlder "5.1"); ··· 103 70 license.fullName = "MIT/X11"; 104 71 }; 105 72 }; 73 + 106 74 bit32 = buildLuarocksPackage { 107 75 pname = "bit32"; 108 - version = "5.3.0-1"; 76 + version = "5.3.5.1-1"; 109 77 110 78 src = fetchurl { 111 - url = "mirror://luarocks/bit32-5.3.0-1.src.rock"; 112 - sha256 = "19i7kc2pfg9hc6qjq4kka43q6qk71bkl2rzvrjaks6283q6wfyzy"; 79 + url = "https://luarocks.org/bit32-5.3.5.1-1.src.rock"; 80 + sha256 = "0b517hkf3r7pdm78sqx9df9440k7wbml4mpckh7jfxxqy8kk89qf"; 113 81 }; 114 - disabled = (luaOlder "5.1"); 82 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 115 83 propagatedBuildInputs = [ lua ]; 116 84 117 85 meta = with lib; { 118 86 homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; 119 87 description = "Lua 5.2 bit manipulation library"; 120 88 maintainers = with maintainers; [ lblasc ]; 121 - license.fullName = "MIT/X11"; 89 + license.fullName = "MIT"; 122 90 }; 123 91 }; 92 + 124 93 busted = buildLuarocksPackage { 125 94 pname = "busted"; 126 95 version = "2.0.0-1"; 127 96 128 97 knownRockspec = (fetchurl { 129 - url = "mirror://luarocks/busted-2.0.0-1.rockspec"; 98 + url = "https://luarocks.org/busted-2.0.0-1.rockspec"; 130 99 sha256 = "0cbw95bjxl667n9apcgng2kr5hq6bc7gp3vryw4dzixmfabxkcbw"; 131 100 }).outPath; 132 101 ··· 144 113 license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 145 114 }; 146 115 }; 116 + 147 117 cassowary = buildLuarocksPackage { 148 118 pname = "cassowary"; 149 - version = "2.2-1"; 119 + version = "2.3.1-1"; 150 120 151 121 src = fetchurl { 152 - url = "mirror://luarocks/cassowary-2.2-1.src.rock"; 153 - sha256 = "0laghzk5jbap5rfd8sasnrdrbda649sfciarba8rhygm0qni1azy"; 122 + url = "https://luarocks.org/cassowary-2.3.1-1.src.rock"; 123 + sha256 = "1whb2d0isp2ca3nlli1kyql8ig9ny4wrvm309a1pzk8q9nys3pf9"; 154 124 }; 125 + disabled = (luaOlder "5.1"); 155 126 propagatedBuildInputs = [ lua penlight ]; 156 127 157 128 meta = with lib; { ··· 161 132 license.fullName = "Apache 2"; 162 133 }; 163 134 }; 164 - cjson = buildLuarocksPackage { 165 - pname = "lua-cjson"; 166 - version = "2.1.0.6-1"; 167 135 168 - src = fetchurl { 169 - url = "mirror://luarocks/lua-cjson-2.1.0.6-1.src.rock"; 170 - sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; 171 - }; 172 - disabled = (luaOlder "5.1"); 173 - propagatedBuildInputs = [ lua ]; 174 - 175 - meta = with lib; { 176 - homepage = "https://www.kyne.com.au/~mark/software/lua-cjson.php"; 177 - description = "A fast JSON encoding/parsing module"; 178 - license.fullName = "MIT"; 179 - }; 180 - }; 181 136 compat53 = buildLuarocksPackage { 182 137 pname = "compat53"; 183 - version = "0.7-1"; 138 + version = "0.8-1"; 184 139 185 140 src = fetchurl { 186 - url = "mirror://luarocks/compat53-0.7-1.src.rock"; 187 - sha256 = "0kpaxbpgrwjn4jjlb17fn29a09w6lw732d21bi0302kqcaixqpyb"; 141 + url = "https://luarocks.org/compat53-0.8-1.src.rock"; 142 + sha256 = "14lw4mxh6ksy7fav1hbspp4ir8bjb7mhnkqdxjhj6jggl1dyf4z5"; 188 143 }; 189 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 144 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 190 145 propagatedBuildInputs = [ lua ]; 191 146 192 147 meta = with lib; { ··· 196 151 license.fullName = "MIT"; 197 152 }; 198 153 }; 154 + 199 155 cosmo = buildLuarocksPackage { 200 156 pname = "cosmo"; 201 157 version = "16.06.04-1"; 202 158 203 159 src = fetchurl { 204 - url = "mirror://luarocks/cosmo-16.06.04-1.src.rock"; 160 + url = "https://luarocks.org/cosmo-16.06.04-1.src.rock"; 205 161 sha256 = "1adrk74j0x1yzhy0xz9k80hphxdjvm09kpwpbx00sk3kic6db0ww"; 206 162 }; 207 163 propagatedBuildInputs = [ lpeg ]; ··· 213 169 license.fullName = "MIT/X11"; 214 170 }; 215 171 }; 172 + 216 173 coxpcall = buildLuarocksPackage { 217 174 pname = "coxpcall"; 218 175 version = "1.17.0-1"; 219 176 220 177 src = fetchurl { 221 - url = "mirror://luarocks/coxpcall-1.17.0-1.src.rock"; 178 + url = "https://luarocks.org/coxpcall-1.17.0-1.src.rock"; 222 179 sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; 223 180 }; 224 181 ··· 228 185 license.fullName = "MIT/X11"; 229 186 }; 230 187 }; 188 + 231 189 cqueues = buildLuarocksPackage { 232 190 pname = "cqueues"; 233 - version = "20190813.52-0"; 191 + version = "20200726.52-0"; 234 192 235 193 src = fetchurl { 236 - url = "mirror://luarocks/cqueues-20190813.52-0.src.rock"; 237 - sha256 = "1mfhana4xdfddzxmr7vkvm65679hx549f9k1rmsrz6is2gji5wvi"; 194 + url = "https://luarocks.org/cqueues-20200726.52-0.src.rock"; 195 + sha256 = "1mxs74gzs2xmgnrvhl1dlqy1m3m5m0wwiadack97r4pdd63dcp08"; 238 196 }; 239 197 disabled = (lua.luaversion != "5.2"); 240 198 propagatedBuildInputs = [ lua ]; ··· 246 204 license.fullName = "MIT/X11"; 247 205 }; 248 206 }; 207 + 249 208 cyrussasl = buildLuarocksPackage { 250 209 pname = "cyrussasl"; 251 210 version = "1.1.0-1"; 252 211 253 212 knownRockspec = (fetchurl { 254 - url = "mirror://luarocks/cyrussasl-1.1.0-1.rockspec"; 213 + url = "https://luarocks.org/cyrussasl-1.1.0-1.rockspec"; 255 214 sha256 = "0zy9l00l7kr3sq8phdm52jqhlqy35vdv6rdmm8mhjihcbx1fsplc"; 256 215 }).outPath; 257 216 ··· 259 218 "url": "git://github.com/JorjBauer/lua-cyrussasl", 260 219 "rev": "78ceec610da76d745d0eff4e21a4fb24832aa72d", 261 220 "date": "2015-08-21T18:24:54-04:00", 221 + "path": "/nix/store/s7n7f80pz8k6lvfav55a5rwy5l45vs4l-lua-cyrussasl", 262 222 "sha256": "14kzm3vk96k2i1m9f5zvpvq4pnzaf7s91h5g4h4x2bq1mynzw2s1", 263 - "fetchSubmodules": true 223 + "fetchSubmodules": true, 224 + "deepClone": false, 225 + "leaveDotGit": false 264 226 } 265 - '') ["date"]) ; 227 + '') ["date" "path"]) ; 266 228 267 229 disabled = (luaOlder "5.1"); 268 230 propagatedBuildInputs = [ lua ]; 269 231 270 232 meta = with lib; { 271 - homepage = "https://github.com/JorjBauer/lua-cyrussasl"; 233 + homepage = "http://github.com/JorjBauer/lua-cyrussasl"; 272 234 description = "Cyrus SASL library for Lua 5.1+"; 273 - maintainers = with maintainers; [ vcunat ]; 274 235 license.fullName = "BSD"; 275 236 }; 276 237 }; 238 + 277 239 digestif = buildLuarocksPackage { 278 240 pname = "digestif"; 279 - version = "0.2-1"; 241 + version = "0.4-1"; 280 242 281 243 src = fetchurl { 282 - url = "mirror://luarocks/digestif-0.2-1.src.rock"; 283 - sha256 = "03blpj5lxlhmxa4hnj21sz7sc84g96igbc7r97yb2smmlbyq8hxd"; 244 + url = "https://luarocks.org/digestif-0.4-1.src.rock"; 245 + sha256 = "1hsdr48akviv0l8ldf1km3xcs3i7kf00ws2d893w23nn8rlanv7y"; 284 246 }; 285 247 disabled = (luaOlder "5.3"); 286 - propagatedBuildInputs = [ lua lpeg dkjson ]; 248 + propagatedBuildInputs = [ lua lpeg ]; 287 249 288 250 meta = with lib; { 289 251 homepage = "https://github.com/astoff/digestif/"; ··· 291 253 license.fullName = "MIT"; 292 254 }; 293 255 }; 256 + 294 257 dkjson = buildLuarocksPackage { 295 258 pname = "dkjson"; 296 259 version = "2.5-2"; 297 260 298 261 src = fetchurl { 299 - url = "mirror://luarocks/dkjson-2.5-2.src.rock"; 262 + url = "https://luarocks.org/dkjson-2.5-2.src.rock"; 300 263 sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; 301 264 }; 302 265 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); ··· 308 271 license.fullName = "MIT/X11"; 309 272 }; 310 273 }; 274 + 311 275 fifo = buildLuarocksPackage { 312 276 pname = "fifo"; 313 277 version = "0.2-0"; 314 278 315 279 src = fetchurl { 316 - url = "mirror://luarocks/fifo-0.2-0.src.rock"; 280 + url = "https://luarocks.org/fifo-0.2-0.src.rock"; 317 281 sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; 318 282 }; 319 283 propagatedBuildInputs = [ lua ]; ··· 324 288 license.fullName = "MIT/X11"; 325 289 }; 326 290 }; 291 + 327 292 http = buildLuarocksPackage { 328 293 pname = "http"; 329 - version = "0.3-0"; 294 + version = "0.4-0"; 330 295 331 296 src = fetchurl { 332 - url = "mirror://luarocks/http-0.3-0.src.rock"; 333 - sha256 = "0vvl687bh3cvjjwbyp9cphqqccm3slv4g7y3h03scp3vpq9q4ccq"; 297 + url = "https://luarocks.org/http-0.4-0.src.rock"; 298 + sha256 = "0a73rm097jw5rpc7zj5cavc9f79n52kck623kq2kgfczz2gv5qfv"; 334 299 }; 335 300 disabled = (luaOlder "5.1"); 336 301 propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ]; ··· 342 307 license.fullName = "MIT"; 343 308 }; 344 309 }; 310 + 345 311 inspect = buildLuarocksPackage { 346 312 pname = "inspect"; 347 313 version = "3.1.1-0"; 348 314 349 315 src = fetchurl { 350 - url = "mirror://luarocks/inspect-3.1.1-0.src.rock"; 316 + url = "https://luarocks.org/inspect-3.1.1-0.src.rock"; 351 317 sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; 352 318 }; 353 319 disabled = (luaOlder "5.1"); ··· 359 325 license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 360 326 }; 361 327 }; 328 + 362 329 ldbus = buildLuarocksPackage { 363 330 pname = "ldbus"; 364 331 version = "scm-0"; 365 332 366 333 knownRockspec = (fetchurl { 367 - url = "https://luarocks.org/dev/ldbus-scm-0.rockspec"; 334 + url = "mirror://luarocks/ldbus-scm-0.rockspec"; 368 335 sha256 = "1yhkw5y8h1qf44vx31934k042cmnc7zcv2k0pv0g27wsmlxrlznx"; 369 336 }).outPath; 370 337 ··· 372 339 "url": "git://github.com/daurnimator/ldbus.git", 373 340 "rev": "9e176fe851006037a643610e6d8f3a8e597d4073", 374 341 "date": "2019-08-16T14:26:05+10:00", 342 + "path": "/nix/store/gg4zldd6kx048d6p65b9cimg3arma8yh-ldbus", 375 343 "sha256": "06wcz4i5b7kphqbry274q3ivnsh331rxiyf7n4qk3zx2kvarq08s", 376 - "fetchSubmodules": true 344 + "fetchSubmodules": true, 345 + "deepClone": false, 346 + "leaveDotGit": false 377 347 } 378 - '') ["date"]) ; 348 + '') ["date" "path"]) ; 379 349 380 350 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 381 351 propagatedBuildInputs = [ lua ]; ··· 386 356 license.fullName = "MIT/X11"; 387 357 }; 388 358 }; 359 + 389 360 ldoc = buildLuarocksPackage { 390 361 pname = "ldoc"; 391 362 version = "1.4.6-2"; 392 363 393 364 knownRockspec = (fetchurl { 394 - url = "mirror://luarocks/ldoc-1.4.6-2.rockspec"; 365 + url = "https://luarocks.org/ldoc-1.4.6-2.rockspec"; 395 366 sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; 396 367 }).outPath; 397 368 ··· 408 379 license.fullName = "MIT/X11"; 409 380 }; 410 381 }; 382 + 411 383 lgi = buildLuarocksPackage { 412 384 pname = "lgi"; 413 385 version = "0.9.2-1"; 414 386 415 387 src = fetchurl { 416 - url = "mirror://luarocks/lgi-0.9.2-1.src.rock"; 388 + url = "https://luarocks.org/lgi-0.9.2-1.src.rock"; 417 389 sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; 418 390 }; 419 391 disabled = (luaOlder "5.1"); 420 392 propagatedBuildInputs = [ lua ]; 421 393 422 394 meta = with lib; { 423 - homepage = "https://github.com/pavouk/lgi"; 395 + homepage = "http://github.com/pavouk/lgi"; 424 396 description = "Lua bindings to GObject libraries"; 425 397 license.fullName = "MIT/X11"; 426 398 }; 427 399 }; 400 + 428 401 linenoise = buildLuarocksPackage { 429 402 pname = "linenoise"; 430 403 version = "0.9-1"; 431 404 432 405 knownRockspec = (fetchurl { 433 - url = "mirror://luarocks/linenoise-0.9-1.rockspec"; 406 + url = "https://luarocks.org/linenoise-0.9-1.rockspec"; 434 407 sha256 = "0wic8g0d066pj9k51farsvcdbnhry2hphvng68w9k4lh0zh45yg4"; 435 408 }).outPath; 436 409 ··· 448 421 license.fullName = "MIT/X11"; 449 422 }; 450 423 }; 424 + 451 425 ljsyscall = buildLuarocksPackage { 452 426 pname = "ljsyscall"; 453 427 version = "0.12-1"; 454 428 455 429 src = fetchurl { 456 - url = "mirror://luarocks/ljsyscall-0.12-1.src.rock"; 430 + url = "https://luarocks.org/ljsyscall-0.12-1.src.rock"; 457 431 sha256 = "12gs81lnzpxi5d409lbrvjfflld5l2xsdkfhkz93xg7v65sfhh2j"; 458 432 }; 459 433 disabled = (lua.luaversion != "5.1"); ··· 466 440 license.fullName = "MIT"; 467 441 }; 468 442 }; 443 + 469 444 lpeg = buildLuarocksPackage { 470 445 pname = "lpeg"; 471 446 version = "1.0.2-1"; 472 447 473 448 src = fetchurl { 474 - url = "mirror://luarocks/lpeg-1.0.2-1.src.rock"; 449 + url = "https://luarocks.org/lpeg-1.0.2-1.src.rock"; 475 450 sha256 = "1g5zmfh0x7drc6mg2n0vvlga2hdc08cyp3hnb22mh1kzi63xdl70"; 476 451 }; 477 452 disabled = (luaOlder "5.1"); ··· 484 459 license.fullName = "MIT/X11"; 485 460 }; 486 461 }; 462 + 487 463 lpeg_patterns = buildLuarocksPackage { 488 464 pname = "lpeg_patterns"; 489 465 version = "0.5-0"; 490 466 491 467 src = fetchurl { 492 - url = "mirror://luarocks/lpeg_patterns-0.5-0.src.rock"; 468 + url = "https://luarocks.org/lpeg_patterns-0.5-0.src.rock"; 493 469 sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; 494 470 }; 495 471 propagatedBuildInputs = [ lua lpeg ]; ··· 500 476 license.fullName = "MIT"; 501 477 }; 502 478 }; 479 + 503 480 lpeglabel = buildLuarocksPackage { 504 481 pname = "lpeglabel"; 505 482 version = "1.6.0-1"; 506 483 507 484 src = fetchurl { 508 - url = "mirror://luarocks/lpeglabel-1.6.0-1.src.rock"; 485 + url = "https://luarocks.org/lpeglabel-1.6.0-1.src.rock"; 509 486 sha256 = "0mihrs0gcj40gsjbh4x9b5pm92w2vdwwd1f3fyibyd4a8r1h93r9"; 510 487 }; 511 488 disabled = (luaOlder "5.1"); ··· 517 494 license.fullName = "MIT/X11"; 518 495 }; 519 496 }; 497 + 520 498 lpty = buildLuarocksPackage { 521 499 pname = "lpty"; 522 500 version = "1.2.2-1"; 523 501 524 502 src = fetchurl { 525 - url = "mirror://luarocks/lpty-1.2.2-1.src.rock"; 503 + url = "https://luarocks.org/lpty-1.2.2-1.src.rock"; 526 504 sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; 527 505 }; 528 506 disabled = (luaOlder "5.1"); ··· 534 512 license.fullName = "MIT"; 535 513 }; 536 514 }; 515 + 537 516 lrexlib-gnu = buildLuarocksPackage { 538 517 pname = "lrexlib-gnu"; 539 - version = "2.9.0-1"; 518 + version = "2.9.1-1"; 540 519 541 520 src = fetchurl { 542 - url = "mirror://luarocks/lrexlib-gnu-2.9.0-1.src.rock"; 543 - sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; 521 + url = "https://luarocks.org/lrexlib-gnu-2.9.1-1.src.rock"; 522 + sha256 = "07ppl5ib2q08mcy1nd4pixp58i0v0m9zv3y6ppbrzv105v21wdvi"; 544 523 }; 545 524 disabled = (luaOlder "5.1"); 546 525 propagatedBuildInputs = [ lua ]; 547 526 548 527 meta = with lib; { 549 - homepage = "https://github.com/rrthomas/lrexlib"; 528 + homepage = "http://github.com/rrthomas/lrexlib"; 550 529 description = "Regular expression library binding (GNU flavour)."; 551 530 license.fullName = "MIT/X11"; 552 531 }; 553 532 }; 533 + 554 534 lrexlib-pcre = buildLuarocksPackage { 555 535 pname = "lrexlib-pcre"; 556 - version = "2.9.0-1"; 536 + version = "2.9.1-1"; 557 537 558 538 src = fetchurl { 559 - url = "mirror://luarocks/lrexlib-pcre-2.9.0-1.src.rock"; 560 - sha256 = "1nqai27lbd85mcjf5cb05dbdfg460vmp8cr0lmb8dd63ivk8cbvx"; 539 + url = "https://luarocks.org/lrexlib-pcre-2.9.1-1.src.rock"; 540 + sha256 = "0rsar13nax5r8f96pqjr0hf3civ1f1ijg4k7y69y5gi4wqd376lz"; 561 541 }; 562 542 disabled = (luaOlder "5.1"); 563 543 propagatedBuildInputs = [ lua ]; 564 544 565 545 meta = with lib; { 566 - homepage = "https://github.com/rrthomas/lrexlib"; 546 + homepage = "http://github.com/rrthomas/lrexlib"; 567 547 description = "Regular expression library binding (PCRE flavour)."; 568 548 maintainers = with maintainers; [ vyp ]; 569 549 license.fullName = "MIT/X11"; 570 550 }; 571 551 }; 552 + 572 553 lrexlib-posix = buildLuarocksPackage { 573 554 pname = "lrexlib-posix"; 574 - version = "2.9.0-1"; 555 + version = "2.9.1-1"; 575 556 576 557 src = fetchurl { 577 - url = "mirror://luarocks/lrexlib-posix-2.9.0-1.src.rock"; 578 - sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; 558 + url = "https://luarocks.org/lrexlib-posix-2.9.1-1.src.rock"; 559 + sha256 = "0ajbzs3d6758f2hs95akirymw46nxcyy2prbzlaqq45ynzq02psb"; 579 560 }; 580 561 disabled = (luaOlder "5.1"); 581 562 propagatedBuildInputs = [ lua ]; 582 563 583 564 meta = with lib; { 584 - homepage = "https://github.com/rrthomas/lrexlib"; 565 + homepage = "http://github.com/rrthomas/lrexlib"; 585 566 description = "Regular expression library binding (POSIX flavour)."; 586 567 license.fullName = "MIT/X11"; 587 568 }; 588 569 }; 570 + 589 571 ltermbox = buildLuarocksPackage { 590 572 pname = "ltermbox"; 591 573 version = "0.2-1"; 592 574 593 575 src = fetchurl { 594 - url = "mirror://luarocks/ltermbox-0.2-1.src.rock"; 576 + url = "https://luarocks.org/ltermbox-0.2-1.src.rock"; 595 577 sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; 596 578 }; 597 579 disabled = (luaOlder "5.1"); ··· 603 585 license.fullName = "New BSD License"; 604 586 }; 605 587 }; 588 + 589 + lua-cjson = buildLuarocksPackage { 590 + pname = "lua-cjson"; 591 + version = "2.1.0.6-1"; 592 + 593 + src = fetchurl { 594 + url = "https://luarocks.org/lua-cjson-2.1.0.6-1.src.rock"; 595 + sha256 = "0dqqkn0aygc780kiq2lbydb255r8is7raf7md0gxdjcagp8afps5"; 596 + }; 597 + disabled = (luaOlder "5.1"); 598 + propagatedBuildInputs = [ lua ]; 599 + 600 + meta = with lib; { 601 + homepage = "http://www.kyne.com.au/~mark/software/lua-cjson.php"; 602 + description = "A fast JSON encoding/parsing module"; 603 + license.fullName = "MIT"; 604 + }; 605 + }; 606 + 606 607 lua-cmsgpack = buildLuarocksPackage { 607 608 pname = "lua-cmsgpack"; 608 609 version = "0.4.0-0"; 609 610 610 611 knownRockspec = (fetchurl { 611 - url = "mirror://luarocks/lua-cmsgpack-0.4.0-0.rockspec"; 612 + url = "https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec"; 612 613 sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; 613 614 }).outPath; 614 615 ··· 616 617 "url": "git://github.com/antirez/lua-cmsgpack.git", 617 618 "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", 618 619 "date": "2018-06-14T11:56:56+02:00", 620 + "path": "/nix/store/ndjf00i9r45gvy8lh3vp218y4w4md33p-lua-cmsgpack", 619 621 "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", 620 - "fetchSubmodules": true 622 + "fetchSubmodules": true, 623 + "deepClone": false, 624 + "leaveDotGit": false 621 625 } 622 - '') ["date"]) ; 626 + '') ["date" "path"]) ; 623 627 624 628 disabled = (luaOlder "5.1"); 625 629 propagatedBuildInputs = [ lua ]; 626 630 627 631 meta = with lib; { 628 - homepage = "https://github.com/antirez/lua-cmsgpack"; 632 + homepage = "http://github.com/antirez/lua-cmsgpack"; 629 633 description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; 630 634 license.fullName = "Two-clause BSD"; 631 635 }; 632 636 }; 637 + 633 638 lua-iconv = buildLuarocksPackage { 634 639 pname = "lua-iconv"; 635 640 version = "7-3"; 636 641 637 642 src = fetchurl { 638 - url = "mirror://luarocks/lua-iconv-7-3.src.rock"; 643 + url = "https://luarocks.org/lua-iconv-7-3.src.rock"; 639 644 sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; 640 645 }; 641 646 disabled = (luaOlder "5.1"); ··· 647 652 license.fullName = "MIT/X11"; 648 653 }; 649 654 }; 655 + 650 656 lua-lsp = buildLuarocksPackage { 651 657 pname = "lua-lsp"; 652 - version = "scm-2"; 658 + version = "scm-5"; 653 659 654 660 knownRockspec = (fetchurl { 655 - url = "mirror://luarocks/lua-lsp-scm-2.rockspec"; 656 - sha256 = "0qk3i6j0km4d1fs61fxhkmnbxmgpq24nygr8wknl6hbj2kya25rb"; 661 + url = "mirror://luarocks/lua-lsp-scm-5.rockspec"; 662 + sha256 = "19nlnglg50vpz3wmqvnqafajjkqp8f2snqnfmihz3zi5rpdvzjya"; 657 663 }).outPath; 658 664 659 665 src = fetchgit ( removeAttrs (builtins.fromJSON ''{ 660 666 "url": "git://github.com/Alloyed/lua-lsp", 661 - "rev": "905e71f9a97ea6366deb386503f9d976c87d9bab", 662 - "date": "2019-09-22T09:46:00-04:00", 663 - "sha256": "1mlgb2dp1ah76hjkbkwz0dp2y5mn491v5wf81nm086rb2fa3rzcg", 664 - "fetchSubmodules": true 667 + "rev": "91d4772d1cd264f8501c6da2326fc214ab0934f2", 668 + "date": "2020-10-31T00:55:09-04:00", 669 + "path": "/nix/store/awwwz5wq8v57kv69cfriivg7f6ipdx67-lua-lsp", 670 + "sha256": "10filff5vani6ligv7ls5dgq70k56hql26gv3x101snmw9fkjz57", 671 + "fetchSubmodules": true, 672 + "deepClone": false, 673 + "leaveDotGit": false 665 674 } 666 - '') ["date"]) ; 675 + '') ["date" "path"]) ; 667 676 668 677 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 669 678 propagatedBuildInputs = [ lua dkjson lpeglabel inspect ]; 670 679 671 680 meta = with lib; { 672 681 homepage = "https://github.com/Alloyed/lua-lsp"; 673 - description = "No summary"; 682 + description = "A Language Server implementation for lua, the language"; 674 683 license.fullName = "MIT"; 675 684 }; 676 685 }; 686 + 677 687 lua-messagepack = buildLuarocksPackage { 678 688 pname = "lua-messagepack"; 679 689 version = "0.5.2-1"; 680 690 681 691 src = fetchurl { 682 - url = "mirror://luarocks/lua-messagepack-0.5.2-1.src.rock"; 692 + url = "https://luarocks.org/lua-messagepack-0.5.2-1.src.rock"; 683 693 sha256 = "0hqahc84ncl8g4miif14sdkzyvnpqip48886sagz9drl52qvgcfb"; 684 694 }; 685 695 disabled = (luaOlder "5.1"); ··· 691 701 license.fullName = "MIT/X11"; 692 702 }; 693 703 }; 704 + 694 705 lua-resty-http = buildLuarocksPackage { 695 706 pname = "lua-resty-http"; 696 707 version = "0.16.1-0"; 697 708 698 709 src = fetchurl { 699 - url = "mirror://luarocks/lua-resty-http-0.16.1-0.src.rock"; 710 + url = "https://luarocks.org/lua-resty-http-0.16.1-0.src.rock"; 700 711 sha256 = "0n5hiablpc0dsccs6h76zg81wc3jb4mdvyfn9lfxnhls3yqwrgkj"; 701 712 }; 702 713 disabled = (luaOlder "5.1"); ··· 705 716 meta = with lib; { 706 717 homepage = "https://github.com/ledgetech/lua-resty-http"; 707 718 description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; 708 - maintainers = with maintainers; [ bbigras ]; 709 719 license.fullName = "2-clause BSD"; 710 720 }; 711 721 }; 722 + 712 723 lua-resty-jwt = buildLuarocksPackage { 713 724 pname = "lua-resty-jwt"; 714 725 version = "0.2.3-0"; 715 726 716 727 src = fetchurl { 717 - url = "mirror://luarocks/lua-resty-jwt-0.2.3-0.src.rock"; 728 + url = "https://luarocks.org/lua-resty-jwt-0.2.3-0.src.rock"; 718 729 sha256 = "0s7ghldwrjnhyc205pvcvgdzrgg46qz42v449vrri0cysh8ad91y"; 719 730 }; 720 731 disabled = (luaOlder "5.1"); ··· 723 734 meta = with lib; { 724 735 homepage = "https://github.com/cdbattags/lua-resty-jwt"; 725 736 description = "JWT for ngx_lua and LuaJIT."; 726 - maintainers = with maintainers; [ bbigras ]; 727 737 license.fullName = "Apache License Version 2"; 728 738 }; 729 739 }; 740 + 730 741 lua-resty-openidc = buildLuarocksPackage { 731 742 pname = "lua-resty-openidc"; 732 743 version = "1.7.4-1"; 733 744 734 745 src = fetchurl { 735 - url = "mirror://luarocks/lua-resty-openidc-1.7.4-1.src.rock"; 746 + url = "https://luarocks.org/lua-resty-openidc-1.7.4-1.src.rock"; 736 747 sha256 = "07ny9rl8zir1c3plrbdmd2a23ysrx45qam196nhqsz118xrbds78"; 737 748 }; 738 749 disabled = (luaOlder "5.1"); ··· 741 752 meta = with lib; { 742 753 homepage = "https://github.com/zmartzone/lua-resty-openidc"; 743 754 description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; 744 - maintainers = with maintainers; [ bbigras ]; 745 755 license.fullName = "Apache 2.0"; 746 756 }; 747 757 }; 758 + 748 759 lua-resty-openssl = buildLuarocksPackage { 749 760 pname = "lua-resty-openssl"; 750 - version = "0.7.2-1"; 761 + version = "0.7.4-1"; 751 762 752 763 src = fetchurl { 753 - url = "mirror://luarocks/lua-resty-openssl-0.7.2-1.src.rock"; 754 - sha256 = "00z6adib31ax4givq4zrhbfxa6l99l2hhlxnjpb6rfl4gf8h82kq"; 764 + url = "https://luarocks.org/lua-resty-openssl-0.7.4-1.src.rock"; 765 + sha256 = "16rzcf6z9rgln4sc0v785awn2f3mi9yrswsk5xsfdsb2y1sdxdc0"; 755 766 }; 756 767 757 768 meta = with lib; { 758 769 homepage = "https://github.com/fffonion/lua-resty-openssl"; 759 770 description = "No summary"; 760 - maintainers = with maintainers; [ bbigras ]; 761 771 license.fullName = "BSD"; 762 772 }; 763 773 }; 774 + 764 775 lua-resty-session = buildLuarocksPackage { 765 776 pname = "lua-resty-session"; 766 777 version = "3.8-1"; 767 778 768 779 src = fetchurl { 769 - url = "mirror://luarocks/lua-resty-session-3.8-1.src.rock"; 780 + url = "https://luarocks.org/lua-resty-session-3.8-1.src.rock"; 770 781 sha256 = "1x4l6n0dnm4br4p376r8nkg53hwm6a48xkhrzhsh9fcd5xqgqvxz"; 771 782 }; 772 783 disabled = (luaOlder "5.1"); ··· 775 786 meta = with lib; { 776 787 homepage = "https://github.com/bungle/lua-resty-session"; 777 788 description = "Session Library for OpenResty – Flexible and Secure"; 778 - maintainers = with maintainers; [ bbigras ]; 779 789 license.fullName = "BSD"; 780 790 }; 781 791 }; 792 + 782 793 lua-term = buildLuarocksPackage { 783 794 pname = "lua-term"; 784 795 version = "0.7-1"; 785 796 786 797 knownRockspec = (fetchurl { 787 - url = "mirror://luarocks/lua-term-0.7-1.rockspec"; 798 + url = "https://luarocks.org/lua-term-0.7-1.rockspec"; 788 799 sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; 789 800 }).outPath; 790 801 ··· 800 811 license.fullName = "MIT/X11"; 801 812 }; 802 813 }; 814 + 803 815 lua-toml = buildLuarocksPackage { 804 816 pname = "lua-toml"; 805 817 version = "2.0-1"; 806 818 807 819 src = fetchurl { 808 - url = "mirror://luarocks/lua-toml-2.0-1.src.rock"; 820 + url = "https://luarocks.org/lua-toml-2.0-1.src.rock"; 809 821 sha256 = "0lyqlnydqbplq82brw9ipqy9gijin6hj1wc46plz994pg4i2c74m"; 810 822 }; 811 823 disabled = (luaOlder "5.1"); ··· 817 829 license.fullName = "MIT"; 818 830 }; 819 831 }; 820 - lua-zlib = buildLuarocksPackage { 821 - pname = "lua-zlib"; 822 - version = "1.2-0"; 832 + 833 + lua-yajl = buildLuarocksPackage { 834 + pname = "lua-yajl"; 835 + version = "2.0-1"; 823 836 824 837 src = fetchurl { 825 - url = "mirror://luarocks/lua-zlib-1.2-0.src.rock"; 826 - sha256 = "0qa0vnx45nxdj6fqag6fr627zsnd2bmrr9bdbm8jv6lcnyi6nhs2"; 838 + url = "https://luarocks.org/lua-yajl-2.0-1.src.rock"; 839 + sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; 827 840 }; 828 841 disabled = (luaOlder "5.1"); 829 842 propagatedBuildInputs = [ lua ]; 830 843 831 844 meta = with lib; { 845 + homepage = "http://github.com/brimworks/lua-yajl"; 846 + description = "Integrate the yajl JSON library with Lua."; 847 + maintainers = with maintainers; [ pstn ]; 848 + license.fullName = "MIT/X11"; 849 + }; 850 + }; 851 + 852 + lua-zlib = buildLuarocksPackage { 853 + pname = "lua-zlib"; 854 + version = "1.2-1"; 855 + 856 + knownRockspec = (fetchurl { 857 + url = "https://luarocks.org/lua-zlib-1.2-1.rockspec"; 858 + sha256 = "18rpbg9b4vsnh3svapiqrvwwshw1abb5l5fd7441byx1nm3fjq9w"; 859 + }).outPath; 860 + 861 + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ 862 + "url": "git://github.com/brimworks/lua-zlib.git", 863 + "rev": "82d0fdfe8ddd8645970f55011c13d87469501615", 864 + "date": "2021-03-08T06:04:09-08:00", 865 + "path": "/nix/store/2wr6l2djjl2l63wq1fddfm9ljrrkplr5-lua-zlib", 866 + "sha256": "18q9a5f21fp8hxvpp4sq23wi7m2h0v3p3kydslz140mnryazridj", 867 + "fetchSubmodules": true, 868 + "deepClone": false, 869 + "leaveDotGit": false 870 + } 871 + '') ["date" "path"]) ; 872 + 873 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 874 + propagatedBuildInputs = [ lua ]; 875 + 876 + meta = with lib; { 832 877 homepage = "https://github.com/brimworks/lua-zlib"; 833 878 description = "Simple streaming interface to zlib for Lua."; 834 879 maintainers = with maintainers; [ koral ]; 835 880 license.fullName = "MIT"; 836 881 }; 837 882 }; 883 + 838 884 lua_cliargs = buildLuarocksPackage { 839 885 pname = "lua_cliargs"; 840 886 version = "3.0-2"; 841 887 842 888 src = fetchurl { 843 - url = "mirror://luarocks/lua_cliargs-3.0-2.src.rock"; 889 + url = "https://luarocks.org/lua_cliargs-3.0-2.src.rock"; 844 890 sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; 845 891 }; 846 892 disabled = (luaOlder "5.1"); ··· 852 898 license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 853 899 }; 854 900 }; 901 + 855 902 luabitop = buildLuarocksPackage { 856 903 pname = "luabitop"; 857 904 version = "1.0.2-3"; 858 905 859 906 knownRockspec = (fetchurl { 860 - url = "mirror://luarocks/luabitop-1.0.2-3.rockspec"; 907 + url = "https://luarocks.org/luabitop-1.0.2-3.rockspec"; 861 908 sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; 862 909 }).outPath; 863 910 ··· 865 912 "url": "git://github.com/LuaDist/luabitop.git", 866 913 "rev": "81bb23b0e737805442033535de8e6d204d0e5381", 867 914 "date": "2013-02-18T16:36:42+01:00", 915 + "path": "/nix/store/jm7mls5zwkgkkf1hiwgbbwy94c55ir43-luabitop", 868 916 "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", 869 - "fetchSubmodules": true 917 + "fetchSubmodules": true, 918 + "deepClone": false, 919 + "leaveDotGit": false 870 920 } 871 - '') ["date"]) ; 921 + '') ["date" "path"]) ; 872 922 873 923 disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); 874 924 propagatedBuildInputs = [ lua ]; ··· 879 929 license.fullName = "MIT/X license"; 880 930 }; 881 931 }; 932 + 882 933 luacheck = buildLuarocksPackage { 883 934 pname = "luacheck"; 884 - version = "0.23.0-1"; 935 + version = "0.24.0-2"; 885 936 886 937 src = fetchurl { 887 - url = "mirror://luarocks/luacheck-0.23.0-1.src.rock"; 888 - sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; 938 + url = "https://luarocks.org/luacheck-0.24.0-2.src.rock"; 939 + sha256 = "0in09mnhcbm84ia22qawn9mmfmaj0z6zqyii8xwz3llacss0mssq"; 889 940 }; 890 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 941 + disabled = (luaOlder "5.1"); 891 942 propagatedBuildInputs = [ lua argparse luafilesystem ]; 892 943 893 944 meta = with lib; { 894 - homepage = "https://github.com/mpeterv/luacheck"; 945 + homepage = "https://github.com/luarocks/luacheck"; 895 946 description = "A static analyzer and a linter for Lua"; 896 947 license.fullName = "MIT"; 897 948 }; 898 949 }; 950 + 899 951 luacov = buildLuarocksPackage { 900 952 pname = "luacov"; 901 - version = "0.14.0-1"; 953 + version = "0.15.0-1"; 902 954 903 955 src = fetchurl { 904 - url = "mirror://luarocks/luacov-0.14.0-1.src.rock"; 905 - sha256 = "18wj4l55wxwvaimvmkg3g5c6amzz9czdpl57z56wmdb284454kca"; 956 + url = "https://luarocks.org/luacov-0.15.0-1.src.rock"; 957 + sha256 = "14y79p62m1l7jwj8ay0b8nkarr6hdarjycr6qfzlc4v676h38ikq"; 906 958 }; 907 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 959 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 908 960 propagatedBuildInputs = [ lua ]; 909 961 910 962 meta = with lib; { ··· 913 965 license.fullName = "MIT"; 914 966 }; 915 967 }; 968 + 916 969 luadbi = buildLuarocksPackage { 917 970 pname = "luadbi"; 918 971 version = "0.7.2-1"; 919 972 920 973 src = fetchurl { 921 - url = "mirror://luarocks/luadbi-0.7.2-1.src.rock"; 974 + url = "https://luarocks.org/luadbi-0.7.2-1.src.rock"; 922 975 sha256 = "0mj9ggyb05l03gs38ds508620mqaw4fkrzz9861n4j0zxbsbmfwy"; 923 976 }; 924 977 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); ··· 930 983 license.fullName = "MIT/X11"; 931 984 }; 932 985 }; 986 + 933 987 luadbi-mysql = buildLuarocksPackage { 934 988 pname = "luadbi-mysql"; 935 989 version = "0.7.2-1"; 936 990 937 991 src = fetchurl { 938 - url = "mirror://luarocks/luadbi-mysql-0.7.2-1.src.rock"; 992 + url = "https://luarocks.org/luadbi-mysql-0.7.2-1.src.rock"; 939 993 sha256 = "1f8i5p66halws8qsa7g09110hwzg7pv29yi22mkqd8sjgjv42iq4"; 940 994 }; 941 995 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); ··· 947 1001 license.fullName = "MIT/X11"; 948 1002 }; 949 1003 }; 1004 + 950 1005 luadbi-postgresql = buildLuarocksPackage { 951 1006 pname = "luadbi-postgresql"; 952 1007 version = "0.7.2-1"; 953 1008 954 1009 src = fetchurl { 955 - url = "mirror://luarocks/luadbi-postgresql-0.7.2-1.src.rock"; 1010 + url = "https://luarocks.org/luadbi-postgresql-0.7.2-1.src.rock"; 956 1011 sha256 = "0nmm1hdzl77wk8p6r6al6mpkh2n332a8r3iqsdi6v4nxamykdh28"; 957 1012 }; 958 1013 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); ··· 964 1019 license.fullName = "MIT/X11"; 965 1020 }; 966 1021 }; 1022 + 967 1023 luadbi-sqlite3 = buildLuarocksPackage { 968 1024 pname = "luadbi-sqlite3"; 969 1025 version = "0.7.2-1"; 970 1026 971 1027 src = fetchurl { 972 - url = "mirror://luarocks/luadbi-sqlite3-0.7.2-1.src.rock"; 1028 + url = "https://luarocks.org/luadbi-sqlite3-0.7.2-1.src.rock"; 973 1029 sha256 = "17wd2djzk5x4l4pv2k3c7b8dcvl46s96kqyk8dp3q6ll8gdl7c65"; 974 1030 }; 975 1031 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); ··· 981 1037 license.fullName = "MIT/X11"; 982 1038 }; 983 1039 }; 1040 + 984 1041 luadoc = buildLuarocksPackage { 985 1042 pname = "luadoc"; 986 1043 version = "3.0.1-1"; 987 1044 988 1045 src = fetchurl { 989 - url = "mirror://luarocks/luadoc-3.0.1-1.src.rock"; 1046 + url = "https://luarocks.org/luadoc-3.0.1-1.src.rock"; 990 1047 sha256 = "112zqjbzkrhx3nvavrxx3vhpv2ix85pznzzbpa8fq4piyv5r781i"; 991 1048 }; 992 1049 propagatedBuildInputs = [ lualogging luafilesystem ]; ··· 997 1054 license.fullName = "MIT/X11"; 998 1055 }; 999 1056 }; 1057 + 1000 1058 luaepnf = buildLuarocksPackage { 1001 1059 pname = "luaepnf"; 1002 - version = "0.3-1"; 1060 + version = "0.3-2"; 1003 1061 1004 1062 src = fetchurl { 1005 - url = "mirror://luarocks/luaepnf-0.3-1.src.rock"; 1006 - sha256 = "12z7radxk1dkyjqflr85sghywgc82xdg4mzb9mbwbrrqbnjw8mp5"; 1063 + url = "https://luarocks.org/luaepnf-0.3-2.src.rock"; 1064 + sha256 = "01vghy965hkmycbvffb1rbgy16fp74103r2ihy3q78dzia4fbfvs"; 1007 1065 }; 1008 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 1066 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 1009 1067 propagatedBuildInputs = [ lua lpeg ]; 1010 1068 1011 1069 meta = with lib; { ··· 1014 1072 license.fullName = "MIT"; 1015 1073 }; 1016 1074 }; 1075 + 1017 1076 luaevent = buildLuarocksPackage { 1018 1077 pname = "luaevent"; 1019 1078 version = "0.4.6-1"; 1020 1079 1021 1080 src = fetchurl { 1022 - url = "mirror://luarocks/luaevent-0.4.6-1.src.rock"; 1081 + url = "https://luarocks.org/luaevent-0.4.6-1.src.rock"; 1023 1082 sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; 1024 1083 }; 1025 1084 disabled = (luaOlder "5.1"); ··· 1031 1090 license.fullName = "MIT"; 1032 1091 }; 1033 1092 }; 1093 + 1034 1094 luaexpat = buildLuarocksPackage { 1035 1095 pname = "luaexpat"; 1036 - version = "1.3.0-1"; 1096 + version = "1.3.3-1"; 1037 1097 1038 1098 src = fetchurl { 1039 - url = "mirror://luarocks/luaexpat-1.3.0-1.src.rock"; 1040 - sha256 = "15jqz5q12i9zvjyagzwz2lrpzya64mih8v1hxwr0wl2gsjh86y5a"; 1099 + url = "https://luarocks.org/luaexpat-1.3.3-1.src.rock"; 1100 + sha256 = "0ahpfnby9qqgj22bajmrqvqq70nx19388lmjm9chljfzszy0hndm"; 1041 1101 }; 1042 - disabled = (luaOlder "5.1"); 1102 + disabled = (luaOlder "5.0"); 1043 1103 propagatedBuildInputs = [ lua ]; 1044 1104 1045 1105 meta = with lib; { ··· 1049 1109 license.fullName = "MIT/X11"; 1050 1110 }; 1051 1111 }; 1112 + 1052 1113 luaffi = buildLuarocksPackage { 1053 1114 pname = "luaffi"; 1054 1115 version = "scm-1"; ··· 1066 1127 license.fullName = "BSD"; 1067 1128 }; 1068 1129 }; 1130 + 1069 1131 luafilesystem = buildLuarocksPackage { 1070 1132 pname = "luafilesystem"; 1071 - version = "1.7.0-2"; 1133 + version = "1.8.0-1"; 1072 1134 1073 1135 src = fetchurl { 1074 - url = "mirror://luarocks/luafilesystem-1.7.0-2.src.rock"; 1075 - sha256 = "0xhmd08zklsgpnpjr9rjipah35fbs8jd4v4va36xd8bpwlvx9rk5"; 1136 + url = "https://luarocks.org/luafilesystem-1.8.0-1.src.rock"; 1137 + sha256 = "1kqr1vwazrysgxamx9x89vn3fparfffx986bq9a452ajayjp0qjp"; 1076 1138 }; 1077 1139 disabled = (luaOlder "5.1"); 1078 1140 propagatedBuildInputs = [ lua ]; ··· 1080 1142 meta = with lib; { 1081 1143 homepage = "git://github.com/keplerproject/luafilesystem"; 1082 1144 description = "File System Library for the Lua Programming Language"; 1083 - maintainers = with maintainers; [ flosse vcunat ]; 1145 + maintainers = with maintainers; [ flosse ]; 1084 1146 license.fullName = "MIT/X11"; 1085 1147 }; 1086 1148 }; 1149 + 1087 1150 lualogging = buildLuarocksPackage { 1088 1151 pname = "lualogging"; 1089 - version = "1.3.0-1"; 1152 + version = "1.5.1-1"; 1090 1153 1091 1154 src = fetchurl { 1092 - url = "mirror://luarocks/lualogging-1.3.0-1.src.rock"; 1093 - sha256 = "13fm1vlig3zmbfkmlq1vk3xfqhlvv5xf24b0p4k4d08395y858vc"; 1155 + url = "https://luarocks.org/lualogging-1.5.1-1.src.rock"; 1156 + sha256 = "1c98dnpfa2292g9xhpgsrfdvm80r1fhndrpay1hcgnq0qnz1sibh"; 1094 1157 }; 1095 1158 propagatedBuildInputs = [ luasocket ]; 1096 1159 1097 1160 meta = with lib; { 1098 - homepage = "https://github.com/Neopallium/lualogging"; 1161 + homepage = "https://github.com/lunarmodules/lualogging"; 1099 1162 description = "A simple API to use logging features"; 1100 1163 license.fullName = "MIT/X11"; 1101 1164 }; 1102 1165 }; 1166 + 1103 1167 luaossl = buildLuarocksPackage { 1104 1168 pname = "luaossl"; 1105 - version = "20190731-0"; 1169 + version = "20200709-0"; 1106 1170 1107 1171 src = fetchurl { 1108 - url = "mirror://luarocks/luaossl-20190731-0.src.rock"; 1109 - sha256 = "0gardlh547hah5w4kfsdg05jmxzrxr21macqigcmp5hw1l67jn5m"; 1172 + url = "https://luarocks.org/luaossl-20200709-0.src.rock"; 1173 + sha256 = "0y6dqf560j2bq2rjlm5572m82pj627fd2p9mjc5y6fbram764vga"; 1110 1174 }; 1111 1175 propagatedBuildInputs = [ lua ]; 1112 1176 1113 1177 meta = with lib; { 1114 1178 homepage = "http://25thandclement.com/~william/projects/luaossl.html"; 1115 1179 description = "Most comprehensive OpenSSL module in the Lua universe."; 1116 - maintainers = with maintainers; [ vcunat ]; 1117 1180 license.fullName = "MIT/X11"; 1118 1181 }; 1119 1182 }; 1183 + 1120 1184 luaposix = buildLuarocksPackage { 1121 1185 pname = "luaposix"; 1122 - version = "34.1.1-1"; 1186 + version = "35.0-1"; 1123 1187 1124 1188 src = fetchurl { 1125 - url = "mirror://luarocks/luaposix-34.1.1-1.src.rock"; 1126 - sha256 = "1l9pkn3g0nzlbmmfj12rhfwvkqb06c21ydqxqgmnmd3w9z4ck53w"; 1189 + url = "https://luarocks.org/luaposix-35.0-1.src.rock"; 1190 + sha256 = "1da27fsz6v2asxifr4yv0r8rp80g6bg021piqrabqk9lq23hvjks"; 1127 1191 }; 1128 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 1129 - propagatedBuildInputs = [ bit32 lua ]; 1192 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 1193 + propagatedBuildInputs = [ lua ]; 1130 1194 1131 1195 meta = with lib; { 1132 - homepage = "https://github.com/luaposix/luaposix/"; 1196 + homepage = "http://github.com/luaposix/luaposix/"; 1133 1197 description = "Lua bindings for POSIX"; 1134 1198 maintainers = with maintainers; [ vyp lblasc ]; 1135 1199 license.fullName = "MIT/X11"; 1136 1200 }; 1137 1201 }; 1202 + 1138 1203 luarepl = buildLuarocksPackage { 1139 1204 pname = "luarepl"; 1140 1205 version = "0.9-1"; 1141 1206 1142 1207 knownRockspec = (fetchurl { 1143 - url = "mirror://luarocks/luarepl-0.9-1.rockspec"; 1208 + url = "https://luarocks.org/luarepl-0.9-1.rockspec"; 1144 1209 sha256 = "1409lanxv4s8kq5rrh46dvld77ip33qzfn3vac3i9zpzbmgb5i8z"; 1145 1210 }).outPath; 1146 1211 ··· 1158 1223 license.fullName = "MIT/X11"; 1159 1224 }; 1160 1225 }; 1226 + 1161 1227 luasec = buildLuarocksPackage { 1162 1228 pname = "luasec"; 1163 - version = "0.9-1"; 1229 + version = "1.0.1-1"; 1164 1230 1165 1231 src = fetchurl { 1166 - url = "mirror://luarocks/luasec-0.9-1.src.rock"; 1167 - sha256 = "00npxdwr3s4638i1jzmhyvss796rhbqk43zrzkb5lzzhqlxpsz5q"; 1232 + url = "https://luarocks.org/luasec-1.0.1-1.src.rock"; 1233 + sha256 = "0384afx1w124ljs3hpp31ldqlrrgsa2xl625sxrx79yddilgk48f"; 1168 1234 }; 1169 1235 disabled = (luaOlder "5.1"); 1170 1236 propagatedBuildInputs = [ lua luasocket ]; ··· 1176 1242 license.fullName = "MIT"; 1177 1243 }; 1178 1244 }; 1245 + 1179 1246 luasocket = buildLuarocksPackage { 1180 1247 pname = "luasocket"; 1181 1248 version = "3.0rc1-2"; 1182 1249 1183 1250 src = fetchurl { 1184 - url = "mirror://luarocks/luasocket-3.0rc1-2.src.rock"; 1251 + url = "https://luarocks.org/luasocket-3.0rc1-2.src.rock"; 1185 1252 sha256 = "1isin9m40ixpqng6ds47skwa4zxrc6w8blza8gmmq566w6hz50iq"; 1186 1253 }; 1187 1254 disabled = (luaOlder "5.1"); ··· 1193 1260 license.fullName = "MIT"; 1194 1261 }; 1195 1262 }; 1263 + 1196 1264 luasql-sqlite3 = buildLuarocksPackage { 1197 1265 pname = "luasql-sqlite3"; 1198 - version = "2.5.0-1"; 1266 + version = "2.6.0-1"; 1199 1267 1200 1268 knownRockspec = (fetchurl { 1201 - url = "mirror://luarocks/luasql-sqlite3-2.5.0-1.rockspec"; 1202 - sha256 = "1r0x21i6n18x6915iaj9n309lqqqk1b30bg9h2a6y8jzk839hk09"; 1269 + url = "https://luarocks.org/luasql-sqlite3-2.6.0-1.rockspec"; 1270 + sha256 = "0w32znsfcaklcja6avqx7daaxbf0hr2v8g8bmz0fysb3401lmp02"; 1203 1271 }).outPath; 1204 1272 1205 1273 src = fetchgit ( removeAttrs (builtins.fromJSON ''{ 1206 1274 "url": "git://github.com/keplerproject/luasql.git", 1207 - "rev": "5496d60185db0c4578e8abe0c74343e99b799311", 1208 - "date": "2019-06-14T10:54:41-03:00", 1209 - "sha256": "1jdm1abj2ngklg7syq1ijj142ai9nmdl9370dk2bgamzlxc41pqm", 1210 - "fetchSubmodules": true 1275 + "rev": "8c58fd6ee32faf750daf6e99af015a31402578d1", 1276 + "date": "2020-09-16T13:25:07+01:00", 1277 + "path": "/nix/store/62g3f835iry7la34pw09dbqy2b7mn4q5-luasql", 1278 + "sha256": "0jad5fin58mv36mdfz5jwg6hbcd7s32x39lyqymn1j9mxzjc2m2y", 1279 + "fetchSubmodules": true, 1280 + "deepClone": false, 1281 + "leaveDotGit": false 1211 1282 } 1212 - '') ["date"]) ; 1283 + '') ["date" "path"]) ; 1213 1284 1214 1285 disabled = (luaOlder "5.1"); 1215 1286 propagatedBuildInputs = [ lua ]; ··· 1221 1292 license.fullName = "MIT/X11"; 1222 1293 }; 1223 1294 }; 1295 + 1224 1296 luassert = buildLuarocksPackage { 1225 1297 pname = "luassert"; 1226 1298 version = "1.8.0-0"; 1227 1299 1228 1300 knownRockspec = (fetchurl { 1229 - url = "mirror://luarocks/luassert-1.8.0-0.rockspec"; 1301 + url = "https://luarocks.org/luassert-1.8.0-0.rockspec"; 1230 1302 sha256 = "1194y81nlkq4qmrrgl7z82i6vgvhqvp1p673kq0arjix8mv3zyz1"; 1231 1303 }).outPath; 1232 1304 ··· 1244 1316 license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 1245 1317 }; 1246 1318 }; 1319 + 1247 1320 luasystem = buildLuarocksPackage { 1248 1321 pname = "luasystem"; 1249 1322 version = "0.2.1-0"; 1250 1323 1251 1324 src = fetchurl { 1252 - url = "mirror://luarocks/luasystem-0.2.1-0.src.rock"; 1325 + url = "https://luarocks.org/luasystem-0.2.1-0.src.rock"; 1253 1326 sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; 1254 1327 }; 1255 1328 disabled = (luaOlder "5.1"); ··· 1261 1334 license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 1262 1335 }; 1263 1336 }; 1337 + 1264 1338 luautf8 = buildLuarocksPackage { 1265 1339 pname = "luautf8"; 1266 - version = "0.1.2-2"; 1340 + version = "0.1.3-1"; 1267 1341 1268 1342 src = fetchurl { 1269 - url = "mirror://luarocks/luautf8-0.1.2-2.src.rock"; 1270 - sha256 = "1q0qpr87alfzwwx5x0v9cggnz5fqi20jlqdh1a3i5cijjaj6xwdn"; 1343 + url = "https://luarocks.org/luautf8-0.1.3-1.src.rock"; 1344 + sha256 = "1yp4j1r33yvsqf8cggmf4mhaxhz5lqzxhl9mnc0q5lh01yy5di48"; 1271 1345 }; 1272 1346 disabled = (luaOlder "5.1"); 1273 1347 propagatedBuildInputs = [ lua ]; 1274 1348 1275 1349 meta = with lib; { 1276 - homepage = "https://github.com/starwing/luautf8"; 1350 + homepage = "http://github.com/starwing/luautf8"; 1277 1351 description = "A UTF-8 support module for Lua"; 1278 1352 maintainers = with maintainers; [ pstn ]; 1279 1353 license.fullName = "MIT"; 1280 1354 }; 1281 1355 }; 1356 + 1282 1357 luazip = buildLuarocksPackage { 1283 1358 pname = "luazip"; 1284 1359 version = "1.2.7-1"; 1285 1360 1286 1361 src = fetchurl { 1287 - url = "mirror://luarocks/luazip-1.2.7-1.src.rock"; 1362 + url = "https://luarocks.org/luazip-1.2.7-1.src.rock"; 1288 1363 sha256 = "1yprlr1ap6bhshhy88qfphmmyg9zp1py2hj2158iw6vsva0fk03l"; 1289 1364 }; 1290 1365 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); ··· 1296 1371 license.fullName = "MIT"; 1297 1372 }; 1298 1373 }; 1299 - lua-yajl = buildLuarocksPackage { 1300 - pname = "lua-yajl"; 1301 - version = "2.0-1"; 1302 1374 1303 - src = fetchurl { 1304 - url = "mirror://luarocks/lua-yajl-2.0-1.src.rock"; 1305 - sha256 = "0bsm519vs53rchcdf8g96ygzdx2bz6pa4vffqlvc7ap49bg5np4f"; 1306 - }; 1307 - disabled = (luaOlder "5.1"); 1308 - propagatedBuildInputs = [ lua ]; 1309 - 1310 - meta = with lib; { 1311 - homepage = "https://github.com/brimworks/lua-yajl"; 1312 - description = "Integrate the yajl JSON library with Lua."; 1313 - maintainers = with maintainers; [ pstn ]; 1314 - license.fullName = "MIT/X11"; 1315 - }; 1316 - }; 1317 1375 luuid = buildLuarocksPackage { 1318 1376 pname = "luuid"; 1319 1377 version = "20120509-2"; 1320 1378 1321 1379 src = fetchurl { 1322 - url = "mirror://luarocks/luuid-20120509-2.src.rock"; 1380 + url = "https://luarocks.org/luuid-20120509-2.src.rock"; 1323 1381 sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; 1324 1382 }; 1325 1383 disabled = (luaOlder "5.2") || (luaAtLeast "5.4"); ··· 1331 1389 license.fullName = "Public domain"; 1332 1390 }; 1333 1391 }; 1392 + 1334 1393 luv = buildLuarocksPackage { 1335 1394 pname = "luv"; 1336 - version = "1.30.0-0"; 1395 + version = "1.41.1-0"; 1337 1396 1338 1397 src = fetchurl { 1339 - url = "https://luarocks.org/luv-1.30.0-0.src.rock"; 1340 - sha256 = "1z5sdq9ld4sm5pws9qxpk9cadv9i7ycwad1zwsa57pj67gly11vi"; 1398 + url = "https://luarocks.org/luv-1.41.1-0.src.rock"; 1399 + sha256 = "0l1v07nhrkzsddbcc4bak382b5flyw6x8g4i394ylbfl25zwcmai"; 1341 1400 }; 1342 1401 disabled = (luaOlder "5.1"); 1343 1402 propagatedBuildInputs = [ lua ]; ··· 1348 1407 license.fullName = "Apache 2.0"; 1349 1408 }; 1350 1409 }; 1410 + 1351 1411 lyaml = buildLuarocksPackage { 1352 1412 pname = "lyaml"; 1353 - version = "6.2.5-1"; 1413 + version = "6.2.7-1"; 1354 1414 1355 1415 src = fetchurl { 1356 - url = "mirror://luarocks/lyaml-6.2.5-1.src.rock"; 1357 - sha256 = "00pnz27sqi84arwkzjabz9v7w37h7xvwb5njk690cfmaknb1dfz6"; 1416 + url = "https://luarocks.org/lyaml-6.2.7-1.src.rock"; 1417 + sha256 = "1sh1q84n109j4sammgbzyr69ni7fxnrjfwqb49fsbrhhd49vw7ca"; 1358 1418 }; 1359 1419 disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 1360 1420 propagatedBuildInputs = [ lua ]; 1361 1421 1362 1422 meta = with lib; { 1363 - homepage = "https://github.com/gvvaughan/lyaml"; 1423 + homepage = "http://github.com/gvvaughan/lyaml"; 1364 1424 description = "libYAML binding for Lua"; 1365 1425 maintainers = with maintainers; [ lblasc ]; 1366 1426 license.fullName = "MIT/X11"; 1367 1427 }; 1368 1428 }; 1429 + 1369 1430 markdown = buildLuarocksPackage { 1370 1431 pname = "markdown"; 1371 1432 version = "0.33-1"; 1372 1433 1373 1434 src = fetchurl { 1374 - url = "mirror://luarocks/markdown-0.33-1.src.rock"; 1435 + url = "https://luarocks.org/markdown-0.33-1.src.rock"; 1375 1436 sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; 1376 1437 }; 1377 1438 disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); ··· 1383 1444 license.fullName = "MIT/X11"; 1384 1445 }; 1385 1446 }; 1447 + 1386 1448 mediator_lua = buildLuarocksPackage { 1387 1449 pname = "mediator_lua"; 1388 1450 version = "1.1.2-0"; 1389 1451 1390 1452 knownRockspec = (fetchurl { 1391 - url = "mirror://luarocks/mediator_lua-1.1.2-0.rockspec"; 1453 + url = "https://luarocks.org/mediator_lua-1.1.2-0.rockspec"; 1392 1454 sha256 = "0frzvf7i256260a1s8xh92crwa2m42972qxfq29zl05aw3pyn7bm"; 1393 1455 }).outPath; 1394 1456 ··· 1406 1468 license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 1407 1469 }; 1408 1470 }; 1471 + 1472 + moonscript = buildLuarocksPackage { 1473 + pname = "moonscript"; 1474 + version = "0.5.0-1"; 1475 + 1476 + src = fetchurl { 1477 + url = "https://luarocks.org/moonscript-0.5.0-1.src.rock"; 1478 + sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; 1479 + }; 1480 + disabled = (luaOlder "5.1"); 1481 + propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; 1482 + 1483 + meta = with lib; { 1484 + homepage = "http://moonscript.org"; 1485 + description = "A programmer friendly language that compiles to Lua"; 1486 + maintainers = with maintainers; [ arobyn ]; 1487 + license.fullName = "MIT"; 1488 + }; 1489 + }; 1490 + 1409 1491 mpack = buildLuarocksPackage { 1410 1492 pname = "mpack"; 1411 1493 version = "1.0.8-0"; 1412 1494 1413 1495 knownRockspec = (fetchurl { 1414 - url = "mirror://luarocks/mpack-1.0.8-0.rockspec"; 1496 + url = "https://luarocks.org/mpack-1.0.8-0.rockspec"; 1415 1497 sha256 = "0hhpamw2bydnfrild274faaan6v48918nhslnw3kvi9y36b4i5ha"; 1416 1498 }).outPath; 1417 1499 ··· 1427 1509 license.fullName = "MIT"; 1428 1510 }; 1429 1511 }; 1430 - moonscript = buildLuarocksPackage { 1431 - pname = "moonscript"; 1432 - version = "0.5.0-1"; 1433 1512 1434 - src = fetchurl { 1435 - url = "mirror://luarocks/moonscript-0.5.0-1.src.rock"; 1436 - sha256 = "09vv3ayzg94bjnzv5fw50r683ma0x3lb7sym297145zig9aqb9q9"; 1437 - }; 1438 - disabled = (luaOlder "5.1"); 1439 - propagatedBuildInputs = [ lua lpeg alt-getopt luafilesystem ]; 1440 - 1441 - meta = with lib; { 1442 - homepage = "http://moonscript.org"; 1443 - description = "A programmer friendly language that compiles to Lua"; 1444 - maintainers = with maintainers; [ arobyn ]; 1445 - license.fullName = "MIT"; 1446 - }; 1447 - }; 1448 1513 nvim-client = buildLuarocksPackage { 1449 1514 pname = "nvim-client"; 1450 1515 version = "0.2.2-1"; 1451 1516 1452 1517 src = fetchurl { 1453 - url = "mirror://luarocks/nvim-client-0.2.2-1.src.rock"; 1518 + url = "https://luarocks.org/nvim-client-0.2.2-1.src.rock"; 1454 1519 sha256 = "0bgx94ziiq0004zw9lz2zb349xaqs5pminqd8bwdrfdnfjnbp8x0"; 1455 1520 }; 1456 1521 disabled = (luaOlder "5.1"); ··· 1462 1527 license.fullName = "Apache"; 1463 1528 }; 1464 1529 }; 1530 + 1465 1531 penlight = buildLuarocksPackage { 1466 1532 pname = "penlight"; 1467 - version = "1.8.0-1"; 1533 + version = "1.10.0-1"; 1468 1534 1469 1535 src = fetchurl { 1470 - url = "mirror://luarocks/penlight-1.8.0-1.src.rock"; 1471 - sha256 = "05x00dgsa79wzq187ww6i8j0s74nh2c852awni7xfshxgihwhc42"; 1536 + url = "https://luarocks.org/penlight-1.10.0-1.src.rock"; 1537 + sha256 = "1awd87833688wjdq8ynbzy1waia8ggaz573h9cqg1g2zm6d2mxvp"; 1472 1538 }; 1473 1539 propagatedBuildInputs = [ luafilesystem ]; 1474 1540 1475 1541 meta = with lib; { 1476 - homepage = "http://tieske.github.io/Penlight"; 1542 + homepage = "https://lunarmodules.github.io/penlight"; 1477 1543 description = "Lua utility libraries loosely based on the Python standard libraries"; 1478 - maintainers = with maintainers; [ alerque ]; 1479 1544 license.fullName = "MIT/X11"; 1480 1545 }; 1481 1546 }; 1547 + 1482 1548 plenary-nvim = buildLuarocksPackage { 1483 1549 pname = "plenary.nvim"; 1484 1550 version = "scm-1"; 1485 1551 1486 1552 knownRockspec = (fetchurl { 1487 - url = "mirror://luarocks/plenary.nvim-scm-1.rockspec"; 1553 + url = "https://luarocks.org/plenary.nvim-scm-1.rockspec"; 1488 1554 sha256 = "1cp2dzf3010q85h300aa7zphyz75qn67lrwf9v6b0p534nzvmash"; 1489 1555 }).outPath; 1490 1556 1491 1557 src = fetchgit ( removeAttrs (builtins.fromJSON ''{ 1492 1558 "url": "git://github.com/nvim-lua/plenary.nvim", 1493 - "rev": "8bae2c1fadc9ed5bfcfb5ecbd0c0c4d7d40cb974", 1494 - "date": "2021-07-12T11:07:18-04:00", 1495 - "path": "/nix/store/djp9yacizsxs9hiz786fb900fri0m2l8-plenary.nvim", 1496 - "sha256": "1axvjv6n77afkjqk914dpc020kxd7mig6m5sr916k1n1q35jc4ny", 1559 + "rev": "4a30ce31e3132bc268dee6879b20cad28c0fe8fa", 1560 + "date": "2021-08-02T15:17:10-04:00", 1561 + "path": "/nix/store/1qfg23iylmj9j2kfs7px1nknm81saw7i-plenary.nvim", 1562 + "sha256": "0iwrw88vjsnkij1mdm1d7pg1wwksssd6jpngps2qb5cddh43d2c0", 1497 1563 "fetchSubmodules": true, 1498 1564 "deepClone": false, 1499 1565 "leaveDotGit": false ··· 1509 1575 license.fullName = "MIT/X11"; 1510 1576 }; 1511 1577 }; 1578 + 1512 1579 rapidjson = buildLuarocksPackage { 1513 1580 pname = "rapidjson"; 1514 - version = "0.6.1-1"; 1581 + version = "0.7.1-1"; 1515 1582 1516 1583 src = fetchurl { 1517 - url = "mirror://luarocks/rapidjson-0.6.1-1.src.rock"; 1518 - sha256 = "106zdkmqspwjw6ywzi7ya9zss52p9zggh53rg0i36sk19z0xmp6j"; 1584 + url = "https://luarocks.org/rapidjson-0.7.1-1.src.rock"; 1585 + sha256 = "010y1n7nlajdsm351fyqmi916v5x8kzp5hbynwlx5xc9r9480w81"; 1519 1586 }; 1520 1587 disabled = (luaOlder "5.1"); 1521 1588 propagatedBuildInputs = [ lua ]; ··· 1526 1593 license.fullName = "MIT"; 1527 1594 }; 1528 1595 }; 1596 + 1529 1597 readline = buildLuarocksPackage { 1530 1598 pname = "readline"; 1531 - version = "2.6-0"; 1599 + version = "3.0-0"; 1532 1600 1533 1601 src = fetchurl { 1534 - url = mirror://luarocks/readline-2.6-0.src.rock; 1535 - sha256 = "1fvz7nqvkdazp30wn5n62n8i97qrfgznbykdpf8cnflqfpd1shms"; 1602 + url = "https://luarocks.org/readline-3.0-0.src.rock"; 1603 + sha256 = "0qpa60llcgvc5mj67a2w3il9i7700lvimraxjpk0lx44zkabh6c8"; 1536 1604 }; 1537 - disabled = (luaOlder "5.1") || (luaAtLeast "5.4"); 1605 + disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 1538 1606 propagatedBuildInputs = [ lua luaposix ]; 1539 1607 1540 1608 meta = with lib; { 1541 - homepage = "http://www.pjb.com.au/comp/lua/readline.html"; 1609 + homepage = "http://pjb.com.au/comp/lua/readline.html"; 1542 1610 description = "Interface to the readline library"; 1543 1611 license.fullName = "MIT/X11"; 1544 1612 }; 1545 1613 }; 1614 + 1546 1615 say = buildLuarocksPackage { 1547 1616 pname = "say"; 1548 1617 version = "1.3-1"; 1549 1618 1550 1619 knownRockspec = (fetchurl { 1551 - url = "mirror://luarocks/say-1.3-1.rockspec"; 1620 + url = "https://luarocks.org/say-1.3-1.rockspec"; 1552 1621 sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; 1553 1622 }).outPath; 1554 1623 ··· 1566 1635 license.fullName = "MIT <http://opensource.org/licenses/MIT>"; 1567 1636 }; 1568 1637 }; 1569 - std__debug = buildLuarocksPackage { 1638 + 1639 + std-_debug = buildLuarocksPackage { 1570 1640 pname = "std._debug"; 1571 1641 version = "1.0.1-1"; 1572 1642 1573 1643 src = fetchurl { 1574 - url = "mirror://luarocks/std._debug-1.0.1-1.src.rock"; 1644 + url = "https://luarocks.org/std._debug-1.0.1-1.src.rock"; 1575 1645 sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; 1576 1646 }; 1577 1647 disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); ··· 1583 1653 license.fullName = "MIT/X11"; 1584 1654 }; 1585 1655 }; 1586 - std_normalize = buildLuarocksPackage { 1656 + 1657 + std-normalize = buildLuarocksPackage { 1587 1658 pname = "std.normalize"; 1588 1659 version = "2.0.3-1"; 1589 1660 1590 1661 src = fetchurl { 1591 - url = "mirror://luarocks/std.normalize-2.0.3-1.src.rock"; 1662 + url = "https://luarocks.org/std.normalize-2.0.3-1.src.rock"; 1592 1663 sha256 = "00pq2y5w8i052gxmyhgri5ibijksnfmc24kya9y3d5rjlin0n11s"; 1593 1664 }; 1594 1665 disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); 1595 - propagatedBuildInputs = [ lua std__debug ]; 1666 + propagatedBuildInputs = [ lua std-_debug ]; 1596 1667 1597 1668 meta = with lib; { 1598 1669 homepage = "https://lua-stdlib.github.io/normalize"; ··· 1600 1671 license.fullName = "MIT/X11"; 1601 1672 }; 1602 1673 }; 1674 + 1603 1675 stdlib = buildLuarocksPackage { 1604 1676 pname = "stdlib"; 1605 1677 version = "41.2.2-1"; 1606 1678 1607 1679 src = fetchurl { 1608 - url = "mirror://luarocks/stdlib-41.2.2-1.src.rock"; 1680 + url = "https://luarocks.org/stdlib-41.2.2-1.src.rock"; 1609 1681 sha256 = "1kricll40xy75j72lrbp2jpyxsj9v8b9d7qjf3m3fq1bpg6dmsk7"; 1610 1682 }; 1611 1683 disabled = (luaOlder "5.1") || (luaAtLeast "5.5"); ··· 1618 1690 license.fullName = "MIT/X11"; 1619 1691 }; 1620 1692 }; 1693 + 1621 1694 vstruct = buildLuarocksPackage { 1622 1695 pname = "vstruct"; 1623 - version = "2.0.2-1"; 1696 + version = "2.1.1-1"; 1624 1697 1625 1698 src = fetchurl { 1626 - url = "mirror://luarocks/vstruct-2.0.2-1.src.rock"; 1627 - sha256 = "05k1685618wh7vg8av92mh1i1rjqg15x12gifbp9kyqzc2nk3kzq"; 1699 + url = "https://luarocks.org/vstruct-2.1.1-1.src.rock"; 1700 + sha256 = "0hdlq8dr27k32n5qr87yisl14wg0k0zqd990xqvjqdxrf8d7iypw"; 1628 1701 }; 1629 - disabled = (luaOlder "5.1") || (luaAtLeast "5.3"); 1702 + disabled = (luaOlder "5.1"); 1630 1703 propagatedBuildInputs = [ lua ]; 1631 1704 1632 1705 meta = with lib; { ··· 1635 1708 }; 1636 1709 }; 1637 1710 1638 - } 1639 - /* GENERATED */ 1640 1711 1712 + } 1713 + /* GENERATED - do not edit this file */
+4
pkgs/development/lua-modules/overrides.nix
··· 347 347 sourceRoot=./readline-2.6 348 348 ''; 349 349 }); 350 + 351 + 352 + # aliases 353 + cjson = super.lua-cjson; 350 354 }