From e810de3e68db1e892688dc21a8804df066ff218b Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:23:15 +0200 Subject: gnu: python-m2crypto: python-typing is only needed for python2. * gnu/packages/python-crypto.scm (python-m2crypto)[propagated-inputs]: Remove. [properties]: New field. (python2-m2crypto)[propagated-inputs]: Add PYTHON2-TYPING. --- gnu/packages/python-crypto.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index bda547417c..8bee14c695 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -859,7 +859,6 @@ in userspace) (base32 "1h16gpilrnlzc0iyj1mnd1iqh8wchzjsxjqw9n344glimg2s5zm0")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) - (propagated-inputs `(("python-typing" ,python-typing))) (home-page "https://gitlab.com/m2crypto/m2crypto") (synopsis "Python crypto and TLS toolkit") (description "@code{M2Crypto} is a complete Python wrapper for OpenSSL @@ -869,10 +868,15 @@ extensions to Python's httplib, urllib, and xmlrpclib; unforgeable HMAC'ing AuthCookies for web session management; FTP/TLS client and server; S/MIME; M2Crypto can also be used to provide TLS for Twisted. Smartcards supported through the Engine interface.") + (properties `((python2-variant . ,(delay python2-m2crypto)))) (license license:expat))) (define-public python2-m2crypto - (package-with-python2 python-m2crypto)) + (let ((m2crypto (package-with-python2 + (strip-python2-variant python-m2crypto)))) + (package (inherit m2crypto) + (propagated-inputs + `(("python2-typing" ,python2-typing)))))) (define-public python-pylibscrypt (package -- cgit v1.2.3 From cb61baf0e72e0756c3386acb0d7745c507daa3ac Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 22 Oct 2018 18:24:28 +0200 Subject: gnu: python-m2crypto: Update to 0.30.1. * gnu/packages/python-crypto.scm (python-m2crypto): Update to 0.30.1. --- gnu/packages/python-crypto.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/python-crypto.scm') diff --git a/gnu/packages/python-crypto.scm b/gnu/packages/python-crypto.scm index 8bee14c695..f71b8a3467 100644 --- a/gnu/packages/python-crypto.scm +++ b/gnu/packages/python-crypto.scm @@ -850,13 +850,13 @@ in userspace) (define-public python-m2crypto (package (name "python-m2crypto") - (version "0.29.0") + (version "0.30.1") (source (origin (method url-fetch) (uri (pypi-uri "M2Crypto" version)) (sha256 - (base32 "1h16gpilrnlzc0iyj1mnd1iqh8wchzjsxjqw9n344glimg2s5zm0")))) + (base32 "1iizrpkn4c2n70nvcjqlmnk6fz3vddkrjmwavz1zlsnwv8f7bcm1")))) (build-system python-build-system) (inputs `(("openssl" ,openssl))) (home-page "https://gitlab.com/m2crypto/m2crypto") -- cgit v1.2.3