From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Geerinckx-Rice Subject: [PATCH 1/2] =?UTF-8?q?gnu:=20tor:=20Use=20=E2=80=98license:?= =?UTF-8?q?=E2=80=99=20prefix=20instead=20of=20#:select.?= Date: Mon, 30 Jan 2017 01:09:03 +0100 Message-ID: <20170130000904.31174-1-me@tobias.gr> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:44852) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cXzWV-0002RB-Sc for guix-devel@gnu.org; Sun, 29 Jan 2017 19:08:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cXzWU-0008Ne-LV for guix-devel@gnu.org; Sun, 29 Jan 2017 19:08:43 -0500 Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:54904) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cXzWU-0008Mn-FM for guix-devel@gnu.org; Sun, 29 Jan 2017 19:08:42 -0500 Received: from localhost.localdomain (ptr-1poeq1gz8evpzditf9c.18120a2.ip6.access.telenet.be [IPv6:2a02:1810:3919:8200:1558:d985:61a7:880]) (Authenticated sender: me@tobias.gr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id E17FA172095 for ; Mon, 30 Jan 2017 01:08:39 +0100 (CET) List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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 . (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