GNU bug report logs - #48502
[PATCH 0/1] gnu: luakit: Update to 2.3.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 48502 in the body.
You can then email your comments to 48502 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Raphaël Mélotte <raphael.melotte <at> mind.be>
To: guix-patches <at> gnu.org
Cc: Raphaël Mélotte <raphael.melotte <at> mind.be>
Subject: [PATCH 0/1] gnu: luakit: Update to 2.3.
Date: Tue, 18 May 2021 18:47:10 +0200

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

Message #8 received at 48502 <at> debbugs.gnu.org (full text, mbox):

From: Raphaël Mélotte <raphael.melotte <at> mind.be>
To: 48502 <at> debbugs.gnu.org
Cc: Raphaël Mélotte <raphael.melotte <at> mind.be>
Subject: [PATCH] gnu: luakit: Update to 2.3.
Date: Tue, 18 May 2021 18:49:40 +0200

* 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

Message #13 received at 48502-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Raphaël Mélotte <raphael.melotte <at> mind.be>
Cc: 48502-done <at> debbugs.gnu.org
Subject: Re: bug#48502: [PATCH 0/1] gnu: luakit: Update to 2.3.
Date: Sat, 22 May 2021 23:37:06 +0200

Hi,

Raphaël Mélotte <raphael.melotte <at> 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’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.