From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 1/5] gnu: python-cryptography: Define 'python2-variant'. Date: Tue, 9 Feb 2016 03:10:59 -0500 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60786) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3OK-0002Wr-Ee for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT3OI-0001d6-9T for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:20 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3OH-0001a7-0h for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:18 -0500 Received: from jasmine.lan (mf54636d0.tmodns.net [208.54.70.245]) by mail.messagingengine.com (Postfix) with ESMTPA id EBF48680184 for ; Tue, 9 Feb 2016 03:11:12 -0500 (EST) In-Reply-To: In-Reply-To: References: List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * 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