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

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

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