* [bug#48502] [PATCH 0/1] gnu: luakit: Update to 2.3.
@ 2021-05-18 16:47 Raphaël Mélotte
2021-05-18 16:49 ` [bug#48502] [PATCH] " Raphaël Mélotte
0 siblings, 1 reply; 3+ messages in thread
From: Raphaël Mélotte @ 2021-05-18 16:47 UTC (permalink / raw)
To: 48502; +Cc: Raphaël Mélotte
Hello,
While updating luakit to 2.3 I noticed the version wasn't detected properly at
built-time (it's supposed to either use git-describe or a version embedded in
the release tarball).
Since we build from the git repository, I added a phase to set the version to
manually.
Raphaël Mélotte (1):
gnu: luakit: Update to 2.3.
gnu/packages/web-browsers.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
--
2.31.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [bug#48502] [PATCH] gnu: luakit: Update to 2.3.
2021-05-18 16:47 [bug#48502] [PATCH 0/1] gnu: luakit: Update to 2.3 Raphaël Mélotte
@ 2021-05-18 16:49 ` Raphaël Mélotte
2021-05-22 21:37 ` bug#48502: [PATCH 0/1] " Ludovic Courtès
0 siblings, 1 reply; 3+ messages in thread
From: Raphaël Mélotte @ 2021-05-18 16:49 UTC (permalink / raw)
To: 48502; +Cc: Raphaël Mélotte
* gnu/packages/web-browsers.scm (luakit): Update to 2.3
[arguments]: Add 'set-version' phase.
---
gnu/packages/web-browsers.scm | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 6b6ca78960..0546ab1caf 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -231,7 +231,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
(define-public luakit
(package
(name "luakit")
- (version "2.2")
+ (version "2.3")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -240,7 +240,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
(file-name (git-file-name name version))
(sha256
(base32
- "0km5nxn6innzn8pfsvlkxvfj2z5g46fp6dy5bnmaklbn13mqlcrn"))))
+ "1khbn7dpizkznnwkw7rcfhf72dnd1nazk7dwb4rkh9i97b53mf1y"))))
(inputs
`(("lua-5.1" ,lua-5.1)
("gtk+" ,gtk+)
@@ -254,7 +254,7 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
`(("pkg-config" ,pkg-config)))
(build-system glib-or-gtk-build-system)
(arguments
- '(#:make-flags
+ `(#:make-flags
(let ((out (assoc-ref %outputs "out")))
(list
"CC=gcc"
@@ -271,6 +271,10 @@ features including, tables, builtin image display, bookmarks, SSL and more.")
(assoc-ref %build-inputs "lua5.1-filesystem")
"/lib/lua/5.1/?.so;;"))
#t))
+ (add-before 'build 'set-version
+ (lambda _
+ (setenv "VERSION_FROM_GIT" ,(package-version luakit))
+ #t))
(delete 'configure)
(delete 'check)
(add-after 'install 'wrap
--
2.31.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#48502: [PATCH 0/1] gnu: luakit: Update to 2.3.
2021-05-18 16:49 ` [bug#48502] [PATCH] " Raphaël Mélotte
@ 2021-05-22 21:37 ` Ludovic Courtès
0 siblings, 0 replies; 3+ messages in thread
From: Ludovic Courtès @ 2021-05-22 21:37 UTC (permalink / raw)
To: Raphaël Mélotte; +Cc: 48502-done
Hi,
Raphaël Mélotte <raphael.melotte@mind.be> skribis:
> * gnu/packages/web-browsers.scm (luakit): Update to 2.3
> [arguments]: Add 'set-version' phase.
[...]
> + (add-before 'build 'set-version
> + (lambda _
> + (setenv "VERSION_FROM_GIT" ,(package-version luakit))
I changed this to (package-version this-package), which works also when
inheriting from the package, and applied.
Thanks!
Ludo’.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-22 21:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-18 16:47 [bug#48502] [PATCH 0/1] gnu: luakit: Update to 2.3 Raphaël Mélotte
2021-05-18 16:49 ` [bug#48502] [PATCH] " Raphaël Mélotte
2021-05-22 21:37 ` bug#48502: [PATCH 0/1] " 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).