diff options
| author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-09-28 13:57:21 +0200 |
|---|---|---|
| committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-11-15 22:28:59 +0100 |
| commit | 5c31f4aa7c11fcf720c0ce0e26d55788e2df1044 (patch) | |
| tree | edfc0e7f53c478a9c15f4f1c15e24c2a10cdd194 /gnu/packages/openstack.scm | |
| parent | 00e10c6e674f0f292d5821bc4a513d48f4d1d164 (diff) | |
| download | patches-5c31f4aa7c11fcf720c0ce0e26d55788e2df1044.tar patches-5c31f4aa7c11fcf720c0ce0e26d55788e2df1044.tar.gz | |
gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a)
This patch contains the changes for all modules beside python.scm where
setuptools are used in an inherited package and removing this input also
removes the need for inheriting the package. This is the case if adding
setuptools in the inherited package was the only change.
Change this to not inherit and remove the new needless call to
"strip-python2-variant (if applicable).
* gnu/packages/bioinformatics.scm (python-biopython, python2-biopython,
python-twobitreader, python2-twobitreader,
python-plastid, python2-plastid,
python2-pybigwig,
python2-screed,
sra-tools): No longer "inherit" Python 2 packages
inheriting from a Python 3 package if the sole reason for inheriting was
adding python-setuptools respective python2-setuptools to [inputs],
[native-inputs] or [propagated-inputs]. Remove now needless [properties]
"python2-variant" where applicable.
* gnu/packages/django.scm (python-pytest-django, python2-pytest-django,
python-django-filter, python2-django-filter): Likewise.
* gnu/packages/gnupg.scm (python2-pygpgme): Likewise.
* gnu/packages/mail.scm (python-mailmanclient, python2-mailmanclient):
Likewise.
* gnu/packages/mpd.scm (python-msp, python2-mpd2): Likewise.
* gnu/packages/music.scm (python-pylast, python2-pylast): Likewise.
* gnu/packages/openstack.scm (python-requests-mock, python2-requests-mock,
python2-git-review): Likewise.
* gnu/packages/password-utils.scm (python2-bcrypt): Likewise.
* gnu/packages/protobuf.scm (python-protobuf, python2-protobuf): Likewise.
* gnu/packages/statistics.scm (python-patsy, python2-patsy): Likewise.
* gnu/packages/web.scm (python2-feedparser): Likewise.
Diffstat (limited to 'gnu/packages/openstack.scm')
| -rw-r--r-- | gnu/packages/openstack.scm | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 930ce9eceb..8cf3b957a7 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -261,16 +261,10 @@ tested on Python version 3.2, 2.7 and 2.6.") (description "This module provides a building block to stub out the HTTP requests portions of your testing code.") - (license asl2.0) - (properties `((python2-variant . ,(delay python2-requests-mock)))))) + (license asl2.0))) (define-public python2-requests-mock - (let ((base (package-with-python2 - (strip-python2-variant python-requests-mock)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-requests-mock)) (define-public python-stevedore (package @@ -808,8 +802,4 @@ Gerrit for review, or fetching existing ones.") (license asl2.0))) (define-public python2-git-review - (let ((base (package-with-python2 (strip-python2-variant python-git-review)))) - (package (inherit base) - (native-inputs - `(("python2-setuptools" ,python2-setuptools) - ,@(package-native-inputs base)))))) + (package-with-python2 python-git-review)) |