From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: "guix-devel@gnu.org" <guix-devel@gnu.org>
Subject: [PATCH] Fix scipy
Date: Tue, 13 Oct 2015 13:37:34 +0200 [thread overview]
Message-ID: <idjvbabyp6p.fsf@bimsb-sys02.mdc-berlin.net> (raw)
[-- Attachment #1: Type: text/plain, Size: 224 bytes --]
The attached patch fixes python{,2}-scipy. Currently, it does not
propagate Python modules it depends on at runtime, such as numpy.
I suspect that we need to fix many more Python packages in a similar
manner.
~~ Ricardo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-python-scipy-python2-scipy-Propagate-Python-inpu.patch --]
[-- Type: text/x-patch, Size: 2586 bytes --]
From 73199a178d34eb5202906ea7ef6921c09d42ea28 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Tue, 13 Oct 2015 13:29:49 +0200
Subject: [PATCH] gnu: python-scipy, python2-scipy: Propagate Python inputs.
* gnu/packages/python.scm (python-scipy)[inputs]: Move "python-numpy",
"python-matplotlib", and "python-pyparsing" to propagated-inputs; move
"python-nose" and "python-sphinx" to native-inputs.
[propagated-inputs]: New field.
[native-inputs]: Move "python-nose" and "python-sphinx" from inputs
field here.
(python2-scipy): Modify propagated-inputs instead of inputs field.
---
gnu/packages/python.scm | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 72d353d..5c44a92 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3244,16 +3244,17 @@ functions.")
(base32
"0fsqi05s035d7p6s8h3h2pvk1axias16chy17rw9l1bxvrfhmncf"))))
(build-system python-build-system)
- (inputs
+ (propagated-inputs
`(("python-numpy" ,python-numpy)
("python-matplotlib" ,python-matplotlib)
- ("python-pyparsing" ,python-pyparsing)
- ("python-nose" ,python-nose)
- ("python-sphinx" ,python-sphinx)
- ("lapack" ,lapack)
+ ("python-pyparsing" ,python-pyparsing)))
+ (inputs
+ `(("lapack" ,lapack)
("openblas" ,openblas)))
(native-inputs
- `(("gfortran" ,gfortran)
+ `(("python-nose" ,python-nose)
+ ("python-sphinx" ,python-sphinx)
+ ("gfortran" ,gfortran)
("texlive" ,texlive)
("perl" ,perl)))
(outputs '("out" "doc"))
@@ -3322,11 +3323,12 @@ routines such as routines for numerical integration and optimization.")
(let ((scipy (package-with-python2 python-scipy)))
(package (inherit scipy)
;; Use packages customized for python-2.
- (inputs `(("python2-matplotlib" ,python2-matplotlib)
- ("python2-numpy" ,python2-numpy)
- ,@(alist-delete "python-matplotlib"
- (alist-delete "python-numpy"
- (package-inputs scipy))))))))
+ (propagated-inputs
+ `(("python2-matplotlib" ,python2-matplotlib)
+ ("python2-numpy" ,python2-numpy)
+ ,@(alist-delete "python-matplotlib"
+ (alist-delete "python-numpy"
+ (package-propagated-inputs scipy))))))))
(define-public python-sqlalchemy
(package
--
2.1.0
next reply other threads:[~2015-10-13 11:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-13 11:37 Ricardo Wurmus [this message]
2015-10-13 11:41 ` [PATCH] Fix scipy Cyril Roelandt
2015-10-13 14:32 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=idjvbabyp6p.fsf@bimsb-sys02.mdc-berlin.net \
--to=ricardo.wurmus@mdc-berlin.de \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).