diff --git a/srcpkgs/luarocks b/srcpkgs/luarocks new file mode 120000 index 0000000000..07fa8d2ec5 --- /dev/null +++ b/srcpkgs/luarocks @@ -0,0 +1 @@ +luarocks-lua53 \ No newline at end of file diff --git a/srcpkgs/luarocks-lua51 b/srcpkgs/luarocks-lua51 index 9c289adc71..07fa8d2ec5 120000 --- a/srcpkgs/luarocks-lua51 +++ b/srcpkgs/luarocks-lua51 @@ -1 +1 @@ -luarocks \ No newline at end of file +luarocks-lua53 \ No newline at end of file diff --git a/srcpkgs/luarocks-lua52 b/srcpkgs/luarocks-lua52 index 9c289adc71..07fa8d2ec5 120000 --- a/srcpkgs/luarocks-lua52 +++ b/srcpkgs/luarocks-lua52 @@ -1 +1 @@ -luarocks \ No newline at end of file +luarocks-lua53 \ No newline at end of file diff --git a/srcpkgs/luarocks/template b/srcpkgs/luarocks-lua53/template similarity index 71% rename from srcpkgs/luarocks/template rename to srcpkgs/luarocks-lua53/template index 4847a3b8b9..8979667e41 100644 --- a/srcpkgs/luarocks/template +++ b/srcpkgs/luarocks-lua53/template @@ -1,8 +1,9 @@ -# Template file for 'luarocks' -pkgname=luarocks +# Template file for 'luarocks-lua53' +pkgname=luarocks-lua53 version=3.3.1 -revision=1 +revision=2 archs=noarch +wrksrc=luarocks-${version} build_style=configure configure_args=" --prefix=/usr @@ -10,9 +11,10 @@ configure_args=" --lua-version=5.3 --with-lua-include=/usr/include/lua5.3 --versioned-rocks-dir" -hostmakedepends="lua-devel" -depends="lua curl unzip" -short_desc="Package management for Lua modules" +hostmakedepends="lua53-devel" +depends="lua53 curl unzip" +_desc="Package management for Lua modules" +short_desc="${_desc} (5.3.x)" maintainer="Duncaen " license="MIT" homepage="https://luarocks.org/" @@ -29,7 +31,7 @@ post_extract() { } post_build() { - for lv in 5.1 5.2; do + for lv in 5.1 5.2 5.4; do make LUA_VERSION=$lv LUA_INTERPRETER=lua$lv \ LUA_INCDIR=/usr/include/lua$lv ./build/config-$lv.lua done @@ -43,7 +45,7 @@ post_install() { vlicense COPYING vmkdir usr/bin - for lv in 5.1 5.2; do + for lv in 5.1 5.2 5.4; do make DESTDIR="${DESTDIR}" LUA_VERSION=$lv install-config make DESTDIR="${DESTDIR}" LUA_VERSION=$lv install-config @@ -60,9 +62,24 @@ post_install() { mv ${DESTDIR}/usr/bin/luarocks-admin{,-5.3} } +luarocks-lua54_package() { + archs=noarch + short_desc="${_desc} (5.4.x)" + depends="${sourcepkg}>=${version}_${revision} lua54" + conf_files="/etc/luarocks/config-5.4.lua" + alternatives=" + luarocks:luarocks:/usr/bin/luarocks-5.4 + luarocks:luarocks-admin:/usr/bin/luarocks-admin-5.4" + pkg_install() { + vmove usr/bin/luarocks-5.4 + vmove usr/bin/luarocks-admin-5.4 + vmove etc/luarocks/config-5.4.lua + } +} + luarocks-lua52_package() { archs=noarch - short_desc+=" - Lua52" + short_desc="${_desc} (5.2.x)" depends="${sourcepkg}>=${version}_${revision} lua52" conf_files="/etc/luarocks/config-5.2.lua" alternatives=" @@ -77,7 +94,7 @@ luarocks-lua52_package() { luarocks-lua51_package() { archs=noarch - short_desc+=" - Lua51" + short_desc="${_desc} (5.1.x)" depends="${sourcepkg}>=${version}_${revision} lua51" conf_files="/etc/luarocks/config-5.1.lua" alternatives=" @@ -89,3 +106,9 @@ luarocks-lua51_package() { vmove etc/luarocks/config-5.1.lua } } + +luarocks_package() { + depends="luarocks-lua53>=${version}_${revision}" + short_desc+="${_desc} (5.3.x) (transitional dummy package)" + build_style=meta +} diff --git a/srcpkgs/luarocks-lua54 b/srcpkgs/luarocks-lua54 new file mode 120000 index 0000000000..07fa8d2ec5 --- /dev/null +++ b/srcpkgs/luarocks-lua54 @@ -0,0 +1 @@ +luarocks-lua53 \ No newline at end of file