1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-05-26 02:51:49 +02:00

Merge branch 'master' into core-updates

This commit is contained in:
Leo Famulari
2016-08-17 23:21:00 -04:00
51 changed files with 3954 additions and 1041 deletions
+34
View File
@@ -6,6 +6,7 @@
;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
;;; Coypright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Coypright © 2016 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -50,6 +51,7 @@
#:use-module (gnu packages curl)
#:use-module (gnu packages pcre)
#:use-module (gnu packages perl)
#:use-module (gnu packages python)
#:use-module (gnu packages tls)
#:use-module (srfi srfi-1))
@@ -583,3 +585,35 @@ program capable of converting PDF into other formats.")
"Xournal is an application for notetaking, sketching, keeping a journal
using a stylus.")
(license license:gpl2+)))
(define-public python-reportlab
(package
(name "python-reportlab")
(version "3.3.0")
(source (origin
(method url-fetch)
(uri (pypi-uri "reportlab" version))
(sha256
(base32
"0rz2pg04wnzjjm2f5a8ik9v8s54mv4xrjhv5liqjijqv6awh12gl"))))
(build-system python-build-system)
(arguments
;; Prevent creation of the egg. Without this flag, various artifacts
;; from the build inputs end up in the final python3 output. It also
;; works around https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20765 .
`(#:configure-flags '("--single-version-externally-managed" "--root=/")))
(propagated-inputs
`(("python-pillow" ,python-pillow)))
(home-page "http://www.reportlab.com")
(synopsis "Python library for generating PDFs and graphics")
(description "This is the ReportLab PDF Toolkit. It allows rapid creation
of rich PDF documents, and also creation of charts in a variety of bitmap and
vector formats.")
(license license:bsd-3)
(properties `((python2-variant . ,(delay python2-reportlab))))))
(define-public python2-reportlab
(package
(inherit (package-with-python2
(strip-python2-variant python-reportlab)))
(native-inputs `(("python2-pip" ,python2-pip)))))