aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/python.scm
diff options
context:
space:
mode:
author宋文武 <iyzsong@gmail.com>2015-05-29 20:54:29 +0800
committer宋文武 <iyzsong@gmail.com>2015-05-29 21:01:42 +0800
commit5ff408d998d6a8f7364a438f33e53889a7ec0a12 (patch)
tree19f5885838f06d8b07cd617b56d1043d3fc66202 /gnu/packages/python.scm
parent0b4eb42e8afab21aa399de4eb372354c40344b6c (diff)
downloadguix-5ff408d998d6a8f7364a438f33e53889a7ec0a12.tar
guix-5ff408d998d6a8f7364a438f33e53889a7ec0a12.tar.gz
python-pillow: Update to 2.8.1, remove duplicated ones.
* gnu/packages/python.scm (python-pillow): Update to 2.8.1. [inputs]: Add freetype and libwebp. (python-pillow, python2-pillow): Remove duplicated variables.
Diffstat (limited to 'gnu/packages/python.scm')
-rw-r--r--gnu/packages/python.scm47
1 files changed, 6 insertions, 41 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 9b4f6b6787..5dd1165746 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2788,7 +2788,7 @@ services for your Python modules and applications.")
(define-public python-pillow
(package
(name "python-pillow")
- (version "2.6.1")
+ (version "2.8.1")
(source
(origin
(method url-fetch)
@@ -2796,17 +2796,19 @@ services for your Python modules and applications.")
"Pillow/Pillow-" version ".tar.gz"))
(sha256
(base32
- "0iw36c73wkhz88wa78v6l43llsb080ihw8yq7adhfqxdib7l4hzr"))))
+ "15n92axxph2s3kvg68bki9gv3nzwgq7130kp7wbblpi1l0cc2q47"))))
(build-system python-build-system)
(native-inputs
`(("python-setuptools" ,python-setuptools)
("python-nose" ,python-nose)))
(inputs
- `(("lcms" ,lcms)
+ `(("freetype" ,freetype)
+ ("lcms" ,lcms)
("zlib" ,zlib)
("libjpeg" ,libjpeg)
("openjpeg" ,openjpeg)
- ("libtiff" ,libtiff)))
+ ("libtiff" ,libtiff)
+ ("libwebp" ,libwebp)))
(propagated-inputs
`(;; Used at runtime for pkg_resources
("python-setuptools" ,python-setuptools)))
@@ -3360,43 +3362,6 @@ libxml2 and libxslt.")
(define-public python2-lxml
(package-with-python2 python-lxml))
-(define-public python-pillow
- (package
- (name "python-pillow")
- (version "2.7.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://pypi.python.org/packages/source/P/Pillow/Pillow-"
- version
- ".tar.gz"))
- (sha256
- (base32
- "1y0rysgd7vqpl5lh0lsra7j2k30azwxqlh5jnqk1i0pmfc735s96"))))
- (build-system python-build-system)
- (inputs
- `(("freetype" ,freetype)
- ("lcms" ,lcms)
- ("libjpeg" ,libjpeg)
- ("libtiff" ,libtiff)
- ("openjpeg" ,openjpeg)
- ("python-setuptools" ,python-setuptools)
- ("zlib" ,zlib)))
- (arguments
- `(#:tests? #f)) ; no check target
- (home-page "http://python-pillow.github.io/")
- (synopsis "Pillow fork of Python Imaging Library")
- (description "Pillow is a fork of the Python Imaging Library (PIL).")
- ;; PIL license, see
- ;; http://www.pythonware.com/products/pil/license.htm
- (license (x11-style
- "file://PKG-INFO"
- "See http://www.pythonware.com/products/pil/license.htm"))))
-
-(define-public python2-pillow
- (package-with-python2 python-pillow))
-
(define-public python2-pil
(package
(name "python2-pil")