ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-13 22:50:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: python: Drop special handling of python2-numpydoc as input.

Browse source 
* gnu/packages/python.scm (python2-numpy, python2-matplotlib,
  python2-ipython): Keep input python2-numpydoc created by
  package-with-python2.
This commit is contained in:
Andreas Enge 2015-02-28 01:17:57 +01:00
parent 5e4d8f6710
commit 88c268347b
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gnu/packages/python.scm
View file

@ -2078,14 +2078,11 @@ (define-public python-numpy
(define-public python2-numpy
(let ((numpy (package-with-python2 python-numpy)))
(package (inherit numpy)
;; Make sure we use exactly PYTHON2-NUMPYDOC, which is customized for
;; Python 2. Since it is also an input to PYTHON2-MATPLOTLIB, we need to
;; import the right version of 'matplotlib' as well.
(inputs `(("python2-numpydoc" ,python2-numpydoc)
("python2-matplotlib" ,python2-matplotlib)
,@(alist-delete "python-numpydoc"
(alist-delete "python-matplotlib"
(package-inputs 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)))))))
(define-public python-pyparsing
(package
@ -2289,19 +2286,15 @@ (define-public python-matplotlib
(define-public python2-matplotlib
(let ((matplotlib (package-with-python2 python-matplotlib)))
(package (inherit matplotlib)
;; Make sure we use exactly PYTHON2-NUMPYDOC, which is
;; customized for Python 2.
;; Make sure to use special packages for Python 2 instead
;; of those automatically rewritten by package-with-python2.
(propagated-inputs
`(("python2-pycairo" ,python2-pycairo)
("python2-pygobject-2" ,python2-pygobject-2)
,@(alist-delete "python-pycairo"
(alist-delete "python-pygobject"
(package-propagated-inputs
matplotlib)))))
(inputs
`(("python2-numpydoc" ,python2-numpydoc)
,@(alist-delete "python-numpydoc"
(package-inputs matplotlib)))))))
matplotlib))))))))
(define-public python-scipy
(package
@ -2819,11 +2812,9 @@ (define-public python2-ipython
(package (inherit ipython)
;; Make sure we use custom python2-NAME packages.
(inputs
`(("python2-numpydoc" ,python2-numpydoc)
("python2-matplotlib" ,python2-matplotlib)
,@(alist-delete "python-numpydoc"
(alist-delete "python-matplotlib"
(package-inputs ipython))))))))
`(("python2-matplotlib" ,python2-matplotlib)
,@(alist-delete "python-matplotlib"
(package-inputs ipython)))))))
(define-public python-isodate
(package