gnu: python2-numexpr: Use strip-python2-variant.

* gnu/packages/python.scm (python2-numexpr): Replace package definition
with 'package-with-python2', using 'strip-python2-variant'.
This commit is contained in:
Efraim Flashner 2016-09-01 23:15:53 +03:00
parent 2b031d3fc1
commit fc1a170e65
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 3 additions and 9 deletions

View File

@ -3303,17 +3303,11 @@ doing the same calculation in Python. In addition, its multi-threaded
capabilities can make use of all your cores, which may accelerate capabilities can make use of all your cores, which may accelerate
computations, most specially if they are not memory-bounded (e.g. those using computations, most specially if they are not memory-bounded (e.g. those using
transcendental functions).") transcendental functions).")
(license license:expat))) (license license:expat)
(properties `((python2-variant . ,(delay python2-numexpr))))))
(define-public python2-numexpr (define-public python2-numexpr
(let ((numexpr (package-with-python2 python-numexpr))) (package-with-python2 (strip-python2-variant python-numexpr)))
(package (inherit numexpr)
;; Make sure to use special packages for Python 2 instead
;; of those automatically rewritten by package-with-python2.
(propagated-inputs
`(("python2-numpy" ,python2-numpy)
,@(alist-delete "python-numpy"
(package-propagated-inputs numexpr)))))))
(define-public python-matplotlib (define-public python-matplotlib
(package (package