On Tue, 9 Feb 2016 03:10:59 -0500 Leo Famulari <l...@famulari.name> wrote:
> * gnu/packages/python.scm (python-cryptography)[properties]: New field. > (python2-cryptography): Use 'strip-python2-variant'. > --- > gnu/packages/python.scm | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) > > diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm > index 5b988c1..982de40 100644 > --- a/gnu/packages/python.scm > +++ b/gnu/packages/python.scm > @@ -2334,11 +2334,8 @@ OAuth request-signing logic.") > (let ((base (package-with-python2 python-oauthlib))) > (package > (inherit base) > - (inputs > - `(("python2-unittest2" ,python2-unittest2) > - ("python2-cryptography" ,python2-cryptography) > - ,@(alist-delete "python-cryptography" > - (package-inputs base))))))) > + (inputs `(("python2-unittest2" ,python2-unittest2) > + ,@(package-inputs base)))))) > > (define-public python-itsdangerous > (package > @@ -5821,10 +5818,12 @@ library” for Python. The package includes both high > level recipes, and low > level interfaces to common cryptographic algorithms such as symmetric > ciphers, > message digests and key derivation functions.") > ;; Distributed under either BSD-3 or ASL2.0 > - (license (list bsd-3 asl2.0)))) > + (license (list bsd-3 asl2.0)) > + (properties `((python2-variant . ,(delay python2-cryptography)))))) > > (define-public python2-cryptography > - (let ((crypto (package-with-python2 python-cryptography))) > + (let ((crypto (package-with-python2 > + (strip-python2-variant python-cryptography)))) > (package (inherit crypto) > (propagated-inputs > `(("python2-ipaddress" ,python2-ipaddress) > @@ -5881,12 +5880,7 @@ library.") > (license asl2.0))) > > (define-public python2-pyopenssl > - (let ((pyopenssl (package-with-python2 python-pyopenssl))) > - (package (inherit pyopenssl) > - (propagated-inputs > - `(("python2-cryptography" ,python2-cryptography) > - ,@(alist-delete "python-cryptography" > - (package-propagated-inputs pyopenssl))))))) > + (package-with-python2 python-pyopenssl)) > > (define-public python-pip > (package This one looks good to me -- Efraim Flashner <efr...@flashner.co.il> אפרים פלשנר GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351 Confidentiality cannot be guaranteed on emails sent or received unencrypted
pgp4jjJJ5Pa7K.pgp
Description: OpenPGP digital signature