branch master updated: gnu: python-pillow: Add the python2-variant property.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 20c64fc  gnu: python-pillow: Add the python2-variant property.
20c64fc is described below

commit 20c64fc2e2e6029b41601e7b8e3bda319cb7e48e
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Sat Nov 21 00:21:19 2020 -0500

    gnu: python-pillow: Add the python2-variant property.
    
    This is apparently required to get the package-with-python2 package
    transformer to pick up the correct python2-pillow package instead of
    attempting to create a new one with the same version as python-pillow, as it
    would happen for python2-matplotlib for example.
    
    * gnu/packages/python-xyz.scm (python-pillow): Add python2-variant property.
    (python2-pillow): Strip python2-variant property from inherited 
python-pillow,
    and fix indentation.
---
 gnu/packages/python-xyz.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index b1363f8..c4c629b 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -5698,6 +5698,7 @@ efficient internal representation, and fairly powerful 
image processing
 capabilities.  The core image library is designed for fast access to data
 stored in a few basic pixel formats.  It should provide a solid foundation for
 a general image processing tool.")
+    (properties `((python2-variant . ,(delay python2-pillow))))
     (license (license:x11-style
               "http://www.pythonware.com/products/pil/license.htm";
               "The PIL Software License"))))
@@ -5705,16 +5706,16 @@ a general image processing tool.")
 (define-public python2-pillow
   (package-with-python2
    (package
-     (inherit python-pillow)
+     (inherit (strip-python2-variant python-pillow))
      ;; Version 6 is the last series with Python 2 support.
      (version "6.2.2")
      (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "Pillow" version))
-       (sha256
-        (base32
-         "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv")))))))
+      (origin
+        (method url-fetch)
+        (uri (pypi-uri "Pillow" version))
+        (sha256
+         (base32
+          "0l5rv8jkdrb5q846v60v03mcq64yrhklidjkgwv6s1pda71g17yv")))))))
 
 (define-public python-pillow-2.9
   (package