From 68455ddf4b5142c6b9d3b4b85248d6a07a049bca Mon Sep 17 00:00:00 2001 From: normalmente Date: Wed, 20 Mar 2024 18:55:50 +0000 Subject: gnu: magic-wormhole: Update to 0.13.0. * gnu/packages/magic-wormhole.scm (magic-wormhole): Update to 0.13.0. [native-inputs]: Add python-noiseprotocol to make tests pass. Change-Id: I59008f27081efcc3b558dad59bef6ebdc9b34f38 Signed-off-by: Sharlatan Hellseher --- gnu/packages/magic-wormhole.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 86a8013aa1..f9ccf8c1d3 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Leo Famulari +;;; Copyright © 2024 normally_js ;;; ;;; This file is part of GNU Guix. ;;; @@ -106,14 +107,14 @@ together, allowing them to pretend they have a direct connection.") (define-public magic-wormhole (package (name "magic-wormhole") - (version "0.12.0") + (version "0.13.0") (source (origin (method url-fetch) (uri (pypi-uri "magic-wormhole" version)) (sha256 (base32 - "0q41j99718y7m95zg1vaybnsp31lp6lhyqkbv4yqz5ys6jixh3qv")))) + "05hm5pnrxli69a28h3pbgx6s6pwy8279l506kha7y3i7hs1dcfxc")))) (build-system python-build-system) (arguments '(#:phases @@ -128,6 +129,7 @@ together, allowing them to pretend they have a direct connection.") #t))))) (native-inputs (list python-mock + python-noiseprotocol ;; XXX These are required for the test suite but end up being referenced ;; by the built package. ;; https://bugs.gnu.org/25235 -- cgit v1.2.3 From fb667a7a8a69c17f5beafe458951defd369125fa Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 17:37:02 +0000 Subject: gnu: magic-wormhole: Simplify package. * gnu/packages/magic-wormhole.scm: Use G-expressions. [build-system]: Swap to pyproject-bulid-system. [arguments]: <#:phases>: Remove trailing #t from lambda. [native-inputs]: Add python-pytest. Remove python-noiseprototocl. [propagated-inputs]: Add python-noiseprototocl, listed as an optional install dependence. Change-Id: Ie00a23ed3d31ca46d200fa6dfc5404f7803aae14 --- gnu/packages/magic-wormhole.scm | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index f9ccf8c1d3..cdd24d89b8 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -20,7 +20,9 @@ (define-module (gnu packages magic-wormhole) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix licenses) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (gnu packages check) #:use-module (gnu packages python-check) @@ -115,24 +117,20 @@ together, allowing them to pretend they have a direct connection.") (sha256 (base32 "05hm5pnrxli69a28h3pbgx6s6pwy8279l506kha7y3i7hs1dcfxc")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - ;; XXX I can't figure out how to build the docs properly. - ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101 - (add-after 'install 'install-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (man (string-append out "/share/man/man1"))) - (install-file "docs/wormhole.1" man)) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + ;; XXX I can't figure out how to build the docs properly. + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=34515#101 + (add-after 'install 'install-docs + (lambda _ + (install-file "docs/wormhole.1" + (string-append #$output "/share/man/man1"))))))) (native-inputs (list python-mock - python-noiseprotocol - ;; XXX These are required for the test suite but end up being referenced - ;; by the built package. - ;; https://bugs.gnu.org/25235 + python-pytest magic-wormhole-mailbox-server magic-wormhole-transit-relay)) (propagated-inputs @@ -140,6 +138,7 @@ together, allowing them to pretend they have a direct connection.") python-click python-hkdf python-humanize + python-noiseprotocol python-pynacl python-spake2 python-tqdm -- cgit v1.2.3 From d72fe75367cd87858dd13d988cc533dac219ca82 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 17:42:56 +0000 Subject: gnu: magic-wormhole: Fix indentation. * gnu/packages/magic-wormhole.scm (magic-wormhole): Fix indentation. [description]: Start with a new line and fix indentation. Change-Id: I0d72dba2b5682c5bec71b6b5765d513f75c781f0 --- gnu/packages/magic-wormhole.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index cdd24d89b8..3b3488682e 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -111,12 +111,12 @@ together, allowing them to pretend they have a direct connection.") (name "magic-wormhole") (version "0.13.0") (source - (origin - (method url-fetch) - (uri (pypi-uri "magic-wormhole" version)) - (sha256 - (base32 - "05hm5pnrxli69a28h3pbgx6s6pwy8279l506kha7y3i7hs1dcfxc")))) + (origin + (method url-fetch) + (uri (pypi-uri "magic-wormhole" version)) + (sha256 + (base32 + "05hm5pnrxli69a28h3pbgx6s6pwy8279l506kha7y3i7hs1dcfxc")))) (build-system pyproject-build-system) (arguments (list @@ -146,15 +146,16 @@ together, allowing them to pretend they have a direct connection.") python-txtorcon)) (home-page "https://github.com/warner/magic-wormhole") (synopsis "Securely transfer data between computers") - (description "Magic-Wormhole is a library and a command-line tool named -wormhole, which makes it possible to securely transfer arbitrary-sized files and + (description + "Magic-Wormhole is a library and a command-line tool named wormhole, +which makes it possible to securely transfer arbitrary-sized files and directories (or short pieces of text) from one computer to another. The two -endpoints are identified by using identical \"wormhole codes\": in general, the -sending machine generates and displays the code, which must then be typed into -the receiving machine. +endpoints are identified by using identical \"wormhole codes\": in general, +the sending machine generates and displays the code, which must then be typed +into the receiving machine. The codes are short and human-pronounceable, using a phonetically-distinct -wordlist. The receiving side offers tab-completion on the codewords, so usually -only a few characters must be typed. Wormhole codes are single-use and do not -need to be memorized.") +wordlist. The receiving side offers tab-completion on the codewords, so +usually only a few characters must be typed. Wormhole codes are single-use +and do not need to be memorized.") (license expat))) -- cgit v1.2.3 From 3b43d01c61f5da986c179fc368aff7f0afd5f5e5 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 17:46:39 +0000 Subject: gnu: magic-wormhole: Add licenses prefix. Sort modules alphabetically and add prefix for licenses module. * gnu/packages/magic-wormhole.scm (magic-wormhole-mailbox-server, magic-wormhole-transit-relay, magic-wormhole) [license]: Use prefix. Change-Id: I2eac5730c9257fe435af102541bea4cdd9c66845 --- gnu/packages/magic-wormhole.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 3b3488682e..40d4773099 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -18,12 +18,12 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages magic-wormhole) - #:use-module (guix packages) - #:use-module (guix download) - #:use-module (guix gexp) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) + #:use-module (guix download) + #:use-module (guix gexp) + #:use-module (guix packages) #:use-module (gnu packages check) #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) @@ -67,7 +67,7 @@ clients connect to. The server performs store-and-forward delivery for small key-exchange and control messages. Bulk data is sent over a direct TCP connection, or through a transit-relay.") - (license expat))) + (license license:expat))) (define-public magic-wormhole-transit-relay (package @@ -104,7 +104,7 @@ server, which helps clients establish bulk-data transit connections even when both are behind NAT boxes. Each side makes a TCP connection to this server and presents a handshake. Two connections with identical handshakes are glued together, allowing them to pretend they have a direct connection.") - (license expat))) + (license license:expat))) (define-public magic-wormhole (package @@ -158,4 +158,4 @@ The codes are short and human-pronounceable, using a phonetically-distinct wordlist. The receiving side offers tab-completion on the codewords, so usually only a few characters must be typed. Wormhole codes are single-use and do not need to be memorized.") - (license expat))) + (license license:expat))) -- cgit v1.2.3 From 997248741734e91bfee8178f3cf0108f56853811 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 17:50:34 +0000 Subject: gnu: magic-wormhole-mailbox-server: Simplify package. * gnu/packages/magic-wormhole.scm (magic-wormhole-mailbox-server) [build-system]: Swap to pyproject-build-system. [arguments] <#:phases>: Remove 'patch-tests phase. [native-inputs]: Add python-pytest. Change-Id: I23085e927965c2191bad242a0fb07132cb30e99d --- gnu/packages/magic-wormhole.scm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 40d4773099..cbb785a199 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -41,18 +41,9 @@ (sha256 (base32 "1yw8i8jv5iv1kkz1aqimskw7fpichjn6ww0fq0czbalwj290bw8s")))) - (build-system python-build-system) - (arguments - '(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - ;; This test requires network access. - (substitute* "src/wormhole_mailbox_server/test/test_web.py" - (("test_log_http") "disabled_test_log_http")) - #t))))) + (build-system pyproject-build-system) (native-inputs - (list python-mock)) + (list python-mock python-pytest)) (propagated-inputs (list python-attrs python-autobahn -- cgit v1.2.3 From 70386806e1f8428ad310373bd491aa9f833947c4 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 17:56:21 +0000 Subject: gnu: magic-wormhole-transit-relay: Simplify package. * gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay) Use G-expressions [build-system]: Swap to pyproject-build-system. [arguments] <#:phases>: Remove traling #t from lambda. [native-inputs]: Add python-pytest. Change-Id: I1d72d48768016067d1a6a24e47eb9144b36d38e4 --- gnu/packages/magic-wormhole.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index cbb785a199..582c91cb1e 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -71,20 +71,20 @@ connection, or through a transit-relay.") (sha256 (base32 "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b")))) - (build-system python-build-system) + (build-system pyproject-build-system) (arguments - `(#:phases - (modify-phases %standard-phases + (list + #:phases + #~(modify-phases %standard-phases (add-after 'install 'install-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) + (lambda _ + (let* ((out #$output) (docs (string-append out "/share/doc/magic-wormhole-transit-relay"))) (for-each (lambda (file) (install-file file docs)) - (find-files "docs/")) - #t)))))) + (find-files "docs/")))))))) (native-inputs - (list python-mock python-pyflakes python-tox)) + (list python-mock python-pyflakes python-pytest python-tox)) (propagated-inputs (list python-twisted)) (home-page -- cgit v1.2.3 From 8444c7b0dca328afeabd7b74c9e30df0ba0a6491 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 18:57:28 +0000 Subject: gnu: magic-wormhole: Limit amount of loaded symbols. Select only 'pypi-uri from (gnu build-system python) exported symbols, rest is not required as the whole module uses just pyproject-build-system. Change-Id: I4928ad51bb915494d5234c48cc1d638dd4aa0aca --- gnu/packages/magic-wormhole.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 582c91cb1e..d65bf0e30c 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -20,7 +20,7 @@ (define-module (gnu packages magic-wormhole) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system pyproject) - #:use-module (guix build-system python) + #:use-module ((guix build-system python) #:select (pypi-uri)) #:use-module (guix download) #:use-module (guix gexp) #:use-module (guix packages) -- cgit v1.2.3 From b877fead3b5818515c699705b8138bf8242fc08a Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 20:37:47 +0000 Subject: gnu: magic-wormhole-mailbox-server: Fix indentation. * gnu/packages/magic-wormhole.scm (magic-wormhole-mailbox-server): Fix indentation. [description]: Start with a new line and adjust indentation. Change-Id: I0a246de5dfdf5823b1b794728113207b6ca46ccc --- gnu/packages/magic-wormhole.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index d65bf0e30c..892730205f 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -35,12 +35,12 @@ (name "magic-wormhole-mailbox-server") (version "0.4.1") (source - (origin - (method url-fetch) - (uri (pypi-uri "magic-wormhole-mailbox-server" version)) - (sha256 - (base32 - "1yw8i8jv5iv1kkz1aqimskw7fpichjn6ww0fq0czbalwj290bw8s")))) + (origin + (method url-fetch) + (uri (pypi-uri "magic-wormhole-mailbox-server" version)) + (sha256 + (base32 + "1yw8i8jv5iv1kkz1aqimskw7fpichjn6ww0fq0czbalwj290bw8s")))) (build-system pyproject-build-system) (native-inputs (list python-mock python-pytest)) @@ -54,11 +54,12 @@ python-twisted)) (home-page "https://github.com/warner/magic-wormhole-mailbox-server") (synopsis "Magic-Wormhole central mailbox server") - (description "This package provides the main server that Magic-Wormhole -clients connect to. The server performs store-and-forward delivery for small + (description + "This package provides the main server that Magic-Wormhole clients +connect to. The server performs store-and-forward delivery for small key-exchange and control messages. Bulk data is sent over a direct TCP connection, or through a transit-relay.") - (license license:expat))) + (license license:expat))) (define-public magic-wormhole-transit-relay (package -- cgit v1.2.3 From 7c11136764bed82c3beaeb468b4087197a78fa59 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 20:41:37 +0000 Subject: gnu: magic-wormhole-transit-relay: Fix indentation. * gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay): Fix indentation. [description]: Start with a new line and adjust indentation. Change-Id: I65c978a332088c66c88e4459d26a1f78e3c9ffdc --- gnu/packages/magic-wormhole.scm | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index 892730205f..d146f628ba 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -66,37 +66,37 @@ connection, or through a transit-relay.") (name "magic-wormhole-transit-relay") (version "0.2.1") (source - (origin - (method url-fetch) - (uri (pypi-uri "magic-wormhole-transit-relay" version)) - (sha256 - (base32 - "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b")))) + (origin + (method url-fetch) + (uri (pypi-uri "magic-wormhole-transit-relay" version)) + (sha256 + (base32 + "0ppsx2s1ysikns1h053x67z2zmficbn3y3kf52bzzslhd2s02j6b")))) (build-system pyproject-build-system) (arguments (list #:phases - #~(modify-phases %standard-phases - (add-after 'install 'install-docs - (lambda _ - (let* ((out #$output) - (docs (string-append out "/share/doc/magic-wormhole-transit-relay"))) - (for-each (lambda (file) - (install-file file docs)) - (find-files "docs/")))))))) + #~(modify-phases %standard-phases + (add-after 'install 'install-docs + (lambda _ + (let* ((out #$output) + (docs (string-append out "/share/doc/magic-wormhole-transit-relay"))) + (for-each (lambda (file) + (install-file file docs)) + (find-files "docs/")))))))) (native-inputs (list python-mock python-pyflakes python-pytest python-tox)) (propagated-inputs (list python-twisted)) - (home-page - "https://github.com/warner/magic-wormhole-transit-relay") + (home-page "https://github.com/warner/magic-wormhole-transit-relay") (synopsis "Magic-Wormhole relay server") - (description "This package provides the Magic-Wormhole Transit Relay -server, which helps clients establish bulk-data transit connections even when -both are behind NAT boxes. Each side makes a TCP connection to this server and + (description + "This package provides the Magic-Wormhole Transit Relay server, which +helps clients establish bulk-data transit connections even when both are +behind NAT boxes. Each side makes a TCP connection to this server and presents a handshake. Two connections with identical handshakes are glued together, allowing them to pretend they have a direct connection.") - (license license:expat))) + (license license:expat))) (define-public magic-wormhole (package -- cgit v1.2.3 From edf7bd05e157d25428dd2a5a996c33765ed28394 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 20:47:22 +0000 Subject: gnu: magic-wormhole-transit-relay: Remove some native inputs. Remove python-check as no longer required. * gnu/packages/magic-wormhole.scm (magic-wormhole-transit-relay) [native-inputs]: Remove python-pyflakes and python-tox. Change-Id: I3908aa379aa4ca6445ecc1045d45da2381314a06 --- gnu/packages/magic-wormhole.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index d146f628ba..a804ff3225 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2019 Leo Famulari ;;; Copyright © 2024 normally_js +;;; Copyright © 2024 Sharlatan Hellseher ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,7 +26,6 @@ #:use-module (guix gexp) #:use-module (guix packages) #:use-module (gnu packages check) - #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz)) @@ -85,7 +85,7 @@ connection, or through a transit-relay.") (install-file file docs)) (find-files "docs/")))))))) (native-inputs - (list python-mock python-pyflakes python-pytest python-tox)) + (list python-mock python-pytest)) (propagated-inputs (list python-twisted)) (home-page "https://github.com/warner/magic-wormhole-transit-relay") -- cgit v1.2.3 From 28bc0e870b4d48b8e3e773382bb0e999df2e3611 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Sat, 23 Mar 2024 20:55:48 +0000 Subject: gnu: magic-wormhole: Fix home page. * gnu/packages/magic-wormhole.scm (magic-wormhole-mailbox-server, magic-wormhole-transit-relay, magic-wormhole) [home-page]: Fix it after a lint warning of permanent redirection. Change-Id: Ie0e8a8b0af982e46c05ae7dfc8f375cc18632c67 --- gnu/packages/magic-wormhole.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/magic-wormhole.scm') diff --git a/gnu/packages/magic-wormhole.scm b/gnu/packages/magic-wormhole.scm index a804ff3225..3c63319710 100644 --- a/gnu/packages/magic-wormhole.scm +++ b/gnu/packages/magic-wormhole.scm @@ -52,7 +52,7 @@ python-six python-treq python-twisted)) - (home-page "https://github.com/warner/magic-wormhole-mailbox-server") + (home-page "https://github.com/magic-wormhole/magic-wormhole-mailbox-server") (synopsis "Magic-Wormhole central mailbox server") (description "This package provides the main server that Magic-Wormhole clients @@ -88,7 +88,7 @@ connection, or through a transit-relay.") (list python-mock python-pytest)) (propagated-inputs (list python-twisted)) - (home-page "https://github.com/warner/magic-wormhole-transit-relay") + (home-page "https://github.com/magic-wormhole/magic-wormhole-transit-relay") (synopsis "Magic-Wormhole relay server") (description "This package provides the Magic-Wormhole Transit Relay server, which @@ -136,7 +136,7 @@ together, allowing them to pretend they have a direct connection.") python-tqdm python-twisted python-txtorcon)) - (home-page "https://github.com/warner/magic-wormhole") + (home-page "https://github.com/magic-wormhole/magic-wormhole") (synopsis "Securely transfer data between computers") (description "Magic-Wormhole is a library and a command-line tool named wormhole, -- cgit v1.2.3