Re: [PATCH] gnu: Add python-reportlab.

[Marius Bakke <mbakke@fastmail.com>]

[-- Attachment #1: Type: text/plain, Size: 839 bytes --]

Marius Bakke <mbakke@fastmail.com> writes:

> Leo Famulari <leo@famulari.name> writes:
>
>> On Mon, Aug 15, 2016 at 03:01:00PM +0100, Marius Bakke wrote:
>>> 
>>> > From c95b25a3ad4902ccdef79c7429485a7cacc72e1c Mon Sep 17 00:00:00 2001
>>> > From: Marius Bakke <mbakke@fastmail.com>
>>> > Date: Sun, 14 Aug 2016 16:47:33 +0100
>>> > Subject: [PATCH] gnu: Add python-reportlab.
>>> >
>>> > * gnu/packages/python.scm (python-reportlab, python2-reportlab): New
>>> >   variables.
>>> > ---
>>> >  gnu/packages/python.scm | 32 ++++++++++++++++++++++++++++++++
>>> >  1 file changed, 32 insertions(+)
>>> 
>>> Oops, forgot copyright line. New patch below. Perhaps pdf.scm is better?
>>
>> Looks good. I think pdf.scm is better. Can you send another patch?
>
> New patch attached.

Argh. Forgot to include python.scm. Here is an updated patch.


[-- Attachment #2: 0001-gnu-Add-python-reportlab.patch --]
[-- Type: text/x-patch, Size: 2664 bytes --]

From ea4713ae81030e2146f9c30e6bcad7e95203333c Mon Sep 17 00:00:00 2001
From: Marius Bakke <mbakke@fastmail.com>
Date: Sun, 14 Aug 2016 16:47:33 +0100
Subject: [PATCH] gnu: Add python-reportlab.

* gnu/packages/pdf.scm (python-reportlab, python2-reportlab): New
  variables.
---
 gnu/packages/pdf.scm | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 439adb9..59e5523 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Paul van der Walt <paul@denknerd.org>
 ;;; Copyright © 2016 Roel Janssen <roel@gnu.org>
 ;;; Coypright © 2016 ng0 <ng0@we.make.ritual.n0.is>
+;;; Coypright © 2016 Marius Bakke <mbakke@fastmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -49,6 +50,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))
 
@@ -582,3 +584,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)))))
-- 
2.9.2