From mboxrd@z Thu Jan  1 00:00:00 1970
From: Leo Famulari <leo@famulari.name>
Subject: Re: [PATCH 3/5] gnu: python-wheel: Define 'python2-variant'.
Date: Tue, 9 Feb 2016 03:30:36 -0500
Message-ID: <20160209083036.GB29486@jasmine>
References: <cover.1455005066.git.leo@famulari.name>
	<9ab0a5111a1fd1d8c3724e1f0b49190174079a6b.1455005066.git.leo@famulari.name>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:38318)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1aT3jx-000891-F0
	for guix-devel@gnu.org; Tue, 09 Feb 2016 03:33:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1aT3js-0007Ti-Qu
	for guix-devel@gnu.org; Tue, 09 Feb 2016 03:33:39 -0500
Received: from out2-smtp.messagingengine.com ([66.111.4.26]:54979)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <leo@famulari.name>) id 1aT3js-0007Te-NQ
	for guix-devel@gnu.org; Tue, 09 Feb 2016 03:33:36 -0500
Received: from localhost (unknown [172.56.26.115])
	by mail.messagingengine.com (Postfix) with ESMTPA id ECDA6680152
	for <guix-devel@gnu.org>; Tue,  9 Feb 2016 03:33:35 -0500 (EST)
Content-Disposition: inline
In-Reply-To: <9ab0a5111a1fd1d8c3724e1f0b49190174079a6b.1455005066.git.leo@famulari.name>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=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

On Tue, Feb 09, 2016 at 03:11:01AM -0500, Leo Famulari wrote:
> * gnu/packages/python.scm (python-wheel)[properties]: New field.
> (python2-wheel): Use 'strip-python2-variant'.

And this commit message doesn't mention the removal of the special
treatment of python-jsonschema.

> ---
>  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
> 
>