GNU bug report logs - #54584
[PATCH] gnu: python-slixmpp: Update to 1.8.1.

Previous Next

Package: guix-patches;

Reported by: jgart <jgart <at> dismail.de>

Date: Sat, 26 Mar 2022 18:28:01 UTC

Severity: normal

Tags: moreinfo, patch

Done: Vagrant Cascadian <vagrant <at> debian.org>

Bug is archived. No further changes may be made.

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

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

View this report as an mbox folder, status mbox, maintainer mbox

Report forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sat, 26 Mar 2022 18:28:01 GMT) Full text and rfc822 format available.
Acknowledgement sent to jgart <jgart <at> dismail.de>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Sat, 26 Mar 2022 18:28:01 GMT) Full text and rfc822 format available.

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

From: jgart <jgart <at> dismail.de>
To: guix-patches <at> gnu.org
Cc: jgart <jgart <at> dismail.de>
Subject: [PATCH] gnu: python-slixmpp: Update to 1.8.1.
Date: Sat, 26 Mar 2022 14:27:43 -0400

* gnu/packages/python-xyz.scm (python-slixmpp): Update to 1.8.1.
[arguments]: Remove trailing boolean and use new style.
---
 gnu/packages/python-xyz.scm | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index ae335cc83f..bebd931bb1 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -688,7 +688,7 @@ (define-public python-mkdocs-material
 (define-public python-slixmpp
   (package
     (name "python-slixmpp")
-    (version "1.5.2")
+    (version "1.8.1")
     (source
      (origin
        (method git-fetch)
@@ -700,17 +700,16 @@ (define-public python-slixmpp
        (file-name
         (git-file-name name version))
        (sha256
-        (base32 "15mqxcws14bjvh5jcfwl86zsvrymkdw3ya07vb44md7vfnsnclwx"))))
+        (base32 "0723m7pbyf4xnsy381drni3kr8wm60637gn6d7fbf4i5m04jy9iy"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             (substitute* "setup.py"
-               (("'CC', 'cc'")
-                "'CC', 'gcc'"))
-             #t)))))
+      (list #:phases
+            #~(modify-phases %standard-phases
+                (add-after 'unpack 'patch
+                  (lambda _
+                    (substitute* "setup.py"
+                      (("'CC', 'cc'")
+                       "'CC', 'gcc'")))))))
     (native-inputs
      `(("cython" ,python-cython)
        ("gnupg" ,gnupg)
-- 
2.34.0
Information forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sat, 26 Mar 2022 21:17:01 GMT) Full text and rfc822 format available.

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

From: Maxime Devos <maximedevos <at> telenet.be>
To: jgart <jgart <at> dismail.de>, 54584 <at> debbugs.gnu.org
Subject: Re: [bug#54584] [PATCH] gnu: python-slixmpp: Update to 1.8.1.
Date: Sat, 26 Mar 2022 22:16:19 +0100

[Message part 1 (text/plain, inline)]
jgart via Guix-patches via schreef op za 26-03-2022 om 14:27 [-0400]:
> +      (list #:phases
> +            #~(modify-phases %standard-phases
> +                (add-after 'unpack 'patch
> +                  (lambda _
> +                    (substitute* "setup.py"
> +                      (("'CC', 'cc'")
> +                       "'CC', 'gcc'")))))))

I now this was present in the original code, but this is most likely
completely broken when cross-compiling.  Use cc-for-target instead.
Additionally, you can try removing input labels from 'native-inputs'.

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sat, 16 Apr 2022 14:30:02 GMT) Full text and rfc822 format available.

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

From: jgart <jgart <at> dismail.de>
To: 54584 <at> debbugs.gnu.org
Cc: jgart <jgart <at> dismail.de>, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.
Date: Sat, 16 Apr 2022 10:26:10 -0400

* gnu/packages/python-xyz.scm (python-slixmpp): Update to 1.8.1.
[arguments]: Remove trailing boolean, use new style, and use 
cc-for-target.
[native-inputs]: Use new style.

Hi Maxim,

Here is the second version of this patch.

I think this adds what you suggested in the code review.

thanks,

jgart

---
 gnu/packages/python-xyz.scm | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 219a0d9213..1654fc2894 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -688,7 +688,7 @@ (define-public python-mkdocs-material
 (define-public python-slixmpp
   (package
     (name "python-slixmpp")
-    (version "1.5.2")
+    (version "1.8.1")
     (source
      (origin
        (method git-fetch)
@@ -700,21 +700,20 @@ (define-public python-slixmpp
        (file-name
         (git-file-name name version))
        (sha256
-        (base32 "15mqxcws14bjvh5jcfwl86zsvrymkdw3ya07vb44md7vfnsnclwx"))))
+        (base32 "0723m7pbyf4xnsy381drni3kr8wm60637gn6d7fbf4i5m04jy9iy"))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch
-           (lambda _
-             (substitute* "setup.py"
-               (("'CC', 'cc'")
-                "'CC', 'gcc'"))
-             #t)))))
+      (list #:phases
+            #~(modify-phases %standard-phases
+                (add-after 'unpack 'patch
+                  (lambda _
+                    (substitute* "setup.py"
+                      (((string-append "'CC', " #$(cc-for-target)))
+                       ((string-append "'CC', " #$(cc-for-target))))))))))
     (native-inputs
-     `(("cython" ,python-cython)
-       ("gnupg" ,gnupg)
-       ("pkg-config" ,pkg-config)))
+      (list python-cython
+            gnupg
+            pkg-config))
     (propagated-inputs
      (list python-aiodns python-aiohttp python-pyasn1
            python-pyasn1-modules))
-- 
2.35.1
Information forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sat, 16 Apr 2022 15:26:01 GMT) Full text and rfc822 format available.

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

From: Maxime Devos <maximedevos <at> telenet.be>
To: jgart <jgart <at> dismail.de>, 54584 <at> debbugs.gnu.org
Cc: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#54584] [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.
Date: Sat, 16 Apr 2022 17:25:05 +0200

[Message part 1 (text/plain, inline)]
jgart via Guix-patches via schreef op za 16-04-2022 om 10:26 [-0400]:
> * gnu/packages/python-xyz.scm (python-slixmpp): Update to 1.8.1.
> [arguments]: Remove trailing boolean, use new style, and use 
> cc-for-target.
> [native-inputs]: Use new style.
> 
> Hi Maxim,
> 
> Here is the second version of this patch.
> 
> I think this adds what you suggested in the code review.

I haven't looked at the upstream 1.5.2->1.8.1 diff, but the CC->cc-for-
target and delabelisation LGTM.

Greetings,
Maxime.

[signature.asc (application/pgp-signature, inline)]
Information forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sun, 24 Apr 2022 03:34:01 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: jgart <jgart <at> dismail.de>
Cc: 54584 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.
Date: Sat, 23 Apr 2022 23:32:53 -0400

Hi jgart,

jgart <jgart <at> dismail.de> writes:

> * gnu/packages/python-xyz.scm (python-slixmpp): Update to 1.8.1.
> [arguments]: Remove trailing boolean, use new style, and use 
> cc-for-target.
> [native-inputs]: Use new style.
>
> Hi Maxim,
>
> Here is the second version of this patch.
>
> I think this adds what you suggested in the code review.
>
> thanks,
>
> jgart
>
> ---
>  gnu/packages/python-xyz.scm | 25 ++++++++++++-------------
>  1 file changed, 12 insertions(+), 13 deletions(-)
>
> diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
> index 219a0d9213..1654fc2894 100644
> --- a/gnu/packages/python-xyz.scm
> +++ b/gnu/packages/python-xyz.scm
> @@ -688,7 +688,7 @@ (define-public python-mkdocs-material
>  (define-public python-slixmpp
>    (package
>      (name "python-slixmpp")
> -    (version "1.5.2")
> +    (version "1.8.1")
>      (source
>       (origin
>         (method git-fetch)
> @@ -700,21 +700,20 @@ (define-public python-slixmpp
>         (file-name
>          (git-file-name name version))
>         (sha256
> -        (base32 "15mqxcws14bjvh5jcfwl86zsvrymkdw3ya07vb44md7vfnsnclwx"))))
> +        (base32 "0723m7pbyf4xnsy381drni3kr8wm60637gn6d7fbf4i5m04jy9iy"))))
>      (build-system python-build-system)
>      (arguments
> -     `(#:phases
> -       (modify-phases %standard-phases
> -         (add-after 'unpack 'patch
> -           (lambda _
> -             (substitute* "setup.py"
> -               (("'CC', 'cc'")
> -                "'CC', 'gcc'"))
> -             #t)))))
> +      (list #:phases
> +            #~(modify-phases %standard-phases
> +                (add-after 'unpack 'patch
> +                  (lambda _
> +                    (substitute* "setup.py"
> +                      (((string-append "'CC', " #$(cc-for-target)))
> +                       ((string-append "'CC', " #$(cc-for-target))))))))))

This doesn't look right; the matched pattern is replaced by... the same
thing?

>      (native-inputs
> -     `(("cython" ,python-cython)
> -       ("gnupg" ,gnupg)
> -       ("pkg-config" ,pkg-config)))
> +      (list python-cython
> +            gnupg
> +            pkg-config))

Are you sure pkg-config is needed?  That's unusual in Python packages.

Thanks,

Maxim
Information forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sun, 24 Apr 2022 06:17:01 GMT) Full text and rfc822 format available.

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

From: jgart <jgart <at> dismail.de>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 54584 <at> debbugs.gnu.org
Subject: Re: [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.
Date: Sun, 24 Apr 2022 02:15:51 -0400

On Sat, 23 Apr 2022 23:32:53 -0400 Maxim Cournoyer <maxim.cournoyer <at> gmail.com> wrote:
> > +      (list #:phases
> > +            #~(modify-phases %standard-phases
> > +                (add-after 'unpack 'patch
> > +                  (lambda _
> > +                    (substitute* "setup.py"
> > +                      (((string-append "'CC', " #$(cc-for-target)))
> > +                       ((string-append "'CC', " #$(cc-for-target))))))))))
> 
> This doesn't look right; the matched pattern is replaced by... the same
> thing?

Oh yes, that was definitely a blunder. I'll send a patch fixing that soon.

> 
> >      (native-inputs
> > -     `(("cython" ,python-cython)
> > -       ("gnupg" ,gnupg)
> > -       ("pkg-config" ,pkg-config)))
> > +      (list python-cython
> > +            gnupg
> > +            pkg-config))
> 
> Are you sure pkg-config is needed?  That's unusual in Python packages.

I'll check that. That was there from the previous commit on the package.
Information forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sun, 22 May 2022 05:10:01 GMT) Full text and rfc822 format available.

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

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: jgart <jgart <at> dismail.de>
Cc: 54584 <at> debbugs.gnu.org
Subject: Re: bug#54584: [PATCH] gnu: python-slixmpp: Update to 1.8.1.
Date: Sun, 22 May 2022 01:08:52 -0400

Hi jgart,

jgart <jgart <at> dismail.de> writes:

> On Sat, 23 Apr 2022 23:32:53 -0400 Maxim Cournoyer <maxim.cournoyer <at> gmail.com> wrote:
>> > +      (list #:phases
>> > +            #~(modify-phases %standard-phases
>> > +                (add-after 'unpack 'patch
>> > +                  (lambda _
>> > +                    (substitute* "setup.py"
>> > +                      (((string-append "'CC', " #$(cc-for-target)))
>> > +                       ((string-append "'CC', " #$(cc-for-target))))))))))
>> 
>> This doesn't look right; the matched pattern is replaced by... the same
>> thing?
>
> Oh yes, that was definitely a blunder. I'll send a patch fixing that soon.

Now sure if soon is now, but... ping :-)

Thanks,

Maxim
Added tag(s) moreinfo. Request was from Maxim Cournoyer <maxim.cournoyer <at> gmail.com> to control <at> debbugs.gnu.org. (Sun, 22 May 2022 05:10:02 GMT) Full text and rfc822 format available.
Information forwarded to guix-patches <at> gnu.org:
bug#54584; Package guix-patches. (Sun, 22 May 2022 19:36:01 GMT) Full text and rfc822 format available.

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

From: jgart <jgart <at> dismail.de>
To: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Cc: 54584 <at> debbugs.gnu.org
Subject: Re: bug#54584: [PATCH] gnu: python-slixmpp: Update to 1.8.1.
Date: Sun, 22 May 2022 14:35:33 -0500

On Sun, 22 May 2022 01:08:52 -0400 Maxim Cournoyer <maxim.cournoyer <at> gmail.com> wrote:
> Hi jgart,
> 
> jgart <jgart <at> dismail.de> writes:
> 
> > On Sat, 23 Apr 2022 23:32:53 -0400 Maxim Cournoyer <maxim.cournoyer <at> gmail.com> wrote:
> >> > +      (list #:phases
> >> > +            #~(modify-phases %standard-phases
> >> > +                (add-after 'unpack 'patch
> >> > +                  (lambda _
> >> > +                    (substitute* "setup.py"
> >> > +                      (((string-append "'CC', " #$(cc-for-target)))
> >> > +                       ((string-append "'CC', " #$(cc-for-target))))))))))
> >> 
> >> This doesn't look right; the matched pattern is replaced by... the same
> >> thing?
> >
> > Oh yes, that was definitely a blunder. I'll send a patch fixing that soon.
> 
> Now sure if soon is now, but... ping :-)

Sorry, I probably won't be able to get to this for atleast another week.

I'll let you know sooner if that changes otherwise feel free to fix it and add yourself as author to push this through.

all best,

jgart
Reply sent to Vagrant Cascadian <vagrant <at> debian.org>:
You have taken responsibility. (Fri, 01 Sep 2023 23:43:02 GMT) Full text and rfc822 format available.
Notification sent to jgart <jgart <at> dismail.de>:
bug acknowledged by developer. (Fri, 01 Sep 2023 23:43:02 GMT) Full text and rfc822 format available.

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

From: Vagrant Cascadian <vagrant <at> debian.org>
To: jgart <jgart <at> dismail.de>, 54584-done <at> debbugs.gnu.org
Subject: Re: [bug#54584] [PATCH] gnu: python-slixmpp: Update to 1.8.1.
Date: Fri, 01 Sep 2023 16:41:46 -0700

[Message part 1 (text/plain, inline)]
On 2022-03-26, jgart wrote:
> * gnu/packages/python-xyz.scm (python-slixmpp): Update to 1.8.1.
> [arguments]: Remove trailing boolean and use new style.

This was updated to a newer version in:

3b57f25f55c52c97428106de285d3cf2746554dc gnu: python-slixmpp: Update to 1.8.3.

Marking as done.

live well,
  vagrant

[signature.asc (application/pgp-signature, inline)]
bug archived. Request was from Debbugs Internal Request <help-debbugs <at> gnu.org> to internal_control <at> debbugs.gnu.org. (Sat, 30 Sep 2023 11:24:30 GMT) Full text and rfc822 format available.
This bug report was last modified 1 year and 287 days ago.

Previous Next

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