bug#44515: closed ([PATCH] gnu: xmlstarlet: Install symlink to xmlstarlet binary.)

[GNU bug Tracking System]

Your message dated Thu, 19 Nov 2020 20:03:13 +0000
with message-id <87zh3d867y.fsf@gmx.com>
and subject line Re: [bug#44515] [PATCH] gnu: xmlstarlet: Install symlink to 
xmlstarlet binary.
has caused the debbugs.gnu.org bug report #44515,
regarding [PATCH] gnu: xmlstarlet: Install symlink to xmlstarlet binary.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
44515: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=44515
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems

--- Begin Message --- Subject: [PATCH] gnu: xmlstarlet: Install symlink to xmlstarlet binary. Date: Sun, 08 Nov 2020 11:15:29 +0000 User-agent: mu4e 1.4.13; emacs 27.1

Hello Guix!

I recently encountered a small script incompatibility between Guix and
other distros (Arch, Fedora, Debian) because the `xml' binary is often
either moved or symlinked to `xmlstarlet'.

So here's a patch that adds the symlink, is that OK to commit?

Thanks,
Pierre

signature.asc
Description: PGP signature

>From a285bc89eb37a5aa56d444c195d9ef013a30aeec Mon Sep 17 00:00:00 2001
From: Pierre Langlois <pierre.langlois@gmx.com>
Date: Fri, 30 Oct 2020 11:57:35 +0000
Subject: [PATCH] gnu: xmlstarlet: Install symlink to xmlstarlet binary.

* gnu/packages/xml.scm (xmlstarlet)[arguments]: Add 'symlink-xmlstarlet
phase.
---
 gnu/packages/xml.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 97d42b2ae2..cd99cd4bcc 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2020 Paul Garlick <pgarlick@tourbillion-technology.com>
 ;;; Copyright © 2020 Edouard Klein <edk@beaver-labs.com>
 ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
+;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1260,7 +1261,14 @@ C++ programming language.")
            (substitute* "Makefile"
              (("^examples/schema1\\\\") "\\")
              (("^examples/valid1\\\\") "\\"))
-           #t)))))
+           #t))
+       (add-after 'install 'symlink-xmlstarlet
+         (lambda* (#:key outputs #:allow-other-keys)
+           (let* ((out (assoc-ref outputs "out"))
+                  (bin (string-append out "/bin")))
+             (symlink (string-append bin "/xml")
+                      (string-append bin "/xmlstarlet"))
+             #t))))))
    (inputs
     `(("libxslt" ,libxslt)
       ("libxml2" ,libxml2)))
-- 
2.29.2

--- End Message ---

--- Begin Message --- Subject: Re: [bug#44515] [PATCH] gnu: xmlstarlet: Install symlink to xmlstarlet binary. Date: Thu, 19 Nov 2020 20:03:13 +0000 User-agent: mu4e 1.4.13; emacs 27.1

Hi Ludo'

Ludovic Courtès writes:

> Hi,
>
> Pierre Langlois <pierre.langlois@gmx.com> skribis:
>
>> I recently encountered a small script incompatibility between Guix and
>> other distros (Arch, Fedora, Debian) because the `xml' binary is often
>> either moved or symlinked to `xmlstarlet'.
>>
>> So here's a patch that adds the symlink, is that OK to commit?
>
> Sure!  Maybe add a comment above stating that several other distros do
> that.
>
>>>From a285bc89eb37a5aa56d444c195d9ef013a30aeec Mon Sep 17 00:00:00 2001
>> From: Pierre Langlois <pierre.langlois@gmx.com>
>> Date: Fri, 30 Oct 2020 11:57:35 +0000
>> Subject: [PATCH] gnu: xmlstarlet: Install symlink to xmlstarlet binary.
>>
>> * gnu/packages/xml.scm (xmlstarlet)[arguments]: Add 'symlink-xmlstarlet
>> phase.
>
> [...]
>
>> +       (add-after 'install 'symlink-xmlstarlet
>> +         (lambda* (#:key outputs #:allow-other-keys)
>> +           (let* ((out (assoc-ref outputs "out"))
>> +                  (bin (string-append out "/bin")))
>> +             (symlink (string-append bin "/xml")
>                          ^
> "xml" is enough.

Oh cool, thanks for the review! Pushed with
b04198a1477f9d685d674a1dcc81b79b530fc409.

Thanks,
Pierre

signature.asc
Description: PGP signature

--- End Message ---