diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-29 22:34:57 +0200 |
| commit | b029be2ee0f81cdcbc14240ff426408085ab0a40 (patch) | |
| tree | ed6d0e1bfdadfd28e1eb804e43763b793baa0b42 /gnu/packages/tor.scm | |
| parent | bc55f3091bac4677df0cf020381c554921fea179 (diff) | |
| parent | ffb381856d0c6cc1a557b789f6b377cfa17002a0 (diff) | |
| download | guix-b029be2ee0f81cdcbc14240ff426408085ab0a40.tar.gz | |
Merge branch 'master' into core-updates-frozen
Conflicts: gnu/packages/bioinformatics.scm gnu/packages/cmake.scm gnu/packages/curl.scm gnu/packages/emacs-xyz.scm gnu/packages/gpodder.scm gnu/packages/music.scm gnu/packages/patches/glibc-bootstrap-system.patch gnu/packages/python-xyz.scm gnu/packages/shells.scm gnu/packages/statistics.scm
Diffstat (limited to 'gnu/packages/tor.scm')
| -rw-r--r-- | gnu/packages/tor.scm | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index e4f16f6caa..5ad15d085d 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -45,6 +45,7 @@ #:use-module (gnu packages glib) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-check) #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) @@ -226,7 +227,7 @@ networks.") (define-public onionshare-cli (package (name "onionshare-cli") - (version "2.3.1") + (version "2.3.2") (source (origin (method git-fetch) @@ -235,13 +236,14 @@ networks.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1llvnvb676s2cs6a4y7isxdj75ddfvskw1p93v5m35vsw7f72kqz")))) + (base32 "1qk0zvbaws9md1lmi0al1jc8v86l65nf7n3w1s36iwsfzazc6clv")))) (build-system python-build-system) (native-inputs `(("python-pytest" ,python-pytest))) (inputs ;; TODO: obfs4proxy `(("python-click" ,python-click) + ("python-colorama" ,python-colorama) ("python-eventlet" ,python-eventlet) ("python-flask" ,python-flask) ("python-flask-httpauth" ,python-flask-httpauth) @@ -303,10 +305,14 @@ OnionShare.") ;; - test_autostart_timer_too_short ;; - test_autostop_timer_too_short (substitute* "desktop/tests/test_gui_share.py" + (("import os" &) + (string-append "import pytest\n" &)) (("( *)def test_autost(art|op)_(timer(_too_short)?|and_[^(]*)\\(" & >) (string-append > "@pytest.mark.skip\n" &))) ;; - test_13_quit_with_server_started_should_warn (substitute* "desktop/tests/test_gui_tabs.py" + (("import os" &) + (string-append "import pytest\n" &)) (("( *)def test_13" & >) (string-append > "@pytest.mark.skip\n" &))) ;; Remove multiline load-path adjustment, so that onionshare-cli |