GNU bug report logs - #72560
[PATCH] gnu: ejabberd: Add inputs and wrap-program phase.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Andrew Tropin <andrew <at> trop.in>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#72560: closed ([PATCH] gnu: ejabberd: Add inputs and
 wrap-program phase.)
Date: Thu, 05 Sep 2024 06:17:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Thu, 05 Sep 2024 10:15:03 +0400
with message-id <87a5gmpqxk.fsf <at> trop.in>
and subject line Re: [bug#72560] [PATCH v2] gnu: ejabberd: Add inputs and wrap-program phase.
has caused the debbugs.gnu.org bug report #72560,
regarding [PATCH] gnu: ejabberd: Add inputs and wrap-program phase.
to be marked as done.

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


-- 
72560: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=72560
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Igor Goryachev <igor <at> goryachev.org>
To: guix-patches <at> gnu.org
Cc: Igor Goryachev <igor <at> goryachev.org>, Andrew Tropin <andrew <at> trop.in>
Subject: [PATCH] gnu: ejabberd: Add inputs and wrap-program phase.
Date: Sat, 10 Aug 2024 15:45:01 +0300

* gnu/packages/messaging.scm (ejabberd): Add inputs and wrap-program phase.

Change-Id: Id8177c54437dca9b98bbd6a237b9a713bc904c84
---
 gnu/packages/messaging.scm | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index da04c34636..efcd0167f1 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -3645,6 +3645,7 @@ (define-public ejabberd
        (sha256
         (base32 "0d5i9skgfjzs2100k0g99sigc2w61480ysz3va6pmb4nx43100g3"))))
     (build-system rebar-build-system)
+    (inputs (list coreutils procps sed))
     (native-inputs
      (list autoconf
            automake
@@ -3757,7 +3758,18 @@ (define-public ejabberd
                                 (string-append erts "/bin")))
                 (chmod (string-append ejabberd
                                       "/bin/install_upgrade.escript") #o755)
-                (copy-recursively ejabberd #$output)))))))
+                (copy-recursively ejabberd #$output))))
+          (add-after 'install 'wrap-program
+            (lambda* (#:key inputs outputs #:allow-other-keys)
+              (let ((out (assoc-ref outputs "out")))
+                (wrap-program (string-append out "/bin/ejabberdctl")
+                  `("PATH" ":" suffix
+                    ,(map (lambda (command)
+                            (dirname
+                             (search-input-file
+                              inputs (string-append "bin/" command))))
+                          (list "date" "dirname" "grep"
+                                "id" "pgrep" "sed"))))))))))
     (synopsis "Robust, Ubiquitous and Massively Scalable Messaging Platform")
     (description "This package provides Ejabberd -- Robust, Ubiquitous and
 Massively Scalable Messaging Platform.  It supports XMPP, MQTT and SIP

base-commit: bc71034f789603349080c2f35570910c07d526ec
-- 
2.45.2

[Message part 3 (message/rfc822, inline)]

From: Andrew Tropin <andrew <at> trop.in>
To: Igor Goryachev via Guix-patches via <guix-patches <at> gnu.org>,
 72560-done <at> debbugs.gnu.org
Cc: Igor Goryachev <igor <at> goryachev.org>
Subject: Re: [bug#72560] [PATCH v2] gnu: ejabberd: Add inputs and
 wrap-program phase.
Date: Thu, 05 Sep 2024 10:15:03 +0400

[Message part 4 (text/plain, inline)]

On 2024-08-22 13:21, Igor Goryachev via Guix-patches via wrote:

> * gnu/packages/messaging.scm (ejabberd): Add inputs and wrap-program phase.
>
> Change-Id: Id8177c54437dca9b98bbd6a237b9a713bc904c84
> ---
>  gnu/packages/messaging.scm | 14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
> index 8509b0c71a..8ea56c5eb8 100644
> --- a/gnu/packages/messaging.scm
> +++ b/gnu/packages/messaging.scm
> @@ -3647,6 +3647,7 @@ (define-public ejabberd
>         (sha256
>          (base32 "0d5i9skgfjzs2100k0g99sigc2w61480ysz3va6pmb4nx43100g3"))))
>      (build-system rebar-build-system)
> +    (inputs (list bash-minimal coreutils procps sed))
>      (native-inputs
>       (list autoconf
>             automake
> @@ -3759,7 +3760,18 @@ (define-public ejabberd
>                                  (string-append erts "/bin")))
>                  (chmod (string-append ejabberd
>                                        "/bin/install_upgrade.escript") #o755)
> -                (copy-recursively ejabberd #$output)))))))
> +                (copy-recursively ejabberd #$output))))
> +          (add-after 'install 'wrap-program
> +            (lambda* (#:key inputs outputs #:allow-other-keys)
> +              (let ((out (assoc-ref outputs "out")))
> +                (wrap-program (string-append out "/bin/ejabberdctl")
> +                  `("PATH" ":" suffix
> +                    ,(map (lambda (command)
> +                            (dirname
> +                             (search-input-file
> +                              inputs (string-append "bin/" command))))
> +                          (list "date" "dirname" "grep"
> +                                "id" "pgrep" "sed"))))))))))
>      (synopsis "Robust, Ubiquitous and Massively Scalable Messaging Platform")
>      (description "This package provides Ejabberd -- Robust, Ubiquitous and
>  Massively Scalable Messaging Platform.  It supports XMPP, MQTT and SIP
>
> base-commit: 174ecf5b1077d29498d9de22e27b13047f314feb

Hi Igor!

thank you for the patch, applied, pushed as 
https://git.savannah.gnu.org/cgit/guix.git/commit/?id=cb7de07a51

-- 
Best regards,
Andrew Tropin

[signature.asc (application/pgp-signature, inline)]

Previous Next

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