From mboxrd@z Thu Jan  1 00:00:00 1970
From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=)
Subject: Re: [PATCH 1/2] gnu: Add numpy
Date: Wed, 29 Oct 2014 23:11:58 +0100
Message-ID: <87sii6h6fl.fsf@gnu.org>
References: <CAKrPhPPEsgc4yrVaFFHSfDu0CpV1DABkcTTHcP_H9w=d1u4eBQ@mail.gmail.com>
	<CAKrPhPPEgfGOFW-mOX=YAbxq-AGL4zMp_cqE27ZMi=Dd4ygyTg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47397)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1XjbSz-0006b6-MG
	for guix-devel@gnu.org; Wed, 29 Oct 2014 18:11:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <ludo@gnu.org>) id 1XjbSu-0000ZC-Uo
	for guix-devel@gnu.org; Wed, 29 Oct 2014 18:11:45 -0400
Received: from hera.aquilenet.fr ([2a01:474::1]:45266)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <ludo@gnu.org>)
	id 1XjbSu-0000Z5-NX
	for guix-devel@gnu.org; Wed, 29 Oct 2014 18:11:40 -0400
In-Reply-To: <CAKrPhPPEgfGOFW-mOX=YAbxq-AGL4zMp_cqE27ZMi=Dd4ygyTg@mail.gmail.com>
	(Federico Beffa's message of "Wed, 29 Oct 2014 20:55:52 +0100")
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: Federico Beffa <beffa@ieee.org>
Cc: Guix-devel <guix-devel@gnu.org>

Federico Beffa <beffa@ieee.org> skribis:

> From 6673a353080fd4b5136553624a7d777d243fc9a2 Mon Sep 17 00:00:00 2001
> From: Federico Beffa <beffa@fbengineering.ch>
> Date: Wed, 29 Oct 2014 20:44:33 +0100
> Subject: [PATCH] gnu: Add numpy.
>
> * gnu/packages/python.scm (python-numpy, python2-numpy): New variables.
>   (python-wrapper): Add symlink to python lib directory.

Sorry for the delay and for the extra round trip.

Could you make the python-wrapper change a separate patch?

> +++ b/gnu/packages/python.scm
> @@ -227,14 +227,18 @@ data types.")
>           (begin
>             (use-modules (guix build utils))
>             (let ((bin (string-append (assoc-ref %outputs "out") "/bin"))
> -                 (python (string-append (assoc-ref %build-inputs "python=
") "/bin/")))
> +                 (python (string-append (assoc-ref %build-inputs "python=
") "/bin/"))
> +                 (lib (string-append (assoc-ref %outputs "out") "/lib"))
> +                 (python-lib (string-append=20
> +                              (assoc-ref %build-inputs "python") "/lib/"=
)))
>                  (mkdir-p bin)
>                  (for-each
>                    (lambda (old new)
>                      (symlink (string-append python old)
>                               (string-append bin "/" new)))
>                    `("python3", "pydoc3", "idle3")
> -                  `("python",  "pydoc",  "idle"))))))
> +                  `("python",  "pydoc",  "idle"))
> +                (symlink python-lib lib)))))

The other option would have been to add =E2=80=98python=E2=80=99 to =E2=80=
=98propagated-inputs=E2=80=99,
which would also have taken care of sub-directories other than lib/.

As a side-effect, it would also pull in the =E2=80=98python3=E2=80=99, =E2=
=80=98pydoc3=E2=80=99,
etc. commands, but I think it cannot hurt.

WDYT?

> +(define python2-numpy-reference python-numpy-reference)
> +
> +(define python2-numpy-userguide python-numpy-userguide)

These variables are unused and not needed, so they can be removed.

Thanks,
Ludo=E2=80=99.