[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
45/103: gnu: python-matplotlib: Fix build.
From: |
Hartmut Goebel |
Subject: |
45/103: gnu: python-matplotlib: Fix build. |
Date: |
Tue, 25 Oct 2016 17:47:52 +0000 (UTC) |
htgoebel pushed a commit to branch wip-python-build-system
in repository guix.
commit 8e76b1e254c0725a79241a59cda4f73a7805066c
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 8be147c..479a598 100644
--- a/gnu/packages/python.scm
+++ b/gnu/packages/python.scm
@@ -3260,6 +3260,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
@@ -3276,20 +3281,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)
@@ -3297,6 +3293,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
@@ -3321,11 +3321,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 inputs outputs)
(with-directory-excursion "doc"
;; Produce pdf in 'A4' format.
(substitute* (find-files "." "conf\\.py")
- 52/103: gnu: python-scripttest: Correct inputs., (continued)
- 52/103: gnu: python-scripttest: Correct inputs., Hartmut Goebel, 2016/10/25
- 55/103: gnu: python-setuptools: remove pre-built binaries from source., Hartmut Goebel, 2016/10/25
- 60/103: gnu: python-pyjwt: Add missing inputs and enable test-suite., Hartmut Goebel, 2016/10/25
- 62/103: gnu: python-joblib: Remove python byte-code files from source., Hartmut Goebel, 2016/10/25
- 19/103: gnu: Fix python inputs, part 1: all inputs become propagated-inputs., Hartmut Goebel, 2016/10/25
- 74/103: gnu: python-zope-location: Correct inputs., Hartmut Goebel, 2016/10/25
- 82/103: gnu: python-celery: Remove needless inputs., Hartmut Goebel, 2016/10/25
- 89/103: gnu: python-freezegun: Correct input., Hartmut Goebel, 2016/10/25
- 94/103: gnu: python2-warpedlmm: Remove phase remove-bin-directory., Hartmut Goebel, 2016/10/25
- 95/103: gnu: python2-pbcore: Fix inputs:, Hartmut Goebel, 2016/10/25
- 45/103: gnu: python-matplotlib: Fix build.,
Hartmut Goebel <=
- 57/103: gnu: pytest-mock: remove needless propagated input "python-py"., Hartmut Goebel, 2016/10/25
- 65/103: gnu: python-blinker: No longer disable tests., Hartmut Goebel, 2016/10/25
- 79/103: gnu: python-urllib3: update comment., Hartmut Goebel, 2016/10/25
- 47/103: gnu: python-ipython: Fix build., Hartmut Goebel, 2016/10/25
- 54/103: gnu: python-pytest-xdist: Remove needless input python-apipkg., Hartmut Goebel, 2016/10/25
- 53/103: gnu: python-subunit, python-testrepository: Fix inputs, Hartmut Goebel, 2016/10/25
- 67/103: gnu: python2-scikit-image: Remove needless propagated-input., Hartmut Goebel, 2016/10/25
- 66/103: gnu: python-scikit-image: Correct inputs., Hartmut Goebel, 2016/10/25
- 71/103: gnu: Add python-rst.linker, python2-rst.linker., Hartmut Goebel, 2016/10/25
- 77/103: gnu: python-websocket-client: Correct inputs., Hartmut Goebel, 2016/10/25