[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
45/57: gnu: python-scipy: Fix build.
From: |
Hartmut Goebel |
Subject: |
45/57: gnu: python-scipy: Fix build. |
Date: |
Sat, 15 Oct 2016 14:08:15 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 00dee16e68bb45c2184a98e8ba04337664d12110
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 b717da1..93baf06 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3488,7 +3488,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
"
@@ -3498,11 +3500,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 outputs inputs)
(with-directory-excursion "doc"
;; Fix generation of images for mathematical expressions.
(substitute* (find-files "source" "conf\\.py")
- 26/57: make native-inputs: simple ones: one nose, docuitls, phinx, tests, …, (continued)
- 26/57: make native-inputs: simple ones: one nose, docuitls, phinx, tests, …, Hartmut Goebel, 2016/10/15
- 21/57: gnu: Fix inputs in python.scm, part 2: inputs -> native-inputs., Hartmut Goebel, 2016/10/15
- 16/57: gnu: Remove work-arounds for bug 20765 (ensure uncompressed eggs)., Hartmut Goebel, 2016/10/15
- 37/57: gnu: python-pillow: Fix build., Hartmut Goebel, 2016/10/15
- 25/57: some inputs -> propagated-inputs, Hartmut Goebel, 2016/10/15
- 13/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a), Hartmut Goebel, 2016/10/15
- 36/57: gnu: python-singledispatch: correct inputs., Hartmut Goebel, 2016/10/15
- 39/57: gnu: python-zope-schema: Add missing inputs., Hartmut Goebel, 2016/10/15
- 40/57: gnu: python-zope-testing: Remove needless input., Hartmut Goebel, 2016/10/15
- 47/57: gnu: vdirsyncer: Fix build by setting correct PYTHONPATH., Hartmut Goebel, 2016/10/15
- 45/57: gnu: python-scipy: Fix build.,
Hartmut Goebel <=
- 49/57: gnu: openstack: Correct inputs., Hartmut Goebel, 2016/10/15
- 14/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4b), Hartmut Goebel, 2016/10/15
- 11/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2), Hartmut Goebel, 2016/10/15
- 41/57: gnu: python2-pysnptools: Correct inputs., Hartmut Goebel, 2016/10/15
- 46/57: gnu: python-ipython: Fix build, Hartmut Goebel, 2016/10/15
- 50/57: gnu: python-pandas: Fix build., Hartmut Goebel, 2016/10/15
- 48/57: gnu: thefuck: Fix build., Hartmut Goebel, 2016/10/15
- 35/57: gnu: python-pbr: Rework bootstrapping., Hartmut Goebel, 2016/10/15
- 51/57: gnu: python-scripttest: Correct inputs., Hartmut Goebel, 2016/10/15
- 52/57: gnu: python-subunit, python-testrepository: Fix inputs, Hartmut Goebel, 2016/10/15