From: Tobias Geerinckx-Rice <me@tobias.gr>
To: guix-devel@gnu.org
Subject: [PATCH 1/2] gnu: tor: Use ‘license:’ prefix instead of #:select.
Date: Mon, 30 Jan 2017 01:09:03 +0100 [thread overview]
Message-ID: <20170130000904.31174-1-me@tobias.gr> (raw)
* gnu/packages/tor.scm (tor, torsocks, privoxy, onionshare)[license]:
Add prefix.
---
gnu/packages/tor.scm | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm
index c7f97ab..97e7ec9 100644
--- a/gnu/packages/tor.scm
+++ b/gnu/packages/tor.scm
@@ -20,7 +20,7 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(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 download)
#:use-module (guix git-download)
@@ -69,7 +69,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
internet connectivity, and also ensures that there are no leaks from DNS, UDP or
the application layer) you need to install @code{torsocks}.")
- (license bsd-3)))
+ (license license:bsd-3)))
(define-public torsocks
(package
@@ -91,7 +91,7 @@ way with Tor. It ensures that DNS requests are handled safely and explicitly
rejects UDP traffic from the application you're using.")
;; All the files explicitly say "version 2 only".
- (license gpl2)))
+ (license license:gpl2)))
(define-public privoxy
(package
@@ -135,7 +135,7 @@ access, and removing ads and other obnoxious Internet junk. Privoxy has a
flexible configuration and can be customized to suit individual needs and
tastes. It has application for both stand-alone systems and multi-user
networks.")
- (license gpl2+)))
+ (license license:gpl2+)))
(define-public onionshare
(package
@@ -221,5 +221,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
internet. The other user just needs to use Tor Browser to download the file
from you.")
- (license (list gpl3+
- bsd-3)))) ; onionshare/socks.py
+ (license (list license:gpl3+
+ license:bsd-3)))) ; onionshare/socks.py
--
2.9.3
next reply other threads:[~2017-01-30 0:08 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-30 0:09 Tobias Geerinckx-Rice [this message]
2017-01-30 0:09 ` [PATCH 2/2] gnu: Add nyx Tobias Geerinckx-Rice
2017-01-30 6:13 ` ng0
2017-01-30 7:36 ` Tobias Geerinckx-Rice
2017-01-30 14:31 ` Ludovic Courtès
2017-01-30 15:07 ` Tobias Geerinckx-Rice
2017-01-30 19:16 ` ng0
2017-01-30 20:38 ` Tobias Geerinckx-Rice
2017-01-30 14:29 ` [PATCH 1/2] gnu: tor: Use ‘license:’ prefix instead of #:select Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170130000904.31174-1-me@tobias.gr \
--to=me@tobias.gr \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.