[bug#74898] [PATCH 0/7] gnu: magic-wormhole: Update to 0.16.0.

[bug#74898] [PATCH 0/7] gnu: magic-wormhole: Update to 0.16.0.

[Artyom V. Poptsov]

This patchset updates "magic-wormhole" to the version 0.16.0 and fixes its
build and build of related packages.

Artyom V. Poptsov (7):
  gnu: magic-wormhole-mailbox-server: Fix build.
  gnu: magic-wormhole-transit-relay: Fix build.
  gnu: python-iterable-io: Fix build.
  gnu: python-noiseprotocol: Fix build.
  gnu: python-zipstream-ng: Fix build.
  gnu: python-spake2: Update to 0.9.
  gnu: magic-wormhole: Update to 0.16.0.

 gnu/packages/magic-wormhole.scm     | 21 ++++++++++++++++-----
 gnu/packages/python-compression.scm |  2 +-
 gnu/packages/python-crypto.scm      |  6 +++---
 gnu/packages/python-web.scm         |  1 +
 gnu/packages/python-xyz.scm         |  1 +
 5 files changed, 22 insertions(+), 9 deletions(-)


base-commit: cfd4f56f75a20b6732d463180d211f796c9032e5
-- 
2.46.0

[bug#74898] [PATCH 1/7] gnu: magic-wormhole-mailbox-server: Fix build.

[Artyom V. Poptsov]

* gnu/packages/magic-wormhole.scm (magic-wormhole-mailbox-server): Fix build.
[native-inputs]: Add "python-setuptools" and "python-wheel".  Sort
alphabetically.

Change-Id: Id0af4aebbe3560a58483846d889955c2748ea4da
---
 gnu/packages/magic-wormhole.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index dbb943c5c6..6eca2d7cda 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2024 normally_js <normally_js@posteo.net>
 ;;; Copyright © 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2024 TakeV <takev@disroot.org>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -26,6 +27,7 @@ (define-module (gnu packages magic-wormhole)
   #:use-module (guix download)
   #:use-module (guix gexp)
   #:use-module (guix packages)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages check)
   #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
@@ -45,7 +47,10 @@ (define-public magic-wormhole-mailbox-server
          "1yw8i8jv5iv1kkz1aqimskw7fpichjn6ww0fq0czbalwj290bw8s"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-mock python-pytest))
+     (list python-mock
+           python-pytest
+           python-setuptools
+           python-wheel))
     (propagated-inputs
      (list python-attrs
            python-autobahn
-- 
2.46.0

[bug#74898] [PATCH 2/7] gnu: magic-wormhole-transit-relay: Fix build.

[Artyom V. Poptsov]

* gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay): Fix build.
[native-inputs]: Add "python-setuptools" and "python-wheel".  Sort
alphabetically.

Change-Id: Ibc1b611f2f0c4e5975d8e123001c5afced87a367
---
 gnu/packages/magic-wormhole.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index 6eca2d7cda..e4f02c3682 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -92,7 +92,10 @@ (define-public magic-wormhole-transit-relay
                             (install-file file docs))
                           (find-files "docs/"))))))))
     (native-inputs
-     (list python-mock python-pytest))
+     (list python-mock
+           python-pytest
+           python-setuptools
+           python-wheel))
     (propagated-inputs
      (list python-twisted))
     (home-page "https://github.com/magic-wormhole/magic-wormhole-transit-relay")
-- 
2.46.0

[bug#74898] [PATCH 3/7] gnu: python-iterable-io: Fix build.

[Artyom V. Poptsov]

* gnu/packages/python-xyz.scm (python-iterable-io) [native-inputs]: Add
"python-setuptools" and "python-wheel".

Change-Id: I08e8135178e0558239f39017bf8ca709a63205b6
---
 gnu/packages/python-xyz.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 503a224954..ff9cb507cb 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -37764,6 +37764,7 @@ (define-public python-iterable-io
        (sha256
         (base32 "0g4cn522n4dv6ly8pwf97dc62rr4f7my38v0bh6vmac7jmrip7pv"))))
     (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools python-wheel))
     (home-page "https://github.com/pR0Ps/iterable-io")
     (synopsis "Adapt generators and other iterables to a file-like interface")
     (description
-- 
2.46.0

[bug#74898] [PATCH 4/7] gnu: python-noiseprotocol: Fix build.

[Artyom V. Poptsov]

* gnu/packages/python-web.scm (python-noiseprotocol): [native-inputs]: Add
"python-setuptools" and "python-wheel".

Change-Id: I53c9f9b1f76245b204926da4434210fd164c116a
---
 gnu/packages/python-web.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/python-web.scm b/gnu/packages/python-web.scm
index 3db2a995dc..7403bc9752 100644
--- a/gnu/packages/python-web.scm
+++ b/gnu/packages/python-web.scm
@@ -3610,6 +3610,7 @@ (define-public python-noiseprotocol
        (sha256
         (base32 "0ifnj0mpbqsfqba9n12vf5yzxj4qf2gxql3ry43qyshgnrqsi4mh"))))
     (build-system pyproject-build-system)
+    (native-inputs (list python-setuptools python-wheel))
     (propagated-inputs (list python-cryptography))
     (home-page "https://github.com/plizonczyk/noiseprotocol")
     (synopsis "Implementation of Noise Protocol Framework")
-- 
2.46.0

[bug#74898] [PATCH 5/7] gnu: python-zipstream-ng: Fix build.

[Artyom V. Poptsov]

* gnu/packages/python-compression.scm (python-zipstream-ng) [native-inputs]:
Add "python-setuptools" and "python-wheel".

Change-Id: Ifdcaeafd585500611a444a354c94c401d96bdd88
---
 gnu/packages/python-compression.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/python-compression.scm b/gnu/packages/python-compression.scm
index 15eaae5bdc..ef01c59269 100644
--- a/gnu/packages/python-compression.scm
+++ b/gnu/packages/python-compression.scm
@@ -746,7 +746,7 @@ (define-public python-zipstream-ng
         (base32 "1z4zdqqs2rg3z36khgj96bpggv34av337isfv7yxg32prawj687r"))))
     (build-system pyproject-build-system)
     (native-inputs
-     (list python-pytest python-pytest-cov))
+     (list python-pytest python-pytest-cov python-setuptools python-wheel))
     (home-page "https://github.com/pR0Ps/zipstream-ng")
     (synopsis "Streamable zip file generator")
     (description
-- 
2.46.0

[bug#74898] [PATCH 6/7] gnu: python-spake2: Update to 0.9.

[Artyom V. Poptsov]

* gnu/packages/python-crypto.scm (python-spake2): Update to 0.9.
[propagated-inputs]: Add python-cryptography.

Change-Id: I9122e657446cb92a7fd1325cdbed63f6ab73428f
---
 gnu/packages/python-crypto.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm
index bf2a532cf4..3cd58bf0ea 100644
--- a/gnu/packages/python-crypto.scm
+++ b/gnu/packages/python-crypto.scm
@@ -1329,17 +1329,17 @@ (define-public python-hkdf
 (define-public python-spake2
   (package
     (name "python-spake2")
-    (version "0.8")
+    (version "0.9")
     (source
       (origin
         (method url-fetch)
         (uri (pypi-uri "spake2" version))
         (sha256
          (base32
-          "1x16r7lrbklvfzbacb66qv9iiih6liq1y612dqh2chgf555n2yn1"))))
+          "0d4kbaxi4cv8klyqh6yb0p0qiwfdwvczy1h2mzvmlfdcsnlc87s2"))))
     (build-system python-build-system)
     (propagated-inputs
-     (list python-hkdf))
+     (list python-cryptography python-hkdf))
     (home-page "https://github.com/warner/python-spake2")
     (synopsis "SPAKE2 password-authenticated key exchange in Python")
     (description "This package provides a Python implementation of the SPAKE2
-- 
2.46.0

[bug#74898] [PATCH 7/7] gnu: magic-wormhole: Update to 0.16.0.

[Artyom V. Poptsov]

* gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.16.0.
[propagated-inputs]: Add python-attrs.
[native-inputs]: Add python-setuptools and python-wheel.

Change-Id: I8c627f1cf421ec26a3749962f937039bda85b542
---
 gnu/packages/magic-wormhole.scm | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm
index e4f02c3682..dc9563e467 100644
--- a/gnu/packages/magic-wormhole.scm
+++ b/gnu/packages/magic-wormhole.scm
@@ -111,14 +111,14 @@ (define-public magic-wormhole-transit-relay
 (define-public magic-wormhole
   (package
     (name "magic-wormhole")
-    (version "0.14.0")
+    (version "0.16.0")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "magic-wormhole" version))
        (sha256
         (base32
-         "105hsv7ck83bs29929zpb29aygr69q00mxpgq9xw7xxzi2gj6v80"))))
+         "1jcldlyj6bdd9bb39r77cd9ra6cllqijc9lhs6kaggcdi53c3rhl"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -133,10 +133,13 @@ (define-public magic-wormhole
     (native-inputs
      (list python-mock
            python-pytest
+           python-setuptools
+           python-wheel
            magic-wormhole-mailbox-server
            magic-wormhole-transit-relay))
     (propagated-inputs
-     (list python-autobahn
+     (list python-attrs
+           python-autobahn
            python-click
            python-hkdf
            python-humanize
-- 
2.46.0

[bug#74898] [PATCH 0/7] gnu: magic-wormhole: Update to 0.16.0.

[Sharlatan Hellseher]

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

Hi,

They look ok for me (not tested or applied yet).

One neat pick:

   #:use-module (guix packages)
+  #:use-module (gnu packages python-build)
   #:use-module (gnu packages check)
   #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)

It may be sorted as well.

Feel free to merge fixes fast ;-).

--
Oleg

[-- Attachment #2: Type: text/html, Size: 786 bytes --]

bug#74898: [PATCH 0/7] gnu: magic-wormhole: Update to 0.16.0.

[Artyom V. Poptsov]

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

Merged to the "master" branch as the following commits:

--8<---------------cut here---------------start------------->8---
c3290cee6add60b7e56f5f919d9498d78542790a gnu: magic-wormhole: Update to 0.16.0.
6d6a1e37b155c1e039c79a18a5ef665b59ffa20a gnu: python-spake2: Update to 0.9.
bfe91a82e4a4e2e1649816f780654ecdd0aa9ab7 gnu: python-zipstream-ng: Fix build.
1adeace81635a02066fb7b02b5ee4f46a8605b15 gnu: python-iterable-io: Fix build.
48d4df3c29a9b3d8806831cd3dea65fac92567ca gnu: magic-wormhole-transit-relay: Fix build.
4dd316cd82ff431845417ea2fc3047cacc95f0e4 gnu: magic-wormhole-mailbox-server: Fix build
--8<---------------cut here---------------end--------------->8---

- avp

-- 
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE  B57C E9C5 A2D9 0898 A02F

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