nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: tor: Use ‘license:’ prefix instead of #:select. 

* gnu/packages/tor.scm (tor, torsocks, privoxy, onionshare)[license]:
Add prefix.
This commit is contained in:
Tobias Geerinckx-Rice 2017-01-29 14:00:55 +01:00
parent cf1bed97ca
commit 71794d7b94
No known key found for this signature in database
GPG Key ID: 91CCDB9B48541B99
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/tor.scm
View File

@ -20,7 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages tor) (define-module (gnu packages tor)
#:use-module ((guix licenses) #:select (bsd-3 gpl3+ gpl2+ gpl2)) #:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
@ -73,7 +73,7 @@ To @code{torify} applications (to take measures to ensure that an application,
which has not been designed for use with Tor such as ssh, will use only Tor for which has not been designed for use with Tor such as ssh, will use only Tor for
internet connectivity, and also ensures that there are no leaks from DNS, UDP or internet connectivity, and also ensures that there are no leaks from DNS, UDP or
the application layer) you need to install @code{torsocks}.") the application layer) you need to install @code{torsocks}.")
(license bsd-3))) (license license:bsd-3)))
(define-public torsocks (define-public torsocks
(package (package
@ -95,7 +95,7 @@ way with Tor. It ensures that DNS requests are handled safely and explicitly
rejects UDP traffic from the application you're using.") rejects UDP traffic from the application you're using.")
;; All the files explicitly say "version 2 only". ;; All the files explicitly say "version 2 only".
(license gpl2))) (license license:gpl2)))
(define-public privoxy (define-public privoxy
(package (package
@ -139,7 +139,7 @@ access, and removing ads and other obnoxious Internet junk. Privoxy has a
flexible configuration and can be customized to suit individual needs and flexible configuration and can be customized to suit individual needs and
tastes. It has application for both stand-alone systems and multi-user tastes. It has application for both stand-alone systems and multi-user
networks.") networks.")
(license gpl2+))) (license license:gpl2+)))
(define-public onionshare (define-public onionshare
(package (package
@ -225,5 +225,5 @@ using a third party filesharing service. You host the file on your own computer
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 gpl3+ (license (list license:gpl3+
bsd-3)))) ; onionshare/socks.py license:bsd-3)))) ; onionshare/socks.py