tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: onionshare: Fix build.

Browse Source 
* gnu/packages/tor.scm: Add gnupg module.
(onionshare-cli) [phases]{relax-requirements}: Add
"desktop/pyproject.toml" to the list; relax check for PySide6.
(onionshare) [native-inputs]: Inherit from onionshare-cli.
[inputs]: Remove python-pyside-2; add python-pyside-6 and python-gnupg.

Change-Id: I750dfb413b24e7407b31633af785573fcc413ad9
This commit is contained in:
Sharlatan Hellseher
2025-04-24 18:45:54 +01:00
parent 6cdafce595
commit 9665278a20
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/tor.scm
View File

@@ -43,6 +43,7 @@
#:use-module (guix build-system pyproject)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages gnupg)
#:use-module (gnu packages libevent)
#:use-module (gnu packages libffi)
#:use-module (gnu packages linux)
@@ -309,10 +310,12 @@ networks.")
(lambda _
;; All tests passed, and the CLI is working in runtime, relax
;; Poetry way too strict requirements.
(substitute* "cli/pyproject.toml"
(substitute* (list "cli/pyproject.toml"
"desktop/pyproject.toml")
(("2.3.2") "^3.0.0") ; flask = "2.3.2"
(("5.3.4") "5.5.1") ; flask-socketio = "5.3.4"
(("23.9.1") "24.11.1") ; gevent = "^23.9.1"
(("PySide6 = .*") "") ; XXX: it's not found in sanity check
(("7.4.2") "8.0.0") ; qrcode = "^7.4.2"
(("70.0.0") "67.6.1") ; setuptools = ">=70.0.0"
(("1.8.1") "^1.8.1") ; stem = "1.8.1"
@@ -387,7 +390,8 @@ OnionShare.")
(apply invoke "xvfb-run" "pytest" "-vv"
(find-files "tests" "^test_gui.*\\.py$")))))))))
(native-inputs
(list python-pytest xvfb-run))
(modify-inputs (package-native-inputs onionshare-cli)
(prepend xvfb-run)))
(inputs
;; The desktop client uses onionshare-cli like a python module. But
;; propagating onionshare-cli's inputs is not great, since a user would
@@ -395,9 +399,10 @@ OnionShare.")
;; standalone utility. So add onionshare-cli's inputs here.
(modify-inputs (package-inputs onionshare-cli)
(prepend onionshare-cli ;TODO: package obfs4proxy
python-shiboken-2
python-pyside-2
python-gnupg
python-pyside-6
python-qrcode
python-shiboken-2
xdg-utils)))
(description "OnionShare lets you securely and anonymously share files,
host websites, and chat with friends using the Tor network.")))