diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2016-01-18 12:54:52 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2016-01-18 17:23:37 +0200 |
| commit | 264ae686fae658c90716632715846d34aa61b9f3 (patch) | |
| tree | 64747a8f5d5543dd7f40e500a075693b2d527f0e /gnu/packages/python.scm | |
| parent | 058247efff39d28c5f3b81351f3d35522b10730c (diff) | |
| download | guix-264ae686fae658c90716632715846d34aa61b9f3.tar.gz | |
python2-jsonschema: Add python2-functools32 to inputs.
* gnu/packages/python.scm (python2-jsonschema)[inputs]: Add python2-functools32. (python2-wheel)[native-inputs]: Specify python2-jsonschema. Add python2-functools32. (python2-requests)[propagated-inputs]: Specify python2-wheel. (python2-ipython)[inputs]: Specify python2-jsonschema, python2-requests. (python2-rauth)[propagated-inputs]: Specify python2-requests. * gnu/packages/openstack.scm (python2-requests-mock)[propagated-inputs]: Specify python2-requests. (python2-tempest-lib)[propagated-inputs]: Specify python2-jsonschema. (python2-oslosphinx)[propagated-inputs]: Specify python2-requests. (python2-keystoneclient)[porpagated-inputs]: Specify python2-requests. [native-inputs]: Specify python2-oslosphinx, python2-requests-mock, python2-tempest-lib. (python2-swiftclient)[propagated-inputs]: Specify python2-requests, python2-oslosphinx.
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index a1757a08fc..813711a9b6 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -14,7 +14,7 @@ ;;; Copyright © 2015 Leo Famulari <leo@famulari.name> ;;; Copyright © 2015 Ben Woodcroft <donttrustben@gmail.com> ;;; Copyright © 2015, 2016 Erik Edrosa <erik.edrosa@gmail.com> -;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il> +;;; Copyright © 2015, 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2015 Kyle Meyer <kyle@kyleam.com> ;;; Copyright © 2015 Chris Marusich <cmmarusich@gmail.com> ;;; @@ -2144,7 +2144,13 @@ installed with a newer @code{pip} or with wheel's own command line utility.") (license license:expat))) (define-public python2-wheel - (package-with-python2 python-wheel)) + (let ((wheel (package-with-python2 python-wheel))) + (package (inherit wheel) + (native-inputs + `(("python2-functools32" ,python2-functools32) + ("python2-jsonschema" ,python2-jsonschema) + ,@(alist-delete "python-jsonschema" + (package-native-inputs wheel))))))) (define-public python-requests (package @@ -2184,7 +2190,12 @@ than Python’s urllib2 library.") "0gdr9dxm24amxpbyqpbh3lbwxc2i42hnqv50sigx568qssv3v2ir")))))) (define-public python2-requests - (package-with-python2 python-requests)) + (let ((requests (package-with-python2 python-requests))) + (package (inherit requests) + (propagated-inputs + `(("python2-wheel" ,python2-wheel) + ,@(alist-delete "python-wheel" + (package-propagated-inputs requests))))))) (define-public python-vcversioner (package @@ -2234,7 +2245,11 @@ version numbers.") (license license:expat))) (define-public python2-jsonschema - (package-with-python2 python-jsonschema)) + (let ((jsonschema (package-with-python2 python-jsonschema))) + (package (inherit jsonschema) + (inputs + `(("python2-functools32" ,python2-functools32) + ,@(package-inputs jsonschema)))))) (define-public python-unidecode (package @@ -4290,11 +4305,13 @@ computing.") ,@(alist-delete "python-terminado" (package-propagated-inputs ipython)))) (inputs - `(("python2-mock" ,python2-mock) + `(("python2-jsonschema" ,python2-jsonschema) + ("python2-mock" ,python2-mock) ("python2-matplotlib" ,python2-matplotlib) ("python2-numpy" ,python2-numpy) + ("python2-requests" ,python2-requests) ,@(fold alist-delete (package-inputs ipython) - '("python-matplotlib" "python-numpy"))))))) + '("python-jsonschema" "python-matplotlib" "python-numpy" "python-requests"))))))) (define-public python-isodate (package @@ -7144,6 +7161,7 @@ authenticated session objects providing things like keep-alive.") (define-public python2-rauth (let ((rauth (package-with-python2 python-rauth))) (package (inherit rauth) + (propagated-inputs `(("python2-requests" ,python2-requests))) (native-inputs `(("python2-unittest2", python2-unittest2) ,@(package-native-inputs rauth)))))) |