From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dAUZf-0003u2-2o for guix-patches@gnu.org; Tue, 16 May 2017 00:59:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dAUZb-00076w-Sq for guix-patches@gnu.org; Tue, 16 May 2017 00:59:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:44622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dAUZb-00076s-P2 for guix-patches@gnu.org; Tue, 16 May 2017 00:59:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dAUZa-00063d-I1 for guix-patches@gnu.org; Tue, 16 May 2017 00:59:03 -0400 Subject: bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list Resent-Message-ID: References: From: Brendan Tildesley Message-ID: <53a09b3e-160d-1569-32ab-3b6b8b355fc6@openmailbox.org> Date: Tue, 16 May 2017 14:58:39 +1000 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------441B0C51D0C8DB2F75772F49" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 26924@debbugs.gnu.org This is a multi-part message in MIME format. --------------441B0C51D0C8DB2F75772F49 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit --------------441B0C51D0C8DB2F75772F49 Content-Type: text/x-patch; name="0009-gnu-calibre-Add-exhaustive-license-list.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0009-gnu-calibre-Add-exhaustive-license-list.patch" >From 7e36409c4464bc10af90a2075f202dc22007b23c Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 14 May 2017 17:01:06 +1000 Subject: [PATCH 09/10] gnu: calibre: Add exhaustive license list * gnu/packages/ebook.scm (calibre): Add exhaustive license list. * gnu/packages/ebook.scm (chmlib): Use #:prefix license: instead of #:select (...) so any license can be used in ebook.scm --- gnu/packages/ebook.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 5f3e778ad..289c2d07d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -20,7 +20,7 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages ebook) - #:use-module ((guix licenses) #:select (gpl3 lgpl2.1+)) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) @@ -60,7 +60,7 @@ (home-page "http://www.jedrea.com/chmlib/") (synopsis "Library for CHM files") (description "CHMLIB is a library for dealing with ITSS/CHM format files.") - (license lgpl2.1+))) + (license license:lgpl2.1+))) (define-public calibre (package @@ -165,4 +165,13 @@ and catalog ebooks in most of the major ebook formats. It can also talk to many ebook reader devices. It can go out to the Internet and fetch metadata for books. It can download newspapers and convert them into ebooks for convenient reading.") - (license gpl3))) ; some files are under various other licenses, see COPYRIGHT + (license (list license:gpl3 ; Too many files to detail here. See source. + license:gpl2+ + license:gpl2 + license:bsd-3 + license:lgpl2.1+ + license:lgpl2.1 + license:expat + license:asl2.0 + license:non-copyleft ; hyphenate license, and Info-Zip license. + license:cc-by-sa3.0)))) -- 2.13.0 --------------441B0C51D0C8DB2F75772F49--