diff options
| author | pjotrp | 2016-03-18 21:25:57 -0500 |
|---|---|---|
| committer | pjotrp | 2016-03-18 21:25:57 -0500 |
| commit | e9a4fd0b609d4d1ff6b3a622d4f590d092e6def8 (patch) | |
| tree | c24b0a2dd7a78919b6ab3a417c3ecfbd5850b5bc /gn/packages/python.scm | |
| parent | 364d11268ecea6bf31a48a7942b4c599dc386212 (diff) | |
| parent | 97f4e53b34e818c06f394e5272a51fbce6589d2f (diff) | |
| download | guix-bioinformatics-e9a4fd0b609d4d1ff6b3a622d4f590d092e6def8.tar.gz | |
Merge branch 'master' into dennis
Diffstat (limited to 'gn/packages/python.scm')
| -rw-r--r-- | gn/packages/python.scm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gn/packages/python.scm b/gn/packages/python.scm index 7781521..47b2c23 100644 --- a/gn/packages/python.scm +++ b/gn/packages/python.scm @@ -279,16 +279,14 @@ powerful language for representing information.") (base32 "06qzgwk7j66k8ggx51i6wxx0f0zsppp7w4bh6gjd0cr9rfs86jn7")))) (build-system python-build-system) - (inputs + (propagated-inputs `( ("mysql" ,mysql) ("python-nose" ,python-nose) ("zlib" ,zlib) ("openssl" ,openssl) ("libgcrypt" ,libgcrypt) - )) - (propagated-inputs - `(("python-setuptools" ,python-setuptools) + ("python-setuptools" ,python-setuptools) )) (arguments `(#:tests? #f)) ; wants a running MySQL server @@ -357,7 +355,7 @@ project)") (description #f) (license #f))) -(define-public python2-pil-1.1.6 +(define-public python2-pil (package (name "python2-pil") (version "1.1.6") @@ -434,6 +432,8 @@ version ".tgz")) (build-system python-build-system) (native-inputs `(("python2-setuptools" ,python2-setuptools))) + (propagated-inputs + `(("python2-pil" ,python2-pil))) (arguments `( #:python ,python-2 |