From patchwork Thu Jul 14 15:07:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Geerinckx-Rice X-Patchwork-Id: 13802 Received: (qmail 70457 invoked by uid 89); 14 Jul 2016 15:39:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=H*F:D*gr, H*r:196, H*r:538, H*F:U*me X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Thu, 14 Jul 2016 15:38:56 +0000 Received: from localhost ([::1]:54930 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNiiz-00026L-LA for patchwork@sourceware.org; Thu, 14 Jul 2016 11:38:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNiEz-0004HT-Or for guix-devel@gnu.org; Thu, 14 Jul 2016 11:07:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bNiEx-0005nF-Iq for guix-devel@gnu.org; Thu, 14 Jul 2016 11:07:52 -0400 Received: from relay4-d.mail.gandi.net ([2001:4b98:c:538::196]:36338) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bNiEx-0005my-CV for guix-devel@gnu.org; Thu, 14 Jul 2016 11:07:51 -0400 Received: from localhost.localdomain (ptr-2hj4tbifd5uicx7of4hgfi6g4.ip6.access.telenet.be [IPv6:2a02:1810:3919:8200:ee9a:74ff:fe3f:b024]) (Authenticated sender: me@tobias.gr) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id A45331720A4; Thu, 14 Jul 2016 17:07:50 +0200 (CEST) From: Tobias Geerinckx-Rice To: guix-devel@gnu.org Subject: [PATCH 2/3] gnu: Import (guix licenses) with #:prefix. Date: Thu, 14 Jul 2016 17:07:25 +0200 Message-Id: <20160714150726.12132-3-me@tobias.gr> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160714150726.12132-1-me@tobias.gr> References: <20160714150726.12132-1-me@tobias.gr> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4b98:c:538::196 X-Mailman-Approved-At: Thu, 14 Jul 2016 11:35:46 -0400 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list 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+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" * gnu/packages/crypto.scm: Add 'license:' #:prefix for (guix licenses). --- gnu/packages/crypto.scm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index f167f33..041dc20 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -29,7 +29,7 @@ #:use-module (gnu packages readline) #:use-module (gnu packages serialization) #:use-module (gnu packages tls) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu)) @@ -54,7 +54,7 @@ (description "Sodium is a new easy-to-use high-speed software library for network communication, encryption, decryption, signatures, etc.") - (license isc) + (license license:isc) (home-page "http://libsodium.org"))) (define-public signify @@ -91,10 +91,11 @@ OpenBSD tool of the same name.") (home-page "https://github.com/aperezdc/signify") ;; This package includes third-party code that was originally released under ;; various non-copyleft licenses. See the source files for clarification. - (license (list bsd-3 bsd-4 expat isc public-domain - (non-copyleft "file://base64.c" - "See base64.c in the distribution for - the license from IBM."))))) + (license (list license:bsd-3 license:bsd-4 license:expat license:isc + license:public-domain (license:non-copyleft + "file://base64.c" + "See base64.c in the distribution for + the license from IBM."))))) (define-public opendht @@ -146,4 +147,4 @@ OpenBSD tool of the same name.") (description "OpenDHT is a Distributed Hash Table (DHT) library. It may be used to manage peer-to-peer network connections as needed for real time communication.") - (license gpl3))) + (license license:gpl3)))