diff options
| author | Ben Woodcroft <donttrustben@gmail.com> | 2016-04-03 21:09:17 +1000 |
|---|---|---|
| committer | Ben Woodcroft <donttrustben@gmail.com> | 2016-04-03 21:09:17 +1000 |
| commit | e25f017422899c3e43cf42e254f46053bf4c4243 (patch) | |
| tree | d42dbc0e277ed3ae65c2103aceea792da2d390f4 /gnu/packages/openstack.scm | |
| parent | 692add53bcde80359c20ce17ae7b86aea18f5a21 (diff) | |
gnu: Remove duplicate python-pbr.
This is a follow-up to commit 1ef09c0c75c61fd70a84667a845a652995b38a94.
* gnu/packages/openstack.scm (python-pbr, python2-pbr): Move from here ...
* gnu/packages/python.scm: ... to here.
(python-pbr, python2-pbr): Delete duplicate packages.
Diffstat (limited to 'gnu/packages/openstack.scm')
| -rw-r--r-- | gnu/packages/openstack.scm | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 0fa488f8428..947abf31a48 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | (define-module (gnu packages openstack) | 20 | (define-module (gnu packages openstack) |
| 21 | #:use-module (gnu packages python) | 21 | #:use-module (gnu packages python) |
| 22 | #:use-module (gnu packages tls) | 22 | #:use-module (gnu packages tls) |
| 23 | #:use-module (gnu packages version-control) | ||
| 24 | #:use-module (guix build-system python) | 23 | #:use-module (guix build-system python) |
| 25 | #:use-module (guix download) | 24 | #:use-module (guix download) |
| 26 | #:use-module ((guix licenses) | 25 | #:use-module ((guix licenses) |
| @@ -235,48 +234,6 @@ tested on Python version 3.2, 2.7 and 2.6.") | |||
| 235 | (define-public python2-os-testr | 234 | (define-public python2-os-testr |
| 236 | (package-with-python2 python-os-testr)) | 235 | (package-with-python2 python-os-testr)) |
| 237 | 236 | ||
| 238 | (define-public python-pbr | ||
| 239 | (package | ||
| 240 | (name "python-pbr") | ||
| 241 | (version "1.8.1") | ||
| 242 | (source | ||
| 243 | (origin | ||
| 244 | (method url-fetch) | ||
| 245 | (uri (string-append | ||
| 246 | "https://pypi.python.org/packages/source/p/pbr/pbr-" | ||
| 247 | version | ||
| 248 | ".tar.gz")) | ||
| 249 | (sha256 | ||
| 250 | (base32 | ||
| 251 | "0jcny36cf3s8ar5r4a575npz080hndnrfs4np1fqhv0ym4k7c4p2")))) | ||
| 252 | (build-system python-build-system) | ||
| 253 | (arguments | ||
| 254 | `(#:tests? #f)) ;; Most tests seem to use the Internet. | ||
| 255 | (propagated-inputs | ||
| 256 | `(("python-testrepository" ,python-testrepository) | ||
| 257 | ("git" ,git))) ;; pbr actually uses the "git" binary. | ||
| 258 | (inputs | ||
| 259 | `(("python-fixtures" ,python-fixtures) | ||
| 260 | ("python-mimeparse" ,python-mimeparse) | ||
| 261 | ("python-mock" ,python-mock) | ||
| 262 | ("python-setuptools" ,python-setuptools) | ||
| 263 | ("python-six" ,python-six) | ||
| 264 | ("python-sphinx" ,python-sphinx) | ||
| 265 | ("python-testrepository" ,python-testrepository) | ||
| 266 | ("python-testresources" ,python-testresources) | ||
| 267 | ("python-testscenarios" ,python-testscenarios) | ||
| 268 | ("python-testtools" ,python-testtools) | ||
| 269 | ("python-virtualenv" ,python-virtualenv))) | ||
| 270 | (home-page "https://launchpad.net/pbr") | ||
| 271 | (synopsis "Change the default behavior of Python’s setuptools") | ||
| 272 | (description | ||
| 273 | "Python Build Reasonableness (PBR) is a library that injects some useful | ||
| 274 | and sensible default behaviors into your setuptools run.") | ||
| 275 | (license asl2.0))) | ||
| 276 | |||
| 277 | (define-public python2-pbr | ||
| 278 | (package-with-python2 python-pbr)) | ||
| 279 | |||
| 280 | (define-public python-requests-mock | 237 | (define-public python-requests-mock |
| 281 | (package | 238 | (package |
| 282 | (name "python-requests-mock") | 239 | (name "python-requests-mock") |
