[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 17:44:41 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit a2c836b479ed055b0370dbed24453399cef8ecbb
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 479a598..fd527b2 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")
- 71/103: gnu: Add python-rst.linker, python2-rst.linker., (continued)
- 71/103: gnu: Add python-rst.linker, python2-rst.linker., Hartmut Goebel, 2016/10/25
- 72/103: gnu: python-pathpy: Build documentation., Hartmut Goebel, 2016/10/25
- 88/103: gnu: python-consul: Correct inputs., Hartmut Goebel, 2016/10/25
- 62/103: gnu: python-joblib: Remove python byte-code files from source., Hartmut Goebel, 2016/10/25
- 67/103: gnu: python2-scikit-image: Remove needless propagated-input., Hartmut Goebel, 2016/10/25
- 56/103: gnu: python-testscenarios: remove needless input "mimetools"., Hartmut Goebel, 2016/10/25
- 63/103: gnu: python-joblib: Add comment., Hartmut Goebel, 2016/10/25
- 47/103: gnu: python-ipython: Fix build., Hartmut Goebel, 2016/10/25
- 52/103: gnu: python-scripttest: Correct inputs., Hartmut Goebel, 2016/10/25
- 45/103: gnu: python-matplotlib: Fix build., Hartmut Goebel, 2016/10/25
- 46/103: gnu: python-scipy: Fix build.,
Hartmut Goebel <=
- 54/103: gnu: python-pytest-xdist: Remove needless input python-apipkg., Hartmut Goebel, 2016/10/25
- 50/103: gnu: openstack: Correct inputs., Hartmut Goebel, 2016/10/25
- 44/103: gnu: python-numpy-bootstrap, python-numpy: Fix build., Hartmut Goebel, 2016/10/25
- 59/103: gnu: python-cov-core: Fix imports., Hartmut Goebel, 2016/10/25
- 60/103: gnu: python-pyjwt: Add missing inputs and enable test-suite., Hartmut Goebel, 2016/10/25
- 64/103: gnu: python-feedgenerator: Remove python byte-code files from source., Hartmut Goebel, 2016/10/25
- 36/103: gnu: python-pbr: Rework bootstrapping., Hartmut Goebel, 2016/10/25
- 61/103: gnu: python-oauthlib, python-oauthlib2: Correct inputs., Hartmut Goebel, 2016/10/25
- 65/103: gnu: python-blinker: No longer disable tests., Hartmut Goebel, 2016/10/25
- 66/103: gnu: python-scikit-image: Correct inputs., Hartmut Goebel, 2016/10/25