summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2016-04-24 20:31:23 +0300
committerEfraim Flashner <efraim@flashner.co.il>2016-04-24 20:31:23 +0300
commit59f151ec54fab4822cd0c41cfc99ed3614d67239 (patch)
tree1453bfd761e4a45b5ae09a9021693fb773ab9173
parent79b555edeb469b4d92ef31b66d9b5961001e1a68 (diff)
downloadguix-59f151ec54fab4822cd0c41cfc99ed3614d67239.tar.gz
gnu: python2-oauthlib: Use python2-variant.
* gnu/packages/python.scm (python2-oauthlib): Use 'strip-python2-variant'.
[native-inputs]: Add python2-setuptools.
(python-oauthlib)[inputs]: Remove python-setuptools.
[properties]: Define python2-variant for python2-oauthlib.
-rw-r--r--gnu/packages/python.scm16
1 files changed, 7 insertions, 9 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 0379352f76..296f51ab59 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -2364,8 +2364,7 @@ somewhat intelligeble.")
                 "1bfrj70vdjxjw74khbyh6f0dksv7p5rh2346jnlrffyacd3gwjzg"))))
     (build-system python-build-system)
     (native-inputs
-     `(("python-setuptools" ,python-setuptools)
-       ("python-coverage" ,python-coverage)
+     `(("python-coverage" ,python-coverage)
        ("python-nose" ,python-nose)
        ("python-mock" ,python-mock)))
     (inputs
@@ -2377,17 +2376,16 @@ somewhat intelligeble.")
     (description
      "Oauthlib is a generic, spec-compliant, thorough implementation of the
 OAuth request-signing logic.")
-    (license bsd-3)))
+    (license bsd-3)
+    (properties `((python2-variant . ,(delay python2-oauthlib))))))
 
 (define-public python2-oauthlib
-  (let ((base (package-with-python2 python-oauthlib)))
+  (let ((base (package-with-python2 (strip-python2-variant python-oauthlib))))
     (package
       (inherit base)
-      (inputs
-       `(("python2-unittest2" ,python2-unittest2)
-         ("python2-cryptography" ,python2-cryptography)
-         ,@(alist-delete "python-cryptography"
-	                 (package-inputs base)))))))
+      (native-inputs `(("python2-setuptools" ,python2-setuptools)
+                       ("python2-unittest2" ,python2-unittest2)
+                       ,@(package-native-inputs base))))))
 
 (define-public python-itsdangerous
   (package