[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: |
Thu, 13 Oct 2016 15:20:35 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 20031c68a384132021aa0e856d21e97ae6af756e
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 c886626..aa5a912 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3483,7 +3483,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
"
@@ -3493,11 +3495,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")
- 22/57: gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs., (continued)
- 22/57: gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs., Hartmut Goebel, 2016/10/13
- 46/57: gnu: python-ipython: Fix build, Hartmut Goebel, 2016/10/13
- 06/57: guix: python-build-system: Delete .egg-info file created in phase check., Hartmut Goebel, 2016/10/13
- 05/57: guix: python-build-system: Add helpers for getting and setting PYTHONPATH., Hartmut Goebel, 2016/10/13
- 04/57: guix: python-build-system: Add option "#:use-setuptools?" (default true)., Hartmut Goebel, 2016/10/13
- 08/57: lint: more packages to probably be a native input., Hartmut Goebel, 2016/10/13
- 19/57: gnu: python-pytest-cov: Use upstream options for testing., Hartmut Goebel, 2016/10/13
- 17/57: gnu: scons: Do not use setuptools for building., Hartmut Goebel, 2016/10/13
- 31/57: gnu: python-hdf5: Correct inputs., Hartmut Goebel, 2016/10/13
- 13/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 4a), Hartmut Goebel, 2016/10/13
- 45/57: gnu: python-scipy: Fix build.,
Hartmut Goebel <=
- 27/57: gnu: Ensure python-cython is a native-input., Hartmut Goebel, 2016/10/13
- 20/57: gnu: Fix inputs in python.scm, part 1: inputs -> propagated-inputs., Hartmut Goebel, 2016/10/13
- 53/57: gnu: python-pytest-xdist: Remove needless input python-apipkg., Hartmut Goebel, 2016/10/13
- 52/57: gnu: python-subunit, python-testrepository: Fix inputs, Hartmut Goebel, 2016/10/13
- 41/57: gnu: python2-pysnptools: Correct inputs., Hartmut Goebel, 2016/10/13
- 57/57: Add a series of FIXME and TODO comments., Hartmut Goebel, 2016/10/13
- 55/57: gnu: python-testscenarios: remove needless input "mimetools"., Hartmut Goebel, 2016/10/13
- 11/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 2), Hartmut Goebel, 2016/10/13
- 01/57: gnu: ensure pip and setuptools are installed even for Python 2., Hartmut Goebel, 2016/10/13
- 15/57: gnu: Remove needless inputs python-pip and python2-pip., Hartmut Goebel, 2016/10/13