diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-12-02 15:05:19 +0100 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-12-02 18:07:36 +0100 |
commit | b0aa6ede251709f650b30020057a86da8c636f99 (patch) | |
tree | 5e39d039ea9a34c8b20bcbf739665d47d767d228 /gnu/packages | |
parent | 77a6932adf29c1945289ccbdd84dc476c03e6915 (diff) | |
download | guix-b0aa6ede251709f650b30020057a86da8c636f99.tar.gz |
gnu: python-numpy: Fix inputs.
This fixes 2efabc5589dc641dce75702b99253a3fb40bb2eb, where some inputs have been changed to propagated-inputs, but the propagated-inputs are still extended from inputs and the inputs are not extended at all. * gnu/packages/python.scm (python-numpy, python2-numpy)[inputs]: Extend from python-numpy-bootstrap's package-inputs. [propagated-inputs]: Extend from python-numpy-bootstrap's package-propagated-inputs.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/python.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index c2dac25706..e3738696b4 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -3261,11 +3261,12 @@ association studies (GWAS) on extremely large data sets.") (name "python-numpy") (outputs '("out" "doc")) (inputs - `(("which" ,which))) + `(("which" ,which) + ,@(package-inputs python-numpy-bootstrap))) (propagated-inputs `(("python-matplotlib" ,python-matplotlib) ("python-pyparsing" ,python-pyparsing) - ,@(package-inputs python-numpy-bootstrap))) + ,@(package-propagated-inputs python-numpy-bootstrap))) (native-inputs `(("pkg-config" ,pkg-config) ("python-sphinx" ,python-sphinx) |