diff options
| author | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2015-10-08 13:30:23 +0200 |
|---|---|---|
| committer | Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> | 2015-10-08 14:39:11 +0200 |
| commit | 3c4010b1e966ca112470eba262de2835815ba218 (patch) | |
| tree | 9e32aa62c522f45c0b549dcf158598f3780b2334 /gnu/packages | |
| parent | 1285119bdedfd94c58e8938e465f626d998c4633 (diff) | |
| download | guix-3c4010b1e966ca112470eba262de2835815ba218.tar.gz | |
gnu: python-h5py, python2-h5py: Correct inputs.
* gnu/packages/python.scm (python-h5py) [inputs]: Remove python-cython and python-numpy. [propagated-inputs]: New field. [native-inputs]: Drop python-setuptools and add python-cython. (python2-h5py): Replace "inputs" with "propagated-inputs".
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/python.scm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 5dda0b3429..4faa08fe25 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -596,12 +596,12 @@ and verifies that it matches the intended target hostname.") (base32 "0q4f9l8grf6pwp64xbv8bmyxx416s7h4522nnxac056ap3savbps")))) (build-system python-build-system) + (propagated-inputs + `(("python-numpy" ,python-numpy))) (inputs - `(("python-cython" ,python-cython) - ("python-numpy" ,python-numpy) - ("hdf5" ,hdf5))) + `(("hdf5" ,hdf5))) (native-inputs - `(("python-setuptools" ,python-setuptools))) + `(("python-cython" ,python-cython))) (arguments `(#:tests? #f)) ; no test target (home-page "http://www.h5py.org/") (synopsis "Read and write HDF5 files from Python") @@ -616,11 +616,11 @@ concepts.") (define-public python2-h5py (let ((h5py (package-with-python2 python-h5py))) (package (inherit h5py) - (inputs + (propagated-inputs `(("python2-numpy" ,python2-numpy) ,@(alist-delete "python-numpy" - (package-inputs h5py))))))) + (package-propagated-inputs h5py))))))) (define-public python-lockfile (package |