From: Leo Famulari <leo@famulari.name>
To: guix-devel@gnu.org
Subject: [PATCH 1/5] gnu: python-cryptography: Define 'python2-variant'.
Date: Tue, 9 Feb 2016 03:10:59 -0500 [thread overview]
Message-ID: <faf7f2b349434705959afd07658308a925a97c19.1455005066.git.leo@famulari.name> (raw)
In-Reply-To: <cover.1455005066.git.leo@famulari.name>
In-Reply-To: <cover.1455005066.git.leo@famulari.name>
* 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
--
2.6.3
next prev parent reply other threads:[~2016-02-09 8:11 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 8:10 [PATCH 0/5] python2-variants Leo Famulari
2016-02-09 8:10 ` Leo Famulari [this message]
2016-02-11 19:05 ` [PATCH 1/5] gnu: python-cryptography: Define 'python2-variant' Efraim Flashner
2016-02-09 8:11 ` [PATCH 2/5] gnu: python-jsonschema: " Leo Famulari
2016-02-10 21:21 ` Ludovic Courtès
2016-02-11 19:10 ` Efraim Flashner
2016-02-09 8:11 ` [PATCH 3/5] gnu: python-wheel: " Leo Famulari
2016-02-09 8:30 ` Leo Famulari
2016-02-10 21:22 ` Ludovic Courtès
2016-02-11 19:13 ` Efraim Flashner
2016-02-09 8:11 ` [PATCH 4/5] gnu: python-requests: " Leo Famulari
2016-02-09 8:29 ` Leo Famulari
2016-02-10 21:23 ` Ludovic Courtès
2016-02-11 19:14 ` Efraim Flashner
2016-02-09 8:11 ` [PATCH 5/5] gnu: Split acme into python-acme and python2-acme Leo Famulari
2016-02-10 21:24 ` Ludovic Courtès
2016-02-10 21:21 ` [PATCH 0/5] python2-variants Ludovic Courtès
2016-02-12 23:56 ` Leo Famulari
2016-02-13 21:26 ` Efraim Flashner
2016-02-11 19:07 ` Efraim Flashner
2016-02-12 2:34 ` Leo Famulari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=faf7f2b349434705959afd07658308a925a97c19.1455005066.git.leo@famulari.name \
--to=leo@famulari.name \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.