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

gnu: python-scipy, python2-scipy: Propagate Python inputs. 

* gnu/packages/python.scm (python-scipy)[inputs]: Move "python-numpy",
  "python-matplotlib", and "python-pyparsing" to propagated-inputs; move
  "python-nose" and "python-sphinx" to native-inputs.
  [propagated-inputs]: New field.
  [native-inputs]: Move "python-nose" and "python-sphinx" from inputs
  field here.
  (python2-scipy): Modify propagated-inputs instead of inputs field.
This commit is contained in:
Ricardo Wurmus 2015-10-13 13:29:49 +02:00
parent 331a1cd727
commit dd86c0d10c
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
gnu/packages/python.scm
View File

@ -3261,16 +3261,17 @@ functions.")
(base32
"0fsqi05s035d7p6s8h3h2pvk1axias16chy17rw9l1bxvrfhmncf"))))
(build-system python-build-system)
(inputs
(propagated-inputs
`(("python-numpy" ,python-numpy)
("python-matplotlib" ,python-matplotlib)
("python-pyparsing" ,python-pyparsing)
("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx)
("lapack" ,lapack)
("python-pyparsing" ,python-pyparsing)))
(inputs
`(("lapack" ,lapack)
("openblas" ,openblas)))
(native-inputs
`(("gfortran" ,gfortran)
`(("python-nose" ,python-nose)
("python-sphinx" ,python-sphinx)
("gfortran" ,gfortran)
("texlive" ,texlive)
("perl" ,perl)))
(outputs '("out" "doc"))
@ -3339,11 +3340,12 @@ routines such as routines for numerical integration and optimization.")
(let ((scipy (package-with-python2 python-scipy)))
(package (inherit scipy)
;; Use packages customized for python-2.
(inputs `(("python2-matplotlib" ,python2-matplotlib)
(propagated-inputs
`(("python2-matplotlib" ,python2-matplotlib)
("python2-numpy" ,python2-numpy)
,@(alist-delete "python-matplotlib"
(alist-delete "python-numpy"
(package-inputs scipy))))))))
(package-propagated-inputs scipy))))))))
(define-public python-sqlalchemy
(package