[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: onionshare-cli: Update to 2.4.
From: |
guix-commits |
Subject: |
03/06: gnu: onionshare-cli: Update to 2.4. |
Date: |
Fri, 19 Nov 2021 04:11:34 -0500 (EST) |
rekado pushed a commit to branch core-updates-frozen
in repository guix.
commit 66fc69794c52dbe0ce68c052f7abfdd86cf02fd3
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Nov 19 09:21:51 2021 +0100
gnu: onionshare-cli: Update to 2.4.
* gnu/packages/tor.scm (onionshare-cli): Update to 2.4.
[inputs]: Add python-pynacl.
[arguments]: Patch references to /usr/share/tor in 'bake-tor phase; remove
trailing #T; run tests conditionally.
---
gnu/packages/tor.scm | 28 ++++++++++++++++------------
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index 2507f80..f710c82 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -227,7 +227,7 @@ networks.")
(define-public onionshare-cli
(package
(name "onionshare-cli")
- (version "2.3.2")
+ (version "2.4")
(source
(origin
(method git-fetch)
@@ -236,7 +236,7 @@ networks.")
(commit (string-append "v" version))))
(file-name (git-file-name name version))
(sha256
- (base32 "1qk0zvbaws9md1lmi0al1jc8v86l65nf7n3w1s36iwsfzazc6clv"))))
+ (base32 "157ryxm4p1q7b3nj32v9fziw1li6s6s203b7ll80js14cbp6dj9d"))))
(build-system python-build-system)
(native-inputs
`(("python-pytest" ,python-pytest)))
@@ -248,6 +248,7 @@ networks.")
("python-flask" ,python-flask)
("python-flask-httpauth" ,python-flask-httpauth)
("python-flask-socketio" ,python-flask-socketio)
+ ("python-pynacl" ,python-pynacl)
("python-psutil" ,python-psutil)
("python-pycryptodome" ,python-pycryptodome)
("python-pysocks" ,python-pysocks)
@@ -265,18 +266,21 @@ networks.")
"desktop/src/onionshare/gui_common.py")
(("shutil\\.which\\(\\\"tor\\\"\\)")
(string-append "\"" (which "tor") "\"")))
- #t))
+ (substitute* "cli/tests/test_cli_common.py"
+ (("/usr/share/tor")
+ (string-append (assoc-ref inputs "tor") "/share/tor")))))
(add-before 'build 'change-directory
- (lambda _ (chdir "cli") #t))
+ (lambda _ (chdir "cli")))
(replace 'check
- (lambda _
- (setenv "HOME" "/tmp")
- ;; Greendns is not needed for testing, and if eventlet tries to
- ;; load it, an OSError is thrown when getprotobyname is called.
- ;; Thankfully there is an environment variable to disable the
- ;; greendns import, so use it:
- (setenv "EVENTLET_NO_GREENDNS" "yes")
- (invoke "pytest" "-v" "./tests"))))))
+ (lambda* (#:key tests? #:allow-other-keys)
+ (when tests?
+ (setenv "HOME" "/tmp")
+ ;; Greendns is not needed for testing, and if eventlet tries to
+ ;; load it, an OSError is thrown when getprotobyname is called.
+ ;; Thankfully there is an environment variable to disable the
+ ;; greendns import, so use it:
+ (setenv "EVENTLET_NO_GREENDNS" "yes")
+ (invoke "pytest" "-v" "./tests")))))))
(home-page "https://onionshare.org/")
(synopsis "Securely and anonymously share files")
(description "OnionShare lets you securely and anonymously share files,
- branch core-updates-frozen updated (abc9a9b -> c00131d), guix-commits, 2021/11/19
- 02/06: gnu: python-eventlet: Update to 0.33.0., guix-commits, 2021/11/19
- 01/06: gnu: python-pytest-httpserver: Use GUIX_PYTHONPATH., guix-commits, 2021/11/19
- 03/06: gnu: onionshare-cli: Update to 2.4.,
guix-commits <=
- 05/06: gnu: onionshare: Run tests conditionally., guix-commits, 2021/11/19
- 04/06: gnu: onionshare: Do not set PYTHONPATH directly., guix-commits, 2021/11/19
- 06/06: gnu: onionshare: Remove trailing #T., guix-commits, 2021/11/19