[PATCH] gnu: Add luarocks.

  • Done
  • quality assurance status badge
Details
3 participants
  • Andrew Tropin
  • Timo Wilken
  • Ludovic Courtès
Owner
unassigned
Submitted by
Timo Wilken
Severity
normal
T
T
Timo Wilken wrote on 24 Feb 2023 23:46
(address . guix-patches@gnu.org)(name . Timo Wilken)(address . guix@twilken.net)
20230224224613.25630-1-guix@twilken.net
Luarocks is a package manager for Lua modules.

It is used by the Prosody XMPP server (already packaged in Guix) to
install extensions.

* gnu/packages/lua.scm (luarocks): Add variable.
---
gnu/packages/lua.scm | 50 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)

Toggle diff (77 lines)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index d50890bf1e..3d18e18ca9 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -18,6 +18,7 @@
;;; Copyright © 2022 Brandon Lucas <br@ndon.dk>
;;; Copyright © 2022 Luis Henrique Gomes Higino <luishenriquegh2701@gmail.com>
;;; Copyright © 2022 Leo Nikkilä <hello@lnikki.la>
+;;; Copyright © 2023 Timo Wilken <guix@twilken.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -49,6 +50,7 @@ (define-module (gnu packages lua)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages build-tools)
+ #:use-module (gnu packages compression)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libevent)
@@ -1126,6 +1128,54 @@ (define-public lua-resty-shell
shell command executions.")
(license license:bsd-3)))
+(define-public luarocks
+ (package
+ (name "luarocks")
+ (version "3.9.2")
+ (home-page "https://luarocks.org/")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "https://luarocks.org/releases/luarocks-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1nsfp7cwqcxa8vmkcqkgi5wc0iax0j3gbdfd183kw81cq3nf99mw"))))
+ (build-system gnu-build-system)
+ (arguments
+ '(#:tests? #f ;upstream has no tests
+ #:phases (modify-phases %standard-phases
+ (add-before 'build 'patch-bin-sh
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* '("GNUmakefile" "src/luarocks/fs/unix.lua"
+ "src/luarocks/core/sysdetect.lua")
+ (("/bin/sh")
+ (string-append (assoc-ref inputs "bash-minimal")
+ "/bin/sh")))))
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (invoke "./configure"
+ (string-append "--prefix=" out))))))))
+ (inputs (list lua bash-minimal))
+ (native-inputs (list unzip))
+ (synopsis "A package manager for Lua modules")
+ (description
+ "LuaRocks is the package manager for the Lua programming
+language.
+
+It allows you to install Lua modules as self-contained packages called
+@url{https://luarocks.org/en/Types_of_rocks, @emph{rocks}}, which also contain
+version @url{https://luarocks.org/en/Dependencies, dependency} information.
+This information can be used both during installation, so that when one rock
+is requested all rocks it depends on are installed as well, and also
+optionally at run time, so that when a module is required, the correct version
+is loaded. LuaRocks supports both local and
+@url{http://luarocks.org/en/Rocks_repositories, remote} repositories, and
+multiple local rocks trees.")
+ ;; The home page says:
+ ;; "LuaRocks is free software and uses the same license as Lua."
+ (license license:x11)))
+
(define-public emilua
(package
(name "emilua")
--
2.39.1
T
T
Timo Wilken wrote on 26 Feb 2023 17:08
[PATCH] gnu: luarocks: Add for Lua 5.2 and fix dependencies.
(address . 61774@debbugs.gnu.org)(name . Timo Wilken)(address . guix@twilken.net)
20230226160817.12138-1-guix@twilken.net
Luarocks requires some external binaries, which should be set in its
config file instead of relying on the calling user's PATH containing
them.

Also, for use with Prosody, luarocks needs to be built against Lua
5.2, so provide multiple versions of the package, like for other Lua
packages.

* gnu/packages/lua.scm (make-luarocks): New function.
* gnu/packages/lua.scm (lua5.2-luarocks): New variable.
---
gnu/packages/lua.scm | 94 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 78 insertions(+), 16 deletions(-)

Toggle diff (137 lines)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 3d18e18ca9..4771fa1d42 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -47,11 +47,15 @@ (define-module (gnu packages lua)
#:use-module (guix build-system meson)
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
+ #:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages curl)
#:use-module (gnu packages build-tools)
#:use-module (gnu packages compression)
+ #:use-module (gnu packages gcc)
#:use-module (gnu packages glib)
+ #:use-module (gnu packages gnupg)
#:use-module (gnu packages gtk)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
@@ -61,11 +65,15 @@ (define-module (gnu packages lua)
#:use-module (gnu packages pretty-print)
#:use-module (gnu packages re2c)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages rsync)
+ #:use-module (gnu packages ssh)
#:use-module (gnu packages tls)
+ #:use-module (gnu packages version-control)
#:use-module (gnu packages vim)
+ #:use-module (gnu packages wget)
#:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
- #:use-module (srfi srfi-1))
+ #:use-module ((srfi srfi-1) #:hide (zip)))
(define-public lua
(package
@@ -1142,21 +1150,69 @@ (define-public luarocks
"1nsfp7cwqcxa8vmkcqkgi5wc0iax0j3gbdfd183kw81cq3nf99mw"))))
(build-system gnu-build-system)
(arguments
- '(#:tests? #f ;upstream has no tests
- #:phases (modify-phases %standard-phases
- (add-before 'build 'patch-bin-sh
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* '("GNUmakefile" "src/luarocks/fs/unix.lua"
- "src/luarocks/core/sysdetect.lua")
- (("/bin/sh")
- (string-append (assoc-ref inputs "bash-minimal")
- "/bin/sh")))))
- (replace 'configure
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (invoke "./configure"
- (string-append "--prefix=" out))))))))
- (inputs (list lua bash-minimal))
+ `(#:tests? #f ;upstream has no tests
+ #:phases
+ (modify-phases %standard-phases
+ (add-before 'build 'patch-bin-sh
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* '("GNUmakefile" "src/luarocks/fs/unix.lua"
+ "src/luarocks/core/sysdetect.lua")
+ (("/bin/sh")
+ (string-append (assoc-ref inputs "bash-minimal")
+ "/bin/sh")))))
+ (replace 'configure
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (invoke "./configure"
+ (string-append "--prefix=" out)))))
+ (add-after 'install 'patch-unzip
+ (lambda* (#:key inputs outputs #:allow-other-keys)
+ (substitute*
+ (string-append
+ (assoc-ref outputs "out") "/etc/luarocks/config-"
+ ,(substring (package-version lua) 0 3) ".lua") ;e.g. "5.2"
+ (("variables = \\{")
+ (string-append
+ "variables = {\n"
+ " AR = \"" (assoc-ref inputs "binutils") "/bin/ar\";\n"
+ " BUNZIP2 = \"" (assoc-ref inputs "bzip2") "/bin/bunzip2\";\n"
+ " CC = \"" (assoc-ref inputs "gcc") "/bin/gcc\";\n"
+ " CHMOD = \"" (assoc-ref inputs "coreutils") "/bin/chmod\";\n"
+ " CMAKE = \"" (assoc-ref inputs "coreutils") "/bin/cmake\";\n"
+ " CP = \"" (assoc-ref inputs "coreutils") "/bin/cp\";\n"
+ " CURL = \"" (assoc-ref inputs "curl") "/bin/curl\";\n"
+ " CVS = \"" (assoc-ref inputs "cvs") "/bin/cvs\";\n"
+ " FIND = \"" (assoc-ref inputs "findutils") "/bin/find\";\n"
+ " GIT = \"" (assoc-ref inputs "git") "/bin/git\";\n"
+ " GPG = \"" (assoc-ref inputs "gnupg") "/bin/gpg\";\n"
+ " GUNZIP = \"" (assoc-ref inputs "gzip") "/bin/gunzip\";\n"
+ " HG = \"" (assoc-ref inputs "mercurial") "/bin/hg\";\n"
+ " LD = \"" (assoc-ref inputs "binutils") "/bin/ld\";\n"
+ " LS = \"" (assoc-ref inputs "coreutils") "/bin/ls\";\n"
+ " MAKE = \"" (assoc-ref inputs "make") "/bin/make\";\n"
+ " MD5SUM = \"" (assoc-ref inputs "coreutils") "/bin/md5sum\";\n"
+ " MKDIR = \"" (assoc-ref inputs "coreutils") "/bin/mkdir\";\n"
+ " MKTEMP = \"" (assoc-ref inputs "coreutils") "/bin/mktemp\";\n"
+ " OPENSSL = \"" (assoc-ref inputs "openssl") "/bin/openssl\";\n"
+ " PWD = \"" (assoc-ref inputs "coreutils") "/bin/pwd\";\n"
+ " RANLIB = \"" (assoc-ref inputs "binutils") "/bin/ranlib\";\n"
+ " RM = \"" (assoc-ref inputs "coreutils") "/bin/rm\";\n"
+ " RMDIR = \"" (assoc-ref inputs "coreutils") "/bin/rmdir\";\n"
+ " RSYNC = \"" (assoc-ref inputs "rsync") "/bin/rsync\";\n"
+ " SCP = \"" (assoc-ref inputs "openssh") "/bin/scp\";\n"
+ " SEVENZ = \"" (assoc-ref inputs "p7zip") "/bin/7z\";\n"
+ " SVN = \"" (assoc-ref inputs "subversion") "/bin/svn\";\n"
+ " TAR = \"" (assoc-ref inputs "tar") "/bin/tar\";\n"
+ " TEST = \"" (assoc-ref inputs "coreutils") "/bin/test\";\n"
+ " TOUCH = \"" (assoc-ref inputs "coreutils") "/bin/touch\";\n"
+ " UNZIP = \"" (assoc-ref inputs "unzip") "/bin/unzip -n\";\n"
+ " WGET = \"" (assoc-ref inputs "wget") "/bin/wget\";\n"
+ " ZIP = \"" (assoc-ref inputs "zip") "/bin/zip\";"))))))))
+ (inputs (list lua bash-minimal
+ ;; Executables required by luarocks.
+ binutils bzip2 coreutils curl cvs findutils gcc git gnupg
+ gzip gnu-make mercurial openssh openssl p7zip rsync
+ subversion tar unzip wget zip))
(native-inputs (list unzip))
(synopsis "A package manager for Lua modules")
(description
@@ -1176,6 +1232,12 @@ (define-public luarocks
;; "LuaRocks is free software and uses the same license as Lua."
(license license:x11)))
+(define-public lua5.2-luarocks
+ (make-luarocks "lua5.2-luarocks" lua-5.2))
+
+(define-public luarocks
+ (make-luarocks "luarocks" lua))
+
(define-public emilua
(package
(name "emilua")
--
2.39.1
L
L
Ludovic Courtès wrote on 30 Mar 2023 23:14
Re: bug#61774: [PATCH] gnu: Add luarocks.
(name . Timo Wilken)(address . guix@twilken.net)(address . 61774@debbugs.gnu.org)
87wn2ygcvq.fsf@gnu.org
Hi,

Timo Wilken <guix@twilken.net> skribis:

Toggle quote (7 lines)
> Luarocks is a package manager for Lua modules.
>
> It is used by the Prosody XMPP server (already packaged in Guix) to
> install extensions.
>
> * gnu/packages/lua.scm (luarocks): Add variable.

Could resend the two patches merged as one?

Some comments:

Toggle quote (6 lines)
> + (substitute* '("GNUmakefile" "src/luarocks/fs/unix.lua"
> + "src/luarocks/core/sysdetect.lua")
> + (("/bin/sh")
> + (string-append (assoc-ref inputs "bash-minimal")
> + "/bin/sh")))))

Rather (search-input-file inputs "/bin/sh").

Toggle quote (2 lines)
> + (synopsis "A package manager for Lua modules")

I believe ‘guix lint’ will tel you to remove “A”. :-)

Toggle quote (4 lines)
> + ;; The home page says:
> + ;; "LuaRocks is free software and uses the same license as Lua."
> + (license license:x11)))

Please double-check the license in the source (and remove the comment).

Toggle quote (15 lines)
> + (add-after 'install 'patch-unzip
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (substitute*
> + (string-append
> + (assoc-ref outputs "out") "/etc/luarocks/config-"
> + ,(substring (package-version lua) 0 3) ".lua") ;e.g. "5.2"
> + (("variables = \\{")
> + (string-append
> + "variables = {\n"
> + " AR = \"" (assoc-ref inputs "binutils") "/bin/ar\";\n"
> + " BUNZIP2 = \"" (assoc-ref inputs "bzip2") "/bin/bunzip2\";\n"
> + " CC = \"" (assoc-ref inputs "gcc") "/bin/gcc\";\n"
> + " CHMOD = \"" (assoc-ref inputs "coreutils") "/bin/chmod\";\n"
> + " CMAKE = \"" (assoc-ref inputs "coreutils") "/bin/cmake\";\n"

These should all use ‘search-input-file’. However…

Toggle quote (7 lines)
> + " CP = \"" (assoc-ref inputs "coreutils") "/bin/cp\";\n"
> + " CURL = \"" (assoc-ref inputs "curl") "/bin/curl\";\n"
> + " CVS = \"" (assoc-ref inputs "cvs") "/bin/cvs\";\n"
> + " FIND = \"" (assoc-ref inputs "findutils") "/bin/find\";\n"
> + " GIT = \"" (assoc-ref inputs "git") "/bin/git\";\n"
> + " GPG = \"" (assoc-ref inputs "gnupg") "/bin/gpg\";\n"

[...]

Toggle quote (6 lines)
> + " RSYNC = \"" (assoc-ref inputs "rsync") "/bin/rsync\";\n"
> + " SCP = \"" (assoc-ref inputs "openssh") "/bin/scp\";\n"
> + " SEVENZ = \"" (assoc-ref inputs "p7zip") "/bin/7z\";\n"
> + " SVN = \"" (assoc-ref inputs "subversion") "/bin/svn\";\n"
> + " TAR = \"" (assoc-ref inputs "tar") "/bin/tar\";\n"

Does it really need all these things? What does ‘guix size luarocks’
say now?

Maybe it’s OK to assume that some of the rarely-used dependencies (say,
CVS, SVN, 7zip) will be picked from $PATH and that it will fail
otherwise? That would help keep the closure size under control.

Toggle quote (6 lines)
> + (inputs (list lua bash-minimal
> + ;; Executables required by luarocks.
> + binutils bzip2 coreutils curl cvs findutils gcc git gnupg
> + gzip gnu-make mercurial openssh openssl p7zip rsync
> + subversion tar unzip wget zip))

Please one per line since there are many of them (you can run ‘guix
style luarocks’).

Could you send an updated patch?

Thanks!

Ludo’.
L
L
Ludovic Courtès wrote on 8 Aug 2023 17:33
control message for bug #61774
(address . control@debbugs.gnu.org)
871qgdr1kc.fsf@gnu.org
tags 61774 + moreinfo
quit
A
A
Andrew Tropin wrote on 26 May 13:26 +0200
Re: [bug#61774] [PATCH] gnu: Add luarocks.
(address . 61774-done@debbugs.gnu.org)
87ttikq0ek.fsf@trop.in
On 2023-03-30 23:14, Ludovic Courtès wrote:

Toggle quote (85 lines)
> Hi,
>
> Timo Wilken <guix@twilken.net> skribis:
>
>> Luarocks is a package manager for Lua modules.
>>
>> It is used by the Prosody XMPP server (already packaged in Guix) to
>> install extensions.
>>
>> * gnu/packages/lua.scm (luarocks): Add variable.
>
> Could resend the two patches merged as one?
>
> Some comments:
>
>> + (substitute* '("GNUmakefile" "src/luarocks/fs/unix.lua"
>> + "src/luarocks/core/sysdetect.lua")
>> + (("/bin/sh")
>> + (string-append (assoc-ref inputs "bash-minimal")
>> + "/bin/sh")))))
>
> Rather (search-input-file inputs "/bin/sh").
>
>> + (synopsis "A package manager for Lua modules")
>
> I believe ‘guix lint’ will tel you to remove “A”. :-)
>
>> + ;; The home page says:
>> + ;; "LuaRocks is free software and uses the same license as Lua."
>> + (license license:x11)))
>
> Please double-check the license in the source (and remove the comment).
>
>> + (add-after 'install 'patch-unzip
>> + (lambda* (#:key inputs outputs #:allow-other-keys)
>> + (substitute*
>> + (string-append
>> + (assoc-ref outputs "out") "/etc/luarocks/config-"
>> + ,(substring (package-version lua) 0 3) ".lua") ;e.g. "5.2"
>> + (("variables = \\{")
>> + (string-append
>> + "variables = {\n"
>> + " AR = \"" (assoc-ref inputs "binutils") "/bin/ar\";\n"
>> + " BUNZIP2 = \"" (assoc-ref inputs "bzip2") "/bin/bunzip2\";\n"
>> + " CC = \"" (assoc-ref inputs "gcc") "/bin/gcc\";\n"
>> + " CHMOD = \"" (assoc-ref inputs "coreutils") "/bin/chmod\";\n"
>> + " CMAKE = \"" (assoc-ref inputs "coreutils") "/bin/cmake\";\n"
>
> These should all use ‘search-input-file’. However…
>
>> + " CP = \"" (assoc-ref inputs "coreutils") "/bin/cp\";\n"
>> + " CURL = \"" (assoc-ref inputs "curl") "/bin/curl\";\n"
>> + " CVS = \"" (assoc-ref inputs "cvs") "/bin/cvs\";\n"
>> + " FIND = \"" (assoc-ref inputs "findutils") "/bin/find\";\n"
>> + " GIT = \"" (assoc-ref inputs "git") "/bin/git\";\n"
>> + " GPG = \"" (assoc-ref inputs "gnupg") "/bin/gpg\";\n"
>
> [...]
>
>> + " RSYNC = \"" (assoc-ref inputs "rsync") "/bin/rsync\";\n"
>> + " SCP = \"" (assoc-ref inputs "openssh") "/bin/scp\";\n"
>> + " SEVENZ = \"" (assoc-ref inputs "p7zip") "/bin/7z\";\n"
>> + " SVN = \"" (assoc-ref inputs "subversion") "/bin/svn\";\n"
>> + " TAR = \"" (assoc-ref inputs "tar") "/bin/tar\";\n"
>
> Does it really need all these things? What does ‘guix size luarocks’
> say now?
>
> Maybe it’s OK to assume that some of the rarely-used dependencies (say,
> CVS, SVN, 7zip) will be picked from $PATH and that it will fail
> otherwise? That would help keep the closure size under control.
>
>> + (inputs (list lua bash-minimal
>> + ;; Executables required by luarocks.
>> + binutils bzip2 coreutils curl cvs findutils gcc git gnupg
>> + gzip gnu-make mercurial openssh openssl p7zip rsync
>> + subversion tar unzip wget zip))
>
> Please one per line since there are many of them (you can run ‘guix
> style luarocks’).
>
> Could you send an updated patch?
>
> Thanks!

Addressed all the comments, pushed as

--
Best regards,
Andrew Tropin
-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEKEGaxlA4dEDH6S/6IgjSCVjB3rAFAmZTHHMACgkQIgjSCVjB
3rB68g/+LpvhOCTMINTHwRej2FPihXpEBo+oDn/C5Ly17RbInqInPAAyuGPs2Ptu
VEt3RxrrN+WqjFc1fo+JIndqaP3Aa6gPkEfMqMS1bah6hrOTShavFD24D1O+Ppic
9SE+p9lLSAEXfb1bCJKTnIHHFjR3AXLY2l4txf8GIpYgLhZmYwPKGLzKCfk90oCd
EjSABlHYUgl9Lny4DgeSNWXdH9uBcI+Yj1QBPkNw4Rk+VdTuWIZZ7DVIbPlLQqrp
V4okREHAdgdBhyTMr02oLWnqpRalMK8UNUhSb8E8vZykT/MsBSJH4hC72lR2uALv
1w+ak+W1VRKFT97MQrWyO27MDKwhVg6lBeAuaIoTxv1h3TCsN2qTxsiV+O28Btsy
K/Xw+cXxpvH6pC07GKIMa5IbwEKarzOtC9q/t/MEItcbvSPEu5/UPJ2YzWhp8I7+
vwBV8GgvAztImcAokwkAle9VzaYg4C5Zg5SzbrB/n7D8gtnQpr9vnb/6d36xNH/S
H0wFUz3L3wytEd2qXWrh3POjti2Zl85Smk5Y25yRa2Wt9IHRfM+u4wWem6CEh2pX
QXsRAS76lKeeD7mzIvkmEFWrCnZrxDByZ2tb1Q+qUjGBncKQtaCvy1Rm2KxNTXyL
oLxGWFp73RHzf0RvXgdRINlw7P6LdQd04ckDpR0wjEiXnSfoNGE=
=2MpM
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 61774@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 61774
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch