summaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-02-07 23:01:40 +0100
committerLudovic Courtès <ludo@gnu.org>2016-02-07 23:46:01 +0100
commit57b7b8cd60425c4c718cb3082cdd745e014ee723 (patch)
tree12fc8448570043b6bfccc02096dd240c8e063c02 /gnu/packages
parent48b311b1b3ba7d34b5d8825a23ea89e5091d2a95 (diff)
gnu: python-matplotlib: Define 'python2-variant'.
* gnu/packages/python.scm (python2-numpy): Take the result of 'package-with-python2' directly. (python2-scipy): Likewise. (python-matplotlib)[properties]: New field. (python2-matplotlib): Call 'strip-python2-variant'.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/python.scm26
1 files changed, 7 insertions, 19 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 702a333231..c01ae09d0c 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3115,13 +3115,7 @@ association studies (GWAS) on extremely large data sets.")
,phases)))))))
(define-public python2-numpy
- (let ((numpy (package-with-python2 python-numpy)))
- (package (inherit numpy)
- ;; Make sure we use exactly PYTHON2-MATPLOTLIB, which is customized for
- ;; Python 2.
- (inputs `(("python2-matplotlib" ,python2-matplotlib)
- ,@(alist-delete "python-matplotlib"
- (package-inputs numpy)))))))
+ (package-with-python2 python-numpy))
(define-public python-pyparsing
(package
@@ -3321,7 +3315,7 @@ transcendental functions).")
(lambda (port)
(format port "[directories]~%
basedirlist = ~a,~a~%
-[rc_options]~%
+ [rc_options]~%
backend = TkAgg~%"
(assoc-ref inputs "tcl")
(assoc-ref inputs "tk"))))))
@@ -3368,10 +3362,12 @@ quality figures in a variety of hardcopy formats and interactive environments
across platforms. Matplotlib can be used in Python scripts, the python and
ipython shell, web application servers, and six graphical user interface
toolkits.")
- (license psfl)))
+ (license psfl)
+ (properties `((python2-variant . ,(delay python2-matplotlib))))))
(define-public python2-matplotlib
- (let ((matplotlib (package-with-python2 python-matplotlib)))
+ (let ((matplotlib (package-with-python2
+ (strip-python2-variant python-matplotlib))))
(package (inherit matplotlib)
;; Make sure to use special packages for Python 2 instead
;; of those automatically rewritten by package-with-python2.
@@ -3547,15 +3543,7 @@ routines such as routines for numerical integration and optimization.")
(license bsd-3)))
(define-public python2-scipy
- (let ((scipy (package-with-python2 python-scipy)))
- (package (inherit scipy)
- ;; Use packages customized for python-2.
- (propagated-inputs
- `(("python2-matplotlib" ,python2-matplotlib)
- ("python2-numpy" ,python2-numpy)
- ,@(alist-delete "python-matplotlib"
- (alist-delete "python-numpy"
- (package-propagated-inputs scipy))))))))
+ (package-with-python2 python-scipy))
(define-public python-sqlalchemy
(package