bug#26718: Update hexchat to 2.12.4

bug#26718: Update hexchat to 2.12.4

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 49 bytes --]

Hi,

here is a patch to update hexchat to 2.12.4.

[-- Attachment #2: 0001-gnu-hexchat-Update-to-2.12.4.patch --]
[-- Type: text/x-patch, Size: 2825 bytes --]

From 172532a4aec163e6be4df896ba7db35801bec6f1 Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sun, 30 Apr 2017 19:21:46 +0200
Subject: [PATCH] gnu: hexchat: Update to 2.12.4.

* gnu/packages/messaging.scm (hexchat): Update to 2.12.4.
---
 gnu/packages/messaging.scm | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 59e2b23d3..16a04d30e 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -166,17 +166,21 @@ identi.ca and status.net).")
 (define-public hexchat
   (package
     (name "hexchat")
-    (version "2.12.2")
+    (version "2.12.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd"))))
+                "0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs"))))
     (build-system gnu-build-system)
     (native-inputs `(("pkg-config" ,pkg-config)
-                     ("intltool" ,intltool)))
+                     ("intltool" ,intltool)
+                     ("autoconf" ,autoconf)
+                     ("autoconf-archive" ,autoconf-archive)
+                     ("automake" ,automake)
+                     ("libtool" ,libtool)))
     (inputs `(("dbus-glib" ,dbus-glib)
               ("dbus" ,dbus)
               ("enchant" ,enchant)
@@ -190,6 +194,22 @@ identi.ca and status.net).")
               ("luajit" ,luajit)
               ("perl-xml-parser" ,perl-xml-parser)
               ("python-2" ,python-2)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'autogen
+                    (lambda* (#:key inputs #:allow-other-keys)
+                      ;; these files are symlinks to /usr and cannot be used.
+                      (with-directory-excursion "m4"
+                        (for-each (lambda (f) (delete-file f))
+                                  '("intltool.m4" "libtool.m4" "lt~obsolete.m4"
+                                    "ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
+                      (delete-file-recursively "build-aux")
+                      (delete-file "po/Makefile.in.in")
+                      (copy-file (string-append (assoc-ref inputs "intltool")
+                                                "/share/intltool/Makefile.in.in")
+                                 "po/Makefile.in.in")
+                      (zero? (system* "autoreconf" "-fiv")))))))
     (synopsis "Graphical IRC Client")
     (description
      "HexChat lets you connect to multiple IRC networks at once.  The main
-- 
2.12.2

bug#26718: Update hexchat to 2.12.4

[Tobias Geerinckx-Rice]

[-- Attachment #1.1.1: Type: text/plain, Size: 2406 bytes --]

Julien,

On 30/04/17 19:22, Julien Lepiller wrote:
> Hi,
> 
> here is a patch to update hexchat to 2.12.4.

...great! I was just doing the exact same thing. :-D

> Subject: [PATCH] gnu: hexchat: Update to 2.12.4.
>
> * gnu/packages/messaging.scm (hexchat): Update to 2.12.4.

The commit message must also mention new native-inputs, phases, etc.

>   (native-inputs `(("pkg-config" ,pkg-config)
> -                   ("intltool" ,intltool)))
> +                   ("intltool" ,intltool)
> +                   ("autoconf" ,autoconf)
> +                   ("autoconf-archive" ,autoconf-archive)
> +                   ("automake" ,automake)
> +                   ("libtool" ,libtool)))

Even though these weren't sorted to begin with, it would be nice to do
so now.

> + (arguments
> +  `(#:phases
> +    (modify-phases %standard-phases
> +      (add-after 'unpack 'autogen

Nitpick: as the sources do contain an actual ‘autogen.sh’ — which we're
not calling — I'd just call this ‘bootstrap’ or so. Avoids confusion.

> +                 (lambda* (#:key inputs #:allow-other-keys)

It looks like something went wrong with the indentation of this block.
The ‘(’ of ‘(lambda’ should be under the first ‘d’ of ‘(add-after’.

> + ;; these files are symlinks to /usr and cannot be used.

Another nitpick: full-line comment, so ‘;; These’.

> + (with-directory-excursion "m4"
> +   (for-each (lambda (f) (delete-file f))
> +             '("intltool.m4" "libtool.m4" "lt~obsolete.m4"
> +               "ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
> + (delete-file-recursively "build-aux")
> + (delete-file "po/Makefile.in.in")

I'd move all of this to a separate snippet.
These files can cause pain when building manually, too.

> + (copy-file (string-append (assoc-ref inputs "intltool")
> +                           "/share/intltool/Makefile.in.in")
> +            "po/Makefile.in.in")

Ah, so this is what I was hunting down when your mail appeared.
Good catch!

I've taken the liberty to attach my patch[1] as well; it illustrates
some of the points mentioned above. Do with it what you will... :-)

Thanks!

T G-R

[1]: Audience question, somewhat: ‘guix lint’ complains that

  hexchat@2.12.4: 'glib:bin' should probably be a native input

If no-one disagrees I'll dig up why & add it in a follow-up.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1.2: 0001-gnu-hexchat-Update-to-2.12.4.patch --]
[-- Type: text/x-patch; name="0001-gnu-hexchat-Update-to-2.12.4.patch", Size: 3183 bytes --]

From b88935a8636c8c7258a9db172af9fe4706b06746 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Sun, 30 Apr 2017 19:58:09 +0200
Subject: [PATCH] gnu: hexchat: Update to 2.12.4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/messaging.scm (hexchat): Update to 2.12.4.
[source]: Remove incorrectly bootstrapped files.
[native-inputs]: Add autoconf, autoconf-archive, automake, libtool,
pkg-config.
[arguments]: Add ‘bootstrap’ phase.
---
 gnu/packages/messaging.scm | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 8a8dbd711..ee24e44e3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -166,16 +166,30 @@ identi.ca and status.net).")
 (define-public hexchat
   (package
     (name "hexchat")
-    (version "2.12.2")
+    (version "2.12.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd"))))
+                "0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Delete incorrectly bootstrapped bundled files.
+                  (for-each delete-file-recursively
+                            (list "build-aux" "po/Makefile.in.in"))
+                  ;; Delete dangling symlinks to a non-existent ‘/usr’.
+                  (for-each delete-file
+                            (find-files "m4" "^[^a].*\\.m4$"))
+                  #t))))
     (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("autoconf-archive" ,autoconf-archive)
+                     ("automake" ,automake)
+                     ("libtool" ,libtool)
+                     ("pkg-config" ,pkg-config)
                      ("intltool" ,intltool)))
     (inputs `(("dbus-glib" ,dbus-glib)
               ("dbus" ,dbus)
@@ -190,6 +204,16 @@ identi.ca and status.net).")
               ("luajit" ,luajit)
               ("perl-xml-parser" ,perl-xml-parser)
               ("python-2" ,python-2)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Release 2.12.4 wasn't properly bootstrapped.  Later ones might be!
+         (add-before 'configure 'bootstrap
+           (lambda* (#:key inputs #:allow-other-keys)
+             (copy-file (string-append (assoc-ref inputs "intltool")
+                                       "/share/intltool/Makefile.in.in")
+                        "po/Makefile.in.in")
+             (zero? (system* "autoreconf" "-vfi")))))))
     (synopsis "Graphical IRC Client")
     (description
      "HexChat lets you connect to multiple @dfn{Internet Relay Chat} (IRC)
-- 
2.11.0


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 504 bytes --]

bug#26718: Update hexchat to 2.12.4

[Julien Lepiller]

Le Sun, 30 Apr 2017 20:19:49 +0200,
Tobias Geerinckx-Rice <me@tobias.gr> a écrit :

> Julien,
> 
> [...]
> 
> > + (with-directory-excursion "m4"
> > +   (for-each (lambda (f) (delete-file f))
> > +             '("intltool.m4" "libtool.m4" "lt~obsolete.m4"
> > +               "ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
> > + (delete-file-recursively "build-aux")
> > + (delete-file "po/Makefile.in.in")  
> 
> I'd move all of this to a separate snippet.
> These files can cause pain when building manually, too.
What's the policy about using patches, snippet or build phases? I was
recently asked to move code from snippet to build phase because it did
not address a security issue or remove non free or bundled components,
but I can't find anything documenting the choice we should make.

bug#26718: Update hexchat to 2.12.4

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 1638 bytes --]

On Sun, Apr 30, 2017 at 09:35:44PM +0200, Julien Lepiller wrote:
> What's the policy about using patches, snippet or build phases? I was
> recently asked to move code from snippet to build phase because it did
> not address a security issue or remove non free or bundled components,
> but I can't find anything documenting the choice we should make.

I don't know if we have a real "policy"; here are my thoughts.

Guix is a useful tool for acquiring free software source code to be used
outside of Guix, with `guix build --source`. Origin snippets and patches
affect the result of `guix build --source`.

Snippets are necessary for removing non-free bits from what is provided
by `guix build --source`. Without this, I think we'd run afoul of the
free system distribution guidelines (FSDG).

Then there are changes we make in order to port software to Guix or make
other relatively unimportant changes. If they can be done with a
sed-like / regex substitution, we do them in build phases. It's helpful
to keep them in Scheme, and we don't want to distribute them via `guix
build --source`.

Patches are for things that are difficult / opaque to do with a sed-like
tool. They are applied to the result of `guix build --source`. I also
like using patches when copying changes from upstream; the provenance of
the change can be made clear in the patch annotation. For this reason,
most of the security updates I push use patches, even if they are
one-liners. Maybe these changes aren't always helpful for users of `guix
build --source`, but I try to limit them to important bug-fixes.

I'm curious to hear others' thoughts on this subject!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#26718: Update hexchat to 2.12.4

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 788 bytes --]

On 30/04/17 22:05, Leo Famulari wrote:
> Then there are changes we make in order to port software to Guix or make
> other relatively unimportant changes. If they can be done with a
> sed-like / regex substitution, we do them in build phases. It's helpful
> to keep them in Scheme, and we don't want to distribute them via `guix
> build --source`.

Ah, I never considered this as a Guix-related fix: shipping symlinks to
/usr might happen to work on some (?) other systems, but it's obviously
not how autotools should be used.

We should serve users with a --source tarball that is either already
bootstrapped or ready to be, not in some dead-end third state.

The correct answer in either case is, of course: ‘it's a silly detail,
Tobias’.

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 504 bytes --]

bug#26718: Update hexchat to 2.12.4

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 947 bytes --]

Le Sun, 30 Apr 2017 23:11:24 +0200,
Tobias Geerinckx-Rice <me@tobias.gr> a écrit :

> On 30/04/17 22:05, Leo Famulari wrote:
> > Then there are changes we make in order to port software to Guix or
> > make other relatively unimportant changes. If they can be done with
> > a sed-like / regex substitution, we do them in build phases. It's
> > helpful to keep them in Scheme, and we don't want to distribute
> > them via `guix build --source`.  
> 
> Ah, I never considered this as a Guix-related fix: shipping symlinks
> to /usr might happen to work on some (?) other systems, but it's
> obviously not how autotools should be used.
> 
> We should serve users with a --source tarball that is either already
> bootstrapped or ready to be, not in some dead-end third state.
> 
> The correct answer in either case is, of course: ‘it's a silly detail,
> Tobias’.
> 
> Kind regards,
> 
> T G-R
> 
Here's the updated patch.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-hexchat-Update-to-2.12.4.patch --]
[-- Type: text/x-patch, Size: 3620 bytes --]

From 1d631e557802e2392df5f744b22cbd8d732b31fa Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sun, 30 Apr 2017 19:21:46 +0200
Subject: [PATCH] gnu: hexchat: Update to 2.12.4.

* gnu/packages/messaging.scm (hexchat): Update to 2.12.4.
---
 gnu/packages/messaging.scm | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 59e2b23d3..5754fb2d3 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2014, 2017 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@@ -166,17 +166,35 @@ identi.ca and status.net).")
 (define-public hexchat
   (package
     (name "hexchat")
-    (version "2.12.2")
+    (version "2.12.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd"))))
+                "0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Delete dangling symlinks to a non-existent ‘/usr’.
+                  (with-directory-excursion "m4"
+                    (for-each (lambda (f) (delete-file f))
+                              '("intltool.m4" "libtool.m4" "lt~obsolete.m4"
+                                "ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
+                  (delete-file-recursively "build-aux")
+                  (delete-file "po/Makefile.in.in")
+                  ;; This file is still required for autoreconf.
+                  (copy-file (string-append (assoc-ref inputs "intltool")
+                                            "/share/intltool/Makefile.in.in")
+                             "po/Makefile.in.in")))))
     (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("intltool" ,intltool)))
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("autoconf-archive" ,autoconf-archive)
+                     ("automake" ,automake)
+                     ("intltool" ,intltool)
+                     ("libtool" ,libtool)
+                     ("pkg-config" ,pkg-config)))
     (inputs `(("dbus-glib" ,dbus-glib)
               ("dbus" ,dbus)
               ("enchant" ,enchant)
@@ -190,6 +208,13 @@ identi.ca and status.net).")
               ("luajit" ,luajit)
               ("perl-xml-parser" ,perl-xml-parser)
               ("python-2" ,python-2)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Release 2.12.4 wasn't properly bootstrapped.  Later ones might be!
+         (add-after 'unpack 'bootstrap
+           (lambda* (#:key inputs #:allow-other-keys)
+             (zero? (system* "autoreconf" "-fiv")))))))
     (synopsis "Graphical IRC Client")
     (description
      "HexChat lets you connect to multiple IRC networks at once.  The main
-- 
2.12.2

bug#26718: Update hexchat to 2.12.4

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 203 bytes --]

On Mon, May 01, 2017 at 09:52:36AM +0200, Julien Lepiller wrote:
> Subject: [PATCH] gnu: hexchat: Update to 2.12.4.
> 
> * gnu/packages/messaging.scm (hexchat): Update to 2.12.4.

LGTM, thank you!

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#26718: Update hexchat to 2.12.4

[Leo Famulari]

[-- Attachment #1: Type: text/plain, Size: 2594 bytes --]

On Fri, May 05, 2017 at 04:21:57PM -0400, Leo Famulari wrote:
> On Mon, May 01, 2017 at 09:52:36AM +0200, Julien Lepiller wrote:
> > Subject: [PATCH] gnu: hexchat: Update to 2.12.4.
> > 
> > * gnu/packages/messaging.scm (hexchat): Update to 2.12.4.
> 
> LGTM, thank you!

Sorry, I only checked it for style. It fails to build like this:

------
source is under 'hexchat-2.12.4'
;;; /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:1:2293: warning: possibly unbound variable `inputs'
Backtrace:
In ice-9/boot-9.scm:
 160: 14 [catch #t #<catch-closure 8c5b80> ...]
In unknown file:
   ?: 13 [apply-smob/1 #<catch-closure 8c5b80>]
In ice-9/boot-9.scm:
  66: 12 [call-with-prompt prompt0 ...]
In ice-9/eval.scm:
 432: 11 [eval # #]
In ice-9/boot-9.scm:
2412: 10 [save-module-excursion #<procedure 8e67c0 at ice-9/boot-9.scm:4084:3 ()>]
4089: 9 [#<procedure 8e67c0 at ice-9/boot-9.scm:4084:3 ()>]
1734: 8 [%start-stack load-stack #<procedure 8f69c0 at ice-9/boot-9.scm:4080:10 ()>]
1739: 7 [#<procedure 8f86c0 ()>]
In unknown file:
   ?: 6 [primitive-load "/gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder"]
In ice-9/eval.scm:
 399: 5 [eval # #]
In system/base/compile.scm:
 254: 4 [compile (begin # # # ...) #:from scheme ...]
 182: 3 [lp (#<procedure objcode->value (x e opts)>) #<objcode 8dd020> ...]
In ice-9/boot-9.scm:
2412: 2 [save-module-excursion #<procedure f924b0 at language/objcode/spec.scm:33:9 ()>]
In language/objcode/spec.scm:
  35: 1 [#<procedure f924b0 at language/objcode/spec.scm:33:9 ()>]
In /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:
   1: 0 [#<procedure f6fdc0 ()>]

/gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:1:2293: In procedure #<procedure f6fdc0 ()>:
/gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:1:2293: In procedure module-lookup: Unbound variable: inputs
builder for `/gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv' failed with exit code 1
@ build-failed /gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv - 1 builder for `/gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv' failed with exit code 1
cannot build derivation `/gnu/store/g6jrq9a0bj4za1yg0fcx9ni7nkwlm91r-hexchat-2.12.4.drv': 1 dependencies couldn't be built
guix build: error: build failed: build of `/gnu/store/g6jrq9a0bj4za1yg0fcx9ni7nkwlm91r-hexchat-2.12.4.drv' failed
------

So, I reverted it with commit 2f0ad2a4232549a3bbb43565fa3b82a6c85e59a8.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

bug#26718: Update hexchat to 2.12.4

[Julien Lepiller]

[-- Attachment #1: Type: text/plain, Size: 2891 bytes --]

Le Sat, 6 May 2017 15:55:18 -0400,
Leo Famulari <leo@famulari.name> a écrit :

> On Fri, May 05, 2017 at 04:21:57PM -0400, Leo Famulari wrote:
> > On Mon, May 01, 2017 at 09:52:36AM +0200, Julien Lepiller wrote:  
> > > Subject: [PATCH] gnu: hexchat: Update to 2.12.4.
> > > 
> > > * gnu/packages/messaging.scm (hexchat): Update to 2.12.4.  
> > 
> > LGTM, thank you!  
> 
> Sorry, I only checked it for style. It fails to build like this:
> 
> ------
> source is under 'hexchat-2.12.4'
> ;;; /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:1:2293:
> warning: possibly unbound variable `inputs' Backtrace:
> In ice-9/boot-9.scm:
>  160: 14 [catch #t #<catch-closure 8c5b80> ...]
> In unknown file:
>    ?: 13 [apply-smob/1 #<catch-closure 8c5b80>]
> In ice-9/boot-9.scm:
>   66: 12 [call-with-prompt prompt0 ...]
> In ice-9/eval.scm:
>  432: 11 [eval # #]
> In ice-9/boot-9.scm:
> 2412: 10 [save-module-excursion #<procedure 8e67c0 at
> ice-9/boot-9.scm:4084:3 ()>] 4089: 9 [#<procedure 8e67c0 at
> ice-9/boot-9.scm:4084:3 ()>] 1734: 8 [%start-stack load-stack
> #<procedure 8f69c0 at ice-9/boot-9.scm:4080:10 ()>] 1739: 7
> [#<procedure 8f86c0 ()>] In unknown file:
>    ?: 6 [primitive-load
> "/gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder"]
> In ice-9/eval.scm: 399: 5 [eval # #]
> In system/base/compile.scm:
>  254: 4 [compile (begin # # # ...) #:from scheme ...]
>  182: 3 [lp (#<procedure objcode->value (x e opts)>) #<objcode
> 8dd020> ...] In ice-9/boot-9.scm:
> 2412: 2 [save-module-excursion #<procedure f924b0 at
> language/objcode/spec.scm:33:9 ()>] In language/objcode/spec.scm:
>   35: 1 [#<procedure f924b0 at language/objcode/spec.scm:33:9 ()>]
> In /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:
>    1: 0 [#<procedure f6fdc0 ()>]
> 
> /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:1:2293:
> In procedure #<procedure f6fdc0
> ()>: /gnu/store/19lkrck1844idbcfq6ajzr0akmr8rshj-hexchat-2.12.4.tar.xz-builder:1:2293:
> In procedure module-lookup: Unbound variable: inputs builder for
> `/gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv'
> failed with exit code 1 @
> build-failed /gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv
> - 1 builder for
> `/gnu/store/gp1jrrhk8hd46ji2gciyjjpgxr9lhfxc-hexchat-2.12.4.tar.xz.drv'
> failed with exit code 1 cannot build derivation
> `/gnu/store/g6jrq9a0bj4za1yg0fcx9ni7nkwlm91r-hexchat-2.12.4.drv': 1
> dependencies couldn't be built guix build: error: build failed: build
> of `/gnu/store/g6jrq9a0bj4za1yg0fcx9ni7nkwlm91r-hexchat-2.12.4.drv'
> failed ------
> 
> So, I reverted it with commit
> 2f0ad2a4232549a3bbb43565fa3b82a6c85e59a8.

Indeed, I made a mistake here... So here is a patch that should work
(tested).


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-hexchat-Update-to-2.12.4.patch --]
[-- Type: text/x-patch, Size: 3866 bytes --]

From 5e001a92828dd998d5ed5c3b3a2772c1c15e303f Mon Sep 17 00:00:00 2001
From: Julien Lepiller <julien@lepiller.eu>
Date: Sun, 30 Apr 2017 19:21:46 +0200
Subject: [PATCH] gnu: hexchat: Update to 2.12.4.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/messaging.scm (hexchat): Update to 2.12.4.
[source]: Remove incorrectly bootstrapped files.
[native-inputs]: Add autoconf, autoconf-archive, automake, libtool,
pkg-config.
[arguments]: Add ‘bootstrap’ phase.
---
 gnu/packages/messaging.scm | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 9e45b7ad0..89df0970d 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1,6 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016 Mark H Weaver <mhw@netris.org>
-;;; Copyright © 2014 Julien Lepiller <julien@lepiller.eu>
+;;; Copyright © 2014, 2017 Julien Lepiller <julien@lepiller.eu>
 ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
 ;;; Copyright © 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
@@ -166,17 +166,31 @@ identi.ca and status.net).")
 (define-public hexchat
   (package
     (name "hexchat")
-    (version "2.12.2")
+    (version "2.12.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://dl.hexchat.net/hexchat/hexchat-"
                                   version ".tar.xz"))
               (sha256
                (base32
-                "1xnclfbrgbkqndxygi5f27q00jd7yy54jbd1061jmhxa6wzpibbd"))))
+                "0ficrx56knz5y297qb0x5y02339yvyv734z7kpcx1ixvb0qr2dgs"))
+              (modules '((guix build utils)))
+              (snippet
+               '(begin
+                  ;; Delete dangling symlinks to a non-existent ‘/usr’.
+                  (with-directory-excursion "m4"
+                    (for-each (lambda (f) (delete-file f))
+                              '("intltool.m4" "libtool.m4" "lt~obsolete.m4"
+                                "ltoptions.m4" "ltsugar.m4" "ltversion.m4")))
+                  (delete-file-recursively "build-aux")
+                  (delete-file "po/Makefile.in.in")))))
     (build-system gnu-build-system)
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("intltool" ,intltool)))
+    (native-inputs `(("autoconf" ,autoconf)
+                     ("autoconf-archive" ,autoconf-archive)
+                     ("automake" ,automake)
+                     ("intltool" ,intltool)
+                     ("libtool" ,libtool)
+                     ("pkg-config" ,pkg-config)))
     (inputs `(("dbus-glib" ,dbus-glib)
               ("dbus" ,dbus)
               ("enchant" ,enchant)
@@ -190,6 +204,17 @@ identi.ca and status.net).")
               ("luajit" ,luajit)
               ("perl-xml-parser" ,perl-xml-parser)
               ("python-2" ,python-2)))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         ;; Release 2.12.4 wasn't properly bootstrapped.  Later ones might be!
+         (add-after 'unpack 'bootstrap
+           (lambda* (#:key inputs #:allow-other-keys)
+             ;; This file is still required for autoreconf.
+             (copy-file (string-append (assoc-ref inputs "intltool")
+                                       "/share/intltool/Makefile.in.in")
+                        "po/Makefile.in.in")
+             (zero? (system* "autoreconf" "-fiv")))))))
     (synopsis "Graphical IRC Client")
     (description
      "HexChat lets you connect to multiple IRC networks at once.  The main
-- 
2.12.2

bug#26718: Update hexchat to 2.12.4

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 186 bytes --]

Julien,

On 06/05/17 23:08, Julien Lepiller wrote:
> Indeed, I made a mistake here... So here is a patch that should work
> (tested).

Pushed. Thanks!

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 504 bytes --]

bug#26718: (no subject)

[Julien Lepiller]

bug#26718: (no subject)

[Ludovic Courtès]

Hello Julien,

Please try to preserve the subject for clarity.  :-)

Ludo’.