* gnu/packages/python.scm (python-ipython)[properties]: New field.
(python2-ipython): Use 'strip-python2-variant'.
[inputs, propagated-inputs]: Do not redefine inherited values.
---
gnu/packages/python.scm | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index ee2cab8..40d28b1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -4359,29 +4359,21 @@ without using the configuration machinery.")
Powerful interactive shells, a browser-based notebook, support for interactive
data visualization, embeddable interpreters and tools for parallel
computing.")
- (license bsd-3)))
+ (license bsd-3)
+ (properties `((python2-variant . ,(delay python2-ipython))))))
(define-public python2-ipython
- (let ((ipython (package-with-python2 python-ipython)))
+ (let ((base (package-with-python2
+ (strip-python2-variant python-ipython))))
(package
- (inherit ipython)
+ (inherit base)
;; FIXME: some tests are failing
- (arguments
- `(#:tests? #f ,@(package-arguments ipython)))
- ;; Make sure we use custom python2-NAME packages.
;; FIXME: add pyreadline once available.
- (propagated-inputs
- `(("python2-terminado" ,python2-terminado)
- ,@(alist-delete "python-terminado"
- (package-propagated-inputs ipython))))
+ (arguments
+ `(#:tests? #f ,@(package-arguments base)))
(inputs
- `(("python2-jsonschema" ,python2-jsonschema)
- ("python2-mock" ,python2-mock)
- ("python2-matplotlib" ,python2-matplotlib)
- ("python2-numpy" ,python2-numpy)
- ("python2-requests" ,python2-requests)
- ,@(fold alist-delete (package-inputs ipython)
- '("python-jsonschema" "python-matplotlib" "python-numpy"
"python-requests")))))))
+ `(("python2-mock" ,python2-mock)
+ ,@(package-inputs base))))))
(define-public python-isodate
(package
--
2.5.0
