[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/04: gnu: python-jsonschema: Define 'python2-variant'.
From: |
Leo Famulari |
Subject: |
02/04: gnu: python-jsonschema: Define 'python2-variant'. |
Date: |
Fri, 12 Feb 2016 23:56:18 +0000 |
lfam pushed a commit to branch master
in repository guix.
commit a14600ecfa6d4304418cda8668dfefdc2c1ce715
Author: Leo Famulari <address@hidden>
Date: Tue Feb 9 01:44:45 2016 -0500
gnu: python-jsonschema: Define 'python2-variant'.
* gnu/packages/python.scm (python-jsonschema)[properties]: New field.
(python2-jsonschema): Use 'strip-python2-variant'.
* gnu/packages/openstack.scm (python2-tempest-lib): Take the result of
'package-with-python2' directly.
---
gnu/packages/openstack.scm | 7 +------
gnu/packages/python.scm | 6 ++++--
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm
index e258b89..9a42a91 100644
--- a/gnu/packages/openstack.scm
+++ b/gnu/packages/openstack.scm
@@ -392,12 +392,7 @@ common features used in Tempest.")
(license asl2.0)))
(define-public python2-tempest-lib
- (let ((tempest-lib (package-with-python2 python-tempest-lib)))
- (package (inherit tempest-lib)
- (propagated-inputs
- `(("python2-jsonschema", python2-jsonschema)
- ,@(alist-delete "python-jsonschema"
- (package-propagated-inputs tempest-lib)))))))
+ (package-with-python2 python-tempest-lib))
;; Packages from the Oslo library
(define-public python-oslo.config
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index fc8582f..f444cdb 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2241,10 +2241,12 @@ version numbers.")
(synopsis "Implementation of JSON Schema for Python")
(description
"Jsonschema is an implementation of JSON Schema for Python.")
- (license license:expat)))
+ (license license:expat)
+ (properties `((python2-variant . ,(delay python2-jsonschema))))))
(define-public python2-jsonschema
- (let ((jsonschema (package-with-python2 python-jsonschema)))
+ (let ((jsonschema (package-with-python2
+ (strip-python2-variant python-jsonschema))))
(package (inherit jsonschema)
(inputs
`(("python2-functools32" ,python2-functools32)