guix/guix
3
5
Fork 0
mirror of git://git.savannah.gnu.org/guix.git synced 2023-12-14 03:33:07 +01:00
Code Issues Releases Wiki Activity

gnu: python-pillow: Add the python2-variant property.

Browse source 
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.
This commit is contained in:
Maxim Cournoyer 2020-11-21 00:21:19 -05:00
parent 4d6dcba927
commit 20c64fc2e2
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/python-xyz.scm
View file

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