Federico Beffa <be...@ieee.org> skribis:
> From 6673a353080fd4b5136553624a7d777d243fc9a2 Mon Sep 17 00:00:00 2001
> From: Federico Beffa <be...@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
> + (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 ‘python’ to ‘propagated-inputs’,
which would also have taken care of sub-directories other than lib/.
As a side-effect, it would also pull in the ‘python3’, ‘pydoc3’,
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’.
