nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: python2-scikit-image: Use strip-python2-variant. 

* gnu/packages/python.scm (python2-scikit-image): Inherit using
strip-python2-variant.
[propagated-inputs]: Remove work-around for python2-matplotlib,
python2-numpy, python2-scipy.
This commit is contained in:
Efraim Flashner 2016-09-01 23:06:42 +03:00
parent 7e21b9fb26
commit 2b031d3fc1
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gnu/packages/python.scm
View File

@ -2919,21 +2919,19 @@ mining and data analysis.")
(synopsis "Image processing in Python") (synopsis "Image processing in Python")
(description (description
"Scikit-image is a collection of algorithms for image processing.") "Scikit-image is a collection of algorithms for image processing.")
(license license:bsd-3))) (license license:bsd-3)
(properties `((python2-variant . ,(delay python2-scikit-image))))))
(define-public python2-scikit-image (define-public python2-scikit-image
(let ((scikit-image (package-with-python2 python-scikit-image))) (let ((scikit-image (package-with-python2
(strip-python2-variant python-scikit-image))))
(package (inherit scikit-image) (package (inherit scikit-image)
(native-inputs (native-inputs
`(("python2-mock" ,python2-mock) `(("python2-mock" ,python2-mock)
,@(package-native-inputs scikit-image))) ,@(package-native-inputs scikit-image)))
(propagated-inputs (propagated-inputs
`(("python2-pytz" ,python2-pytz) `(("python2-pytz" ,python2-pytz)
("python2-matplotlib" ,python2-matplotlib) ,@(package-propagated-inputs scikit-image))))))
("python2-numpy" ,python2-numpy)
("python2-scipy" ,python2-scipy)
,@(fold alist-delete (package-propagated-inputs scikit-image)
'("python-matplotlib" "python-numpy" "python-scipy")))))))
(define-public python-redis (define-public python-redis
(package (package