public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #62654 from teto/lua_update

Browse Source 
Lua updater update :)
This commit is contained in:
Matthieu Coudron 2019-06-04 21:41:23 +09:00 committed by GitHub
commit e496104638
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 126 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
maintainers/scripts/luarocks-packages.csv
View File

@ -1,41 +1,41 @@
# nix name, luarocks name, server, version/additionnal args
ansicolors,
argparse,
basexx,
binaryheap,
dkjson
fifo
http
inspect
ldoc
lgi
lpeg_patterns
lpty
lrexlib-gnu,
lrexlib-posix,
ltermbox,
lua-cmsgpack,
lua_cliargs,
lua-iconv,
lua-messagepack,
lua-term,
lua-toml,
luabitop,
luaevent,
luacheck
luaffi,,http://luarocks.org/dev,
luuid,
markdown,
penlight,
rapidjson,
say,
std__debug,std._debug,
std_normalize,std.normalize,
luv,
luasystem,
mediator_lua,,http://luarocks.org/manifests/teto
mpack,,http://luarocks.org/manifests/teto
nvim-client,,http://luarocks.org/manifests/teto
busted,,http://luarocks.org/manifests/teto
luassert,,http://luarocks.org/manifests/teto
coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1
# nix name, luarocks name, server, version,luaversion
ansicolors,,,,
argparse,,,,
basexx,,,,
binaryheap,,,,
dkjson,,,,
fifo,,,,
http,,,,
inspect,,,,
ldoc,,,,
lgi,,,,
lpeg_patterns,,,,
lpty,,,,
lrexlib-gnu,,,,
lrexlib-posix,,,,
ltermbox,,,,
lua-cmsgpack,,,,
lua_cliargs,,,,
lua-iconv,,,,
lua-messagepack,,,,
lua-term,,,,
lua-toml,,,,
luabitop,,,,
luaevent,,,,
luacheck,,,,
luaffi,,http://luarocks.org/dev,,
luuid,,,,
markdown,,,,
penlight,,,,
rapidjson,,,,
say,,,,
std__debug,std._debug,,,
std_normalize,std.normalize,,,
luv,,,,
luasystem,,,,
mediator_lua,,http://luarocks.org/manifests/teto,,
mpack,,http://luarocks.org/manifests/teto,,
nvim-client,,,,
busted,,http://luarocks.org/manifests/teto,,
luassert,,,,
coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1,

1 # nix name, luarocks name, server, version/additionnal args # nix name luarocks name server version luaversion
2 ansicolors, ansicolors
3 argparse, argparse
4 basexx, basexx
5 binaryheap, binaryheap
6 dkjson dkjson
7 fifo fifo
8 http http
9 inspect inspect
10 ldoc ldoc
11 lgi lgi
12 lpeg_patterns lpeg_patterns
13 lpty lpty
14 lrexlib-gnu, lrexlib-gnu
15 lrexlib-posix, lrexlib-posix
16 ltermbox, ltermbox
17 lua-cmsgpack, lua-cmsgpack
18 lua_cliargs, lua_cliargs
19 lua-iconv, lua-iconv
20 lua-messagepack, lua-messagepack
21 lua-term, lua-term
22 lua-toml, lua-toml
23 luabitop, luabitop
24 luaevent, luaevent
25 luacheck luacheck
26 luaffi,,http://luarocks.org/dev, luaffi http://luarocks.org/dev
27 luuid, luuid
28 markdown, markdown
29 penlight, penlight
30 rapidjson, rapidjson
31 say, say
32 std__debug,std._debug, std__debug std._debug
33 std_normalize,std.normalize, std_normalize std.normalize
34 luv, luv
35 luasystem, luasystem
36 mediator_lua,,http://luarocks.org/manifests/teto mediator_lua http://luarocks.org/manifests/teto
37 mpack,,http://luarocks.org/manifests/teto mpack http://luarocks.org/manifests/teto
38 nvim-client,,http://luarocks.org/manifests/teto nvim-client
39 busted,,http://luarocks.org/manifests/teto busted http://luarocks.org/manifests/teto
40 luassert,,http://luarocks.org/manifests/teto luassert
41 coxpcall,,https://luarocks.org/manifests/hisham,1.17.0-1 coxpcall https://luarocks.org/manifests/hisham 1.17.0-1

28
maintainers/scripts/update-luarocks-packages
View File

@ -12,11 +12,6 @@
# stop the script upon C-C
set -eu -o pipefail
if [ $# -lt 1 ]; then
print_help
exit 1
fi
CSV_FILE="maintainers/scripts/luarocks-packages.csv"
TMP_FILE="$(mktemp)"
@ -25,7 +20,6 @@ exit_trap()
local lc="$BASH_COMMAND" rc=$?
test $rc -eq 0 || echo -e "*** error $rc: $lc.\nGenerated temporary file in $TMP_FILE" >&2
}
trap exit_trap EXIT
print_help() {
echo "Usage: $0 <GENERATED_FILE>"
@ -35,6 +29,12 @@ print_help() {
exit 1
}
if [ $# -lt 1 ]; then
print_help
exit 1
fi
trap exit_trap EXIT
while getopts ":hc:" opt; do
case $opt in
@ -76,15 +76,16 @@ FOOTER="
function convert_pkg () {
nix_pkg_name="$1"
lua_pkg_name="$2"
server="${3:+--server=$3}"
version="${4:-}"
server="${3:+--only-server=$3}"
pkg_version="${4:-}"
lua_version="${5:+--lua-dir=$(nix path-info nixpkgs.$5)/bin}"
echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2
cmd="luarocks nix $server $lua_pkg_name $version"
echo "looking at $lua_pkg_name (version $pkg_version) from server [$server]" >&2
cmd="luarocks nix $server $lua_version $lua_pkg_name $pkg_version"
echo "Running $cmd" >&2
drv="$nix_pkg_name = $($cmd)"
if [ $? -ne 0 ]; then
echo "Failed to convert $pkg" >&2
echo "$drv" >&2
else
echo "$drv" | tee -a "$TMP_FILE"
fi
@ -94,8 +95,7 @@ function convert_pkg () {
echo "$HEADER" | tee "$TMP_FILE"
# list of packages with format
# name,server,version
while IFS=, read -r nix_pkg_name lua_pkg_name server version
while IFS=, read -r nix_pkg_name lua_pkg_name server pkg_version luaversion
do
if [ "${nix_pkg_name:0:1}" == "#" ]; then
echo "Skipping comment ${nix_pkg_name}" >&2
@ -105,7 +105,7 @@ do
echo "Using nix_name as lua_pkg_name" >&2
lua_pkg_name="$nix_pkg_name"
fi
convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version"
convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$pkg_version" "$luaversion"
done < "$CSV_FILE"
# close the set

78
pkgs/development/lua-modules/generated-packages.nix
View File

@ -1,7 +1,7 @@
/* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT!
Regenerate it with:
nixpkgs$ ./maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix
nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix
These packages are manually refined in lua-overrides.nix
*/
@ -20,7 +20,6 @@ ansicolors = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/kikito/ansicolors.lua";
@ -40,7 +39,6 @@ argparse = buildLuarocksPackage {
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/mpeterv/argparse";
@ -66,7 +64,6 @@ basexx = buildLuarocksPackage {
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/aiq/basexx";
@ -86,7 +83,6 @@ binaryheap = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/Tieske/binaryheap.lua";
@ -106,7 +102,6 @@ dkjson = buildLuarocksPackage {
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://dkolf.de/src/dkjson-lua.fsl/";
@ -124,9 +119,7 @@ fifo = buildLuarocksPackage {
url = https://luarocks.org/fifo-0.2-0.src.rock;
sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk";
};
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/daurnimator/fifo.lua";
@ -146,7 +139,6 @@ http = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua compat53 bit32 cqueues luaossl basexx lpeg lpeg_patterns binaryheap fifo ];
buildType = "builtin";
meta = {
homepage = "https://github.com/daurnimator/lua-http";
@ -166,7 +158,6 @@ inspect = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/kikito/inspect.lua";
@ -191,7 +182,6 @@ ldoc = buildLuarocksPackage {
};
propagatedBuildInputs = [ penlight markdown ];
buildType = "builtin";
meta = {
homepage = "http://stevedonovan.github.com/ldoc";
@ -211,7 +201,6 @@ lgi = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "make";
meta = {
homepage = "http://github.com/pavouk/lgi";
@ -229,9 +218,7 @@ lpeg_patterns = buildLuarocksPackage {
url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock;
sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f";
};
propagatedBuildInputs = [ lua lpeg ];
buildType = "builtin";
meta = {
homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip";
@ -251,7 +238,6 @@ lpty = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "make";
meta = {
homepage = "http://www.tset.de/lpty/";
@ -271,7 +257,6 @@ lrexlib-gnu = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://github.com/rrthomas/lrexlib";
@ -291,7 +276,6 @@ lrexlib-posix = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://github.com/rrthomas/lrexlib";
@ -311,7 +295,6 @@ ltermbox = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://code.google.com/p/termbox";
@ -336,11 +319,11 @@ lua-cmsgpack = buildLuarocksPackage {
"date": "2018-06-14T11:56:56+02:00",
"sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj",
"fetchSubmodules": true
} '') ["date"]) ;
}
'') ["date"]) ;
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://github.com/antirez/lua-cmsgpack";
@ -360,7 +343,6 @@ lua_cliargs = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/amireh/lua_cliargs";
@ -380,7 +362,6 @@ lua-iconv = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://ittner.github.com/lua-iconv/";
@ -400,7 +381,6 @@ lua-messagepack = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://fperrad.frama.io/lua-MessagePack/";
@ -424,7 +404,6 @@ lua-term = buildLuarocksPackage {
sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1";
};
buildType = "builtin";
meta = {
homepage = "https://github.com/hoelzro/lua-term";
@ -444,7 +423,6 @@ lua-toml = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/jonstoler/lua-toml";
@ -469,11 +447,11 @@ luabitop = buildLuarocksPackage {
"date": "2013-02-18T16:36:42+01:00",
"sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q",
"fetchSubmodules": true
} '') ["date"]) ;
}
'') ["date"]) ;
disabled = (luaOlder "5.1") || (luaAtLeast "5.3");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://bitop.luajit.org/";
@ -493,7 +471,6 @@ luaevent = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/harningt/luaevent";
@ -513,7 +490,6 @@ luacheck = buildLuarocksPackage {
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua argparse luafilesystem ];
buildType = "builtin";
meta = {
homepage = "https://github.com/mpeterv/luacheck";
@ -533,7 +509,6 @@ luaffi = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/facebook/luaffifb";
@ -553,7 +528,6 @@ luuid = buildLuarocksPackage {
};
disabled = (luaOlder "5.2") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid";
@ -573,7 +547,6 @@ markdown = buildLuarocksPackage {
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "https://github.com/mpeterv/markdown";
@ -598,7 +571,6 @@ penlight = buildLuarocksPackage {
};
propagatedBuildInputs = [ luafilesystem ];
buildType = "builtin";
meta = {
homepage = "http://stevedonovan.github.com/Penlight";
@ -618,7 +590,6 @@ rapidjson = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "cmake";
meta = {
homepage = "https://github.com/xpol/lua-rapidjson";
@ -644,7 +615,6 @@ say = buildLuarocksPackage {
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://olivinelabs.com/busted/";
@ -664,7 +634,6 @@ std__debug = buildLuarocksPackage {
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.5");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://lua-stdlib.github.io/_debug";
@ -684,7 +653,6 @@ std_normalize = buildLuarocksPackage {
};
disabled = (luaOlder "5.1") || (luaAtLeast "5.4");
propagatedBuildInputs = [ lua std__debug ];
buildType = "builtin";
meta = {
homepage = "https://lua-stdlib.github.io/normalize";
@ -696,15 +664,14 @@ std_normalize = buildLuarocksPackage {
};
luv = buildLuarocksPackage {
pname = "luv";
version = "1.28.0-1";
version = "1.29.1-1";
src = fetchurl {
url = https://luarocks.org/luv-1.28.0-1.src.rock;
sha256 = "15m946p982bk4apig7yf07jm25ck26v2qxcvnrfh60vrbaw6gihw";
url = https://luarocks.org/luv-1.29.1-1.src.rock;
sha256 = "0x801pp8h2035lbncsb6vkwgxqrai69ri3sp9g1dwnfnipsfsvrg";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "cmake";
meta = {
homepage = "https://github.com/luvit/luv";
@ -724,7 +691,6 @@ luasystem = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://olivinelabs.com/luasystem/";
@ -744,7 +710,6 @@ mediator_lua = buildLuarocksPackage {
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua ];
buildType = "builtin";
meta = {
homepage = "http://olivinelabs.com/mediator_lua/";
@ -763,8 +728,6 @@ mpack = buildLuarocksPackage {
sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7";
};
buildType = "builtin";
meta = {
homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz";
description = "Lua binding to libmpack";
@ -775,18 +738,17 @@ mpack = buildLuarocksPackage {
};
nvim-client = buildLuarocksPackage {
pname = "nvim-client";
version = "0.1.0-1";
version = "0.2.0-1";
src = fetchurl {
url = https://luarocks.org/nvim-client-0.1.0-1.src.rock;
sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma";
url = https://luarocks.org/nvim-client-0.2.0-1.src.rock;
sha256 = "1ah9mjvz28hrbwnyb5n60znz3m0m41rn7jpnxwfx773cys3skidx";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua mpack luv coxpcall ];
buildType = "builtin";
meta = {
homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz";
homepage = "https://github.com/neovim/lua-client/archive/0.2.0-1.tar.gz";
description = "Lua client to Nvim";
license = {
fullName = "Apache";
@ -795,21 +757,14 @@ nvim-client = buildLuarocksPackage {
};
busted = buildLuarocksPackage {
pname = "busted";
version = "2.0.rc13-0";
knownRockspec = (fetchurl {
url = https://luarocks.org/busted-2.0.rc13-0.rockspec;
sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5";
}).outPath;
version = "2.0.rc12-1";
src = fetchurl {
url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz;
sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl";
url = http://luarocks.org/manifests/teto/busted-2.0.rc12-1.src.rock;
sha256 = "18fzdc7ww4nxwinnw9ah5hi329ghrf0h8xrwcy26lk9qcs9n079z";
};
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ];
buildType = "builtin";
meta = {
homepage = "http://olivinelabs.com/busted/";
@ -835,7 +790,6 @@ luassert = buildLuarocksPackage {
disabled = (luaOlder "5.1");
propagatedBuildInputs = [ lua say ];
buildType = "builtin";
meta = {
homepage = "http://olivinelabs.com/busted/";
@ -854,8 +808,6 @@ coxpcall = buildLuarocksPackage {
sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi";
};
buildType = "builtin";
meta = {
homepage = "http://keplerproject.github.io/coxpcall";
description = "Coroutine safe xpcall and pcall";

4
pkgs/development/tools/misc/luarocks/luarocks-nix.nix
View File

@ -4,7 +4,7 @@ luarocks.overrideAttrs(old: {
src = fetchFromGitHub {
owner = "teto";
repo = "luarocks";
rev = "ca52159dcb544161e5bef1e4e366f3da31fa4555";
sha256 = "13g7vpyirq51qmmnjsqhhiia9wdnq9aw4da0n3r7l1ar95q168sn";
rev = "595456f1246d66e5bdce0de838d0d6188274991c";
sha256 = "14nn0n5a0m516lnbwljy85h7y98zwnfbcyz7hgsm6fn4p8316yz2";
};
})