ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-26 20:49:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: onionshare: Upgrade to 2.1.

Browse source 
* gnu/packages/tor.scm (onionshare): Upgrade to 2.1.
[arguments]: Rename "tests" phase to "check".  Set home directory for tests.
Remove reference to closed upstream bug.
[inputs]: Add python-pycrypto and python-pysocks.
[license]: Remove bsd-3 license; relevant file no longer present.
This commit is contained in:
Eric Bavier 2019-08-13 22:34:57 -05:00
parent 588a0a335d
commit 4afdb79249
No known key found for this signature in database
GPG key ID: FD73CAC719D32566
1 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/tor.scm
View file

@ -4,7 +4,7 @@
;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017, 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 ng0 <ng0@n0.is> ;;; Copyright © 2016, 2017 ng0 <ng0@n0.is>
;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2017, 2018, 2019 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2017, 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017, 2018, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com> ;;; Copyright © 2017 Rutger Helling <rhelling@mykolab.com>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
@ -39,6 +39,7 @@ (define-module (gnu packages tor)
#:use-module (gnu packages pcre) #:use-module (gnu packages pcre)
#:use-module (gnu packages pkg-config) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages python) #:use-module (gnu packages python)
#:use-module (gnu packages python-crypto)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz) #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt) #:use-module (gnu packages qt)
@ -157,7 +158,7 @@ (define-public privoxy
(define-public onionshare (define-public onionshare
(package (package
(name "onionshare") (name "onionshare")
(version "1.3.2") (version "2.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -166,7 +167,7 @@ (define-public onionshare
(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 "19zrz9kh7k4pdk4lh3cm0kv02ngdqkrggwma1xdskrrmp2rjkgz7")))) (base32 "1lx21p12888qnbhsyin4lrnn4xizb39ldk77r71y53hn8mfxi54z"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:phases `(#:phases
@ -184,20 +185,21 @@ (define-public onionshare
(("/usr") out)) (("/usr") out))
#t))) #t)))
(delete 'check) (delete 'check)
(add-before 'strip 'tests (add-before 'strip 'check
;; After all the patching we run the tests after installing. ;; After all the patching we run the tests after installing.
;; This is also a known issue:
;; https://github.com/micahflee/onionshare/issues/284
(lambda _ (lambda _
(invoke "pytest" "test") (setenv "HOME" "/tmp") ; Some tests need a writable homedir
(invoke "pytest" "tests/")
#t))))) #t)))))
(native-inputs (native-inputs
`(("python-pytest" ,python-pytest))) `(("python-pytest" ,python-pytest)))
(inputs (inputs
`(("python-flask" ,python-flask) `(("python-pycrypto" ,python-pycrypto)
("python-flask" ,python-flask)
("python-nautilus" ,python-nautilus) ("python-nautilus" ,python-nautilus)
("python-sip" ,python-sip) ("python-sip" ,python-sip)
("python-stem" ,python-stem) ("python-stem" ,python-stem)
("python-pysocks" ,python-pysocks)
("python-pyqt" ,python-pyqt))) ("python-pyqt" ,python-pyqt)))
(home-page "https://onionshare.org/") (home-page "https://onionshare.org/")
(synopsis "Securely and anonymously share files") (synopsis "Securely and anonymously share files")
@ -209,8 +211,7 @@ (define-public onionshare
and use a Tor hidden service to make it temporarily accessible over the and use a Tor hidden service to make it temporarily accessible over the
internet. The other user just needs to use Tor Browser to download the file internet. The other user just needs to use Tor Browser to download the file
from you.") from you.")
(license (list license:gpl3+ (license license:gpl3+)))
license:bsd-3)))) ; onionshare/socks.py
(define-public nyx (define-public nyx
(package (package