ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-15 11:25:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: tor: Use G-expressions.

Browse source 
* gnu/packages/tor.scm (tor)[arguments]: Rewrite using (guix gexp).
(tor-client)[arguments]: SUBSTITUTE-KEYWORD-ARGUMENTS accordingly.
This commit is contained in:
Tobias Geerinckx-Rice 2022-05-01 02:00:00 +02:00
parent be6d5783ba
commit cc796dc320
No known key found for this signature in database
GPG key ID: 0DB0FF884F556D79
1 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
gnu/packages/tor.scm
View file

@ -28,6 +28,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages tor)
#:use-module (guix gexp)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix utils)
@ -67,27 +68,27 @@ (define-public tor
"0i2v3a2h7d0bjn64pi1c6h2x15lb53plf71xwkbkb51bnmc124ry"))))
(build-system gnu-build-system)
(arguments
`(#:configure-flags
(list "--enable-lzma"
"--enable-zstd")
#:phases
(modify-phases %standard-phases
(add-before 'check 'skip-practracker
;; This is a style linter. It doesn't get to throw fatal errors.
(lambda _
(setenv "TOR_DISABLE_PRACTRACKER" "set")))
,@(if (or (target-aarch64?)
(target-ppc32?))
;; Work around upstream issue relating to sandboxing and glibc-2.33.
;; This is similar to the issue the tor-sandbox-i686 patch fixes
;; but for other architectures.
;; https://gitlab.torproject.org/tpo/core/tor/-/issues/40381
;; https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/446
`((add-before 'check 'adjust-test-suite
(list #:configure-flags
#~(list "--enable-lzma"
"--enable-zstd")
#:phases
#~(modify-phases %standard-phases
(add-before 'check 'skip-practracker
;; This is a style linter. It doesn't get to throw fatal errors.
(lambda _
(substitute* "src/test/test_include.sh"
((".*Sandbox 1.*") "")))))
'()))))
(setenv "TOR_DISABLE_PRACTRACKER" "set")))
#$@(if (or (target-aarch64?)
(target-ppc32?))
;; Work around upstream issue relating to sandboxing and glibc-2.33.
;; This is similar to the issue the tor-sandbox-i686 patch fixes
;; but for other architectures.
;; https://gitlab.torproject.org/tpo/core/tor/-/issues/40381
;; https://gitlab.torproject.org/tpo/core/tor/-/merge_requests/446
`((add-before 'check 'adjust-test-suite
(lambda _
(substitute* "src/test/test_include.sh"
((".*Sandbox 1.*") "")))))
'()))))
(native-inputs
(list pkg-config python)) ; for tests
(inputs
@ -120,9 +121,9 @@ (define-public tor-client
(name "tor-client")
(arguments
(substitute-keyword-arguments (package-arguments tor)
((#:configure-flags flags)
(append flags
'("--disable-module-relay")))))
((#:configure-flags flags #~'())
#~(append #$flags
(list "--disable-module-relay")))))
(synopsis "Client to the anonymous Tor network")
(description
"Tor protects you by bouncing your communications around a distributed