From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo Famulari Subject: [PATCH 3/5] gnu: python-wheel: Define 'python2-variant'. Date: Tue, 9 Feb 2016 03:11:01 -0500 Message-ID: <9ab0a5111a1fd1d8c3724e1f0b49190174079a6b.1455005066.git.leo@famulari.name> References: Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60783) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3OK-0002Wp-Dx 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 1aT3OH-0001cZ-QP for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:20 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:58678) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3OH-0001ac-Mf for guix-devel@gnu.org; Tue, 09 Feb 2016 03:11:17 -0500 Received: from jasmine.lan (mf54636d0.tmodns.net [208.54.70.245]) by mail.messagingengine.com (Postfix) with ESMTPA id 0B5B1680184 for ; Tue, 9 Feb 2016 03:11:13 -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-wheel)[properties]: New field. (python2-wheel): Use 'strip-python2-variant'. --- gnu/packages/python.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 0a90e48..4d6b1f7 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -2141,16 +2141,16 @@ packages will be properly installed with only the @code{Unpack} step and the unpacked archive preserves enough information to @code{Spread} (copy data and scripts to their final locations) at any later time. Wheel files can be installed with a newer @code{pip} or with wheel's own command line utility.") - (license license:expat))) + (license license:expat) + (properties `((python2-variant . ,(delay python2-wheel)))))) (define-public python2-wheel - (let ((wheel (package-with-python2 python-wheel))) + (let ((wheel (package-with-python2 + (strip-python2-variant python-wheel)))) (package (inherit wheel) - (native-inputs - `(("python2-functools32" ,python2-functools32) - ("python2-jsonschema" ,python2-jsonschema) - ,@(alist-delete "python-jsonschema" - (package-native-inputs wheel))))))) + (native-inputs `(("python2-functools32" ,python2-functools32) + ,@(package-native-inputs wheel)))))) + (define-public python-requests (package -- 2.6.3