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

gnu: calibre: Add exhaustive license list. 

* gnu/packages/ebook.scm (calibre): Add exhaustive license list.
(chmlib)[license]: Use license: prefix.

Co-authored-by: Marius Bakke <mbakke@fastmail.com>
This commit is contained in:
Brendan Tildesley 2017-05-14 17:01:06 +10:00 committed by Marius Bakke
parent 9b7dcc2703
commit affaf98f77
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/ebook.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 ebook) (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 packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
@ -60,7 +60,7 @@
(home-page "http://www.jedrea.com/chmlib/") (home-page "http://www.jedrea.com/chmlib/")
(synopsis "Library for CHM files") (synopsis "Library for CHM files")
(description "CHMLIB is a library for dealing with ITSS/CHM format files.") (description "CHMLIB is a library for dealing with ITSS/CHM format files.")
(license lgpl2.1+))) (license license:lgpl2.1+)))
(define-public calibre (define-public calibre
(package (package
@ -167,4 +167,16 @@ 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 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 metadata for books. It can download newspapers and convert them into
ebooks for convenient reading.") ebooks for convenient reading.")
(license gpl3))) ; some files are under various other licenses, see COPYRIGHT ;; Calibre is largely GPL3+, but includes a number of components covered
;; by other licenses. See COPYRIGHT for more details.
(license (list license:gpl3+
license:gpl2+
license:lgpl2.1+
license:lgpl2.1
license:bsd-3
license:expat
license:zpl2.1
license:asl2.0
license:public-domain
license:silofl1.1
license:cc-by-sa3.0))))