[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
46/103: gnu: python-scipy: Fix build.
From: |
Hartmut Goebel |
Subject: |
46/103: gnu: python-scipy: Fix build. |
Date: |
Tue, 25 Oct 2016 18:00:38 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 719c4248734698d79b7af3c6bdeb541348d547d1
Author: Hartmut Goebel <address@hidden>
Date: Sun Oct 9 16:05:24 2016 +0200
gnu: python-scipy: Fix build.
* gnu/packages/python.scm (python-scipy) Use add-installed-pythonpath. Add
dummy newlines character to string to make emacs happy.
---
gnu/packages/python.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 254fd6a..14250dc 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3489,7 +3489,9 @@ functions.")
libraries = openblas
library_dirs = ~a/lib
include_dirs = ~a/include
-[atlas]
+
+# backslash-n to make emacs happy
+\n[atlas]
library_dirs = ~a/lib
atlas_libs = openblas
"
@@ -3499,11 +3501,14 @@ atlas_libs = openblas
#t)
(alist-cons-after
'install 'install-doc
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((data (string-append (assoc-ref outputs "doc") "/share"))
(doc (string-append data "/doc/" ,name "-" ,version))
(html (string-append doc "/html"))
(pyver ,(string-append "PYVER=")))
+ ;; Make installed package available for building the
+ ;; documentation
+ (add-installed-pythonpath inputs outputs)
(with-directory-excursion "doc"
;; Fix generation of images for mathematical expressions.
(substitute* (find-files "source" "conf\\.py")
- 33/103: gnu: python-fixture: Correct inputs., (continued)
- 33/103: gnu: python-fixture: Correct inputs., Hartmut Goebel, 2016/10/25
- 84/103: gnu: python-sphinxcontrib-programoutput: Remove needless input., Hartmut Goebel, 2016/10/25
- 66/103: gnu: python-scikit-image: Correct inputs., Hartmut Goebel, 2016/10/25
- 92/103: gnu: python-testlib: Remove useless self-defined phase "unpack"., Hartmut Goebel, 2016/10/25
- 90/103: gnu: python-nautilus: Correct inputs, Hartmut Goebel, 2016/10/25
- 79/103: gnu: python-urllib3: update comment., Hartmut Goebel, 2016/10/25
- 78/103: gnu: python-wsgi-intercept: Correct inputs., Hartmut Goebel, 2016/10/25
- 101/103: Add a series of FIXME and TODO comments., Hartmut Goebel, 2016/10/25
- 95/103: gnu: python2-pbcore: Fix inputs:, Hartmut Goebel, 2016/10/25
- 100/103: gnu: python-scikit-learn: Remove useless property "python2-variant"., Hartmut Goebel, 2016/10/25
- 46/103: gnu: python-scipy: Fix build.,
Hartmut Goebel <=
- 87/103: gnu: python-prompt-toolkit: Correct inputs, Hartmut Goebel, 2016/10/25
- 86/103: gnu: python-pika: Correct input., Hartmut Goebel, 2016/10/25
- 96/103: gnu: python-pytest-django: Remove needless propagated input "python-py"., Hartmut Goebel, 2016/10/25