me/guix
Archived
1
0
Fork 0
Code Activity

gnu: onionshare-cli: Update to 2.5.

Browse source 
* gnu/packages/tor.scm (onionshare-cli): Update to 2.5.
[phases]: Use gexps.
{bake-tor}: Use search-input-file and search-input-directory.
This commit is contained in:
Maxim Cournoyer 2022-07-11 23:45:30 -04:00
parent 8d922504b2
commit b54a243ec1
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 33 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/tor.scm
View file

@ -246,7 +246,7 @@ networks.")
(define-public onionshare-cli (define-public onionshare-cli
(package (package
(name "onionshare-cli") (name "onionshare-cli")
(version "2.4") (version "2.5")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -255,7 +255,7 @@ networks.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 "157ryxm4p1q7b3nj32v9fziw1li6s6s203b7ll80js14cbp6dj9d")))) (base32 "16m5ll0v0qjbirwwzbzxg53kq4ry1n3ay5x0h8zkij73v3x0q864"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
(list python-pytest)) (list python-pytest))
@ -277,17 +277,18 @@ networks.")
python-urllib3 python-urllib3
tor)) tor))
(arguments (arguments
`(#:phases (list
(modify-phases %standard-phases #:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'bake-tor (add-after 'unpack 'bake-tor
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
(substitute* (list "cli/onionshare_cli/common.py" (substitute* (list "cli/onionshare_cli/common.py"
"desktop/src/onionshare/gui_common.py") "desktop/onionshare/gui_common.py")
(("shutil\\.which\\(\\\"tor\\\"\\)") (("shutil\\.which\\(\\\"tor\\\"\\)")
(string-append "\"" (which "tor") "\""))) (format #f "~s" (search-input-file inputs "bin/tor"))))
(substitute* "cli/tests/test_cli_common.py" (substitute* "cli/tests/test_cli_common.py"
(("/usr/share/tor") (("/usr/share/tor")
(string-append (assoc-ref inputs "tor") "/share/tor"))))) (search-input-directory inputs "share/tor")))))
(add-before 'build 'change-directory (add-before 'build 'change-directory
(lambda _ (chdir "cli"))) (lambda _ (chdir "cli")))
(replace 'check (replace 'check