* [bug#29437] [PATCH 1/2] gnu: lua-lpeg: Avoid code repetition.
@ 2017-11-25 15:02 Clément Lassieur
2017-11-26 16:28 ` Ludovic Courtès
0 siblings, 1 reply; 2+ messages in thread
From: Clément Lassieur @ 2017-11-25 15:02 UTC (permalink / raw)
To: 29437; +Cc: rekado
* gnu/packages/lua.scm (make-lua-lpeg): New procedure.
(lua-lpeg, lua5.2-lpeg): Call make-lua-lpeg.
---
gnu/packages/lua.scm | 30 ++++++------------------------
1 file changed, 6 insertions(+), 24 deletions(-)
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm
index 1667bad8d..d5f55b963 100644
--- a/gnu/packages/lua.scm
+++ b/gnu/packages/lua.scm
@@ -356,9 +356,9 @@ based libraries. It allows using GObject-based libraries directly from Lua.
Notable examples are GTK+, GStreamer and Webkit.")
(license license:expat)))
-(define-public lua-lpeg
+(define (make-lua-lpeg name lua)
(package
- (name "lua-lpeg")
+ (name name)
(version "1.0.1")
(source (origin
(method url-fetch)
@@ -390,29 +390,11 @@ Grammars (PEGs).")
(home-page "http://www.inf.puc-rio.br/~roberto/lpeg")
(license license:expat)))
+(define-public lua-lpeg
+ (make-lua-lpeg "lua-lpeg" lua))
+
(define-public lua5.2-lpeg
- (package (inherit lua-lpeg)
- (name "lua5.2-lpeg")
- ;; XXX: The arguments field is almost an exact copy of the field in
- ;; "lua-lpeg", except for the version string, which was derived from "lua"
- ;; and now is taken from "lua-5.2". See this discussion for context:
- ;; http://lists.gnu.org/archive/html/guix-devel/2017-01/msg02048.html
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (delete 'configure)
- ;; `make install` isn't available, so we have to do it manually
- (replace 'install
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (lua-version ,(version-major+minor (package-version lua-5.2))))
- (install-file "lpeg.so"
- (string-append out "/lib/lua/" lua-version))
- (install-file "re.lua"
- (string-append out "/share/lua/" lua-version))
- #t))))
- #:test-target "test"))
- (inputs `(("lua", lua-5.2)))))
+ (make-lua-lpeg "lua5.2-lpeg" lua-5.2))
;; Lua 5.3 is not supported.
(define (make-lua-bitop name lua)
--
2.15.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [bug#29437] [PATCH 1/2] gnu: lua-lpeg: Avoid code repetition.
2017-11-25 15:02 [bug#29437] [PATCH 1/2] gnu: lua-lpeg: Avoid code repetition Clément Lassieur
@ 2017-11-26 16:28 ` Ludovic Courtès
0 siblings, 0 replies; 2+ messages in thread
From: Ludovic Courtès @ 2017-11-26 16:28 UTC (permalink / raw)
To: Clément Lassieur; +Cc: 29437, rekado
Clément Lassieur <clement@lassieur.org> skribis:
> * gnu/packages/lua.scm (make-lua-lpeg): New procedure.
> (lua-lpeg, lua5.2-lpeg): Call make-lua-lpeg.
LGTM, thanks!
Ludo'.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-26 16:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-11-25 15:02 [bug#29437] [PATCH 1/2] gnu: lua-lpeg: Avoid code repetition Clément Lassieur
2017-11-26 16:28 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).