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

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

[jgart via Guix-patches via]

* 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

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

[Maxime Devos]

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

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.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54584] [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.

[jgart via Guix-patches via]

* 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

[bug#54584] [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.

[Maxime Devos]

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

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.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 260 bytes --]

[bug#54584] [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.

[Maxim Cournoyer]

Hi jgart,

jgart <jgart@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

[bug#54584] [PATCH v2] gnu: python-slixmpp: Update to 1.8.1.

[jgart via Guix-patches via]

On Sat, 23 Apr 2022 23:32:53 -0400 Maxim Cournoyer <maxim.cournoyer@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.

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

[Maxim Cournoyer]

Hi jgart,

jgart <jgart@dismail.de> writes:

> On Sat, 23 Apr 2022 23:32:53 -0400 Maxim Cournoyer <maxim.cournoyer@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

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

[jgart via Guix-patches via]

On Sun, 22 May 2022 01:08:52 -0400 Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
> Hi jgart,
> 
> jgart <jgart@dismail.de> writes:
> 
> > On Sat, 23 Apr 2022 23:32:53 -0400 Maxim Cournoyer <maxim.cournoyer@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

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

[Vagrant Cascadian]

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

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

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