[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
44/57: gnu: python-matplotlib: Fix build.
From: |
Hartmut Goebel |
Subject: |
44/57: gnu: python-matplotlib: Fix build. |
Date: |
Sat, 15 Oct 2016 14:08:14 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit a51fa1032cbfdcfb3fce71b4af510e01ca8fbc20
Author: Hartmut Goebel <address@hidden>
Date: Sun Oct 9 13:19:50 2016 +0200
gnu: python-matplotlib: Fix build.
* gnu/packages/python.scm (python-matplotlib, python2-matplotlib): Correct
inputs. [install-doc] set PYTHONPATH prior to building docs.
---
gnu/packages/python.scm | 25 ++++++++++++++-----------
1 file changed, 14 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm
index 4f8f6e8..b717da1 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3259,6 +3259,11 @@ transcendental functions).")
("python-pygobject" ,python-pygobject)
("gobject-introspection" ,gobject-introspection)
("python-tkinter" ,python "tk")
+ ("python-dateutil" ,python-dateutil-2)
+ ("python-numpy" ,python-numpy-bootstrap)
+ ("python-pillow" ,python-pillow)
+ ("python-pytz" ,python-pytz)
+ ("python-six" ,python-six)
;; The 'gtk+' package (and 'gdk-pixbuf', 'atk' and 'pango' propagated
;; from 'gtk+') provides the required 'typelib' files used by
;; 'gobject-introspection'. The location of these files is set with the
@@ -3275,20 +3280,11 @@ transcendental functions).")
("python-pycairo" ,python-pycairo)
("python-cairocffi" ,python-cairocffi)))
(inputs
- `(("python-dateutil" ,python-dateutil-2)
- ("python-six" ,python-six)
- ("python-pytz" ,python-pytz)
- ("python-numpy" ,python-numpy-bootstrap)
- ("python-sphinx" ,python-sphinx)
- ("python-numpydoc" ,python-numpydoc)
- ("python-nose" ,python-nose)
- ("python-mock" ,python-mock)
- ("libpng" ,libpng)
+ `(("libpng" ,libpng)
("imagemagick" ,imagemagick)
("freetype" ,freetype)
("cairo" ,cairo)
("glib" ,glib)
- ("python-pillow" ,python-pillow)
;; FIXME: Add backends when available.
;("python-wxpython" ,python-wxpython)
;("python-pyqt" ,python-pyqt)
@@ -3296,6 +3292,10 @@ transcendental functions).")
("tk" ,tk)))
(native-inputs
`(("pkg-config" ,pkg-config)
+ ("python-sphinx" ,python-sphinx)
+ ("python-numpydoc" ,python-numpydoc)
+ ("python-nose" ,python-nose)
+ ("python-mock" ,python-mock)
("texlive" ,texlive)
("texinfo" ,texinfo)))
(arguments
@@ -3320,11 +3320,14 @@ backend = TkAgg~%"
(assoc-ref inputs "tk"))))))
(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))
(info (string-append data "/info"))
(html (string-append doc "/html")))
+ ;; Make installed package available for building the
+ ;; documentation
+ (add-installed-pythonpath outputs inputs)
(with-directory-excursion "doc"
;; Produce pdf in 'A4' format.
(substitute* (find-files "." "conf\\.py")
- 23/57: inputs -> propagated-inputs: special, (continued)
- 23/57: inputs -> propagated-inputs: special, Hartmut Goebel, 2016/10/15
- 29/57: gnu: python-ccm: Update synopsis and description., Hartmut Goebel, 2016/10/15
- 22/57: gnu: Fix inputs in python.scm, part 2: native-inputs -> propagated-inputs., Hartmut Goebel, 2016/10/15
- 32/57: gnu: python-fixture: Correct inputs., Hartmut Goebel, 2016/10/15
- 38/57: gnu: python-pytest-flakes: Fix build., Hartmut Goebel, 2016/10/15
- 06/57: guix: python-build-system: Delete .egg-info file created in phase check., Hartmut Goebel, 2016/10/15
- 34/57: gnu: python-testrepositoryfixture: Correct inputs., Hartmut Goebel, 2016/10/15
- 33/57: gnu: python-fixture: Enable tests., Hartmut Goebel, 2016/10/15
- 42/57: gnu: python-fonttools: Remove intervening directory in site-packges., Hartmut Goebel, 2016/10/15
- 43/57: gnu: python-numpy-bootstrap, python-numpy: Fix build., Hartmut Goebel, 2016/10/15
- 44/57: gnu: python-matplotlib: Fix build.,
Hartmut Goebel <=
- 20/57: gnu: Fix inputs in python.scm, part 1: inputs -> propagated-inputs., Hartmut Goebel, 2016/10/15
- 30/57: gnu: python-h5py: Remove needless "python2-variant" property., Hartmut Goebel, 2016/10/15
- 24/57: gnu: python-sphinx-rtd-theme: Remove inputs., Hartmut Goebel, 2016/10/15
- 31/57: gnu: python-hdf5: Correct inputs., Hartmut Goebel, 2016/10/15
- 28/57: gnu: python-ccm: Add missing input python-psutil., Hartmut Goebel, 2016/10/15
- 57/57: Add a series of FIXME and TODO comments., Hartmut Goebel, 2016/10/15
- 10/57: gnu: Remove python-setuptools and python2-setuptools from inputs (part 1b), Hartmut Goebel, 2016/10/15
- 27/57: gnu: Ensure python-cython is a native-input., Hartmut Goebel, 2016/10/15
- 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