[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/06: gnu: python-cffi: Build HTML documentation in separate derivation
From: |
guix-commits |
Subject: |
05/06: gnu: python-cffi: Build HTML documentation in separate derivation. |
Date: |
Fri, 1 Mar 2019 10:30:50 -0500 (EST) |
mbakke pushed a commit to branch staging
in repository guix.
commit 95dc93da8549381c3adbff31992d689836803137
Author: Marius Bakke <address@hidden>
Date: Fri Mar 1 16:29:07 2019 +0100
gnu: python-cffi: Build HTML documentation in separate derivation.
This is necessary to solve a dependency cycle between Sphinx and Requests.
* gnu/packages/libffi.scm (python-cffi)[outputs]: Remove.
[native-inputs]: Remove PYTHON-SPHINX.
[arguments]: Remove 'install-doc' phase.
* gnu/packages/libffi.scm (python-cffi-documentation): New public variable.
---
gnu/packages/libffi.scm | 45 +++++++++++++++++++++++++++++++--------------
1 file changed, 31 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/libffi.scm b/gnu/packages/libffi.scm
index 1df6b7b..f47f762 100644
--- a/gnu/packages/libffi.scm
+++ b/gnu/packages/libffi.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2015, 2019 Ricardo Wurmus <address@hidden>
;;; Copyright © 2016, 2017 Efraim Flashner <address@hidden>
;;; Copyright © 2016, 2017 Ben Woodcroft <address@hidden>
-;;; Copyright © 2017 Marius Bakke <address@hidden>
+;;; Copyright © 2017, 2019 Marius Bakke <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;;
;;; This file is part of GNU Guix.
@@ -92,14 +92,12 @@ conversions for values passed between the two languages.")
(base32 "1x3lrj928dcxx1k8k9gf3s4s3jwvzv8mc3kkyg1g7c3a1sc1f3z9"))
(patches (search-patches "python-cffi-x87-stack-clean.patch"))))
(build-system python-build-system)
- (outputs '("out" "doc"))
(inputs
`(("libffi" ,libffi)))
(propagated-inputs ; required at run-time
`(("python-pycparser" ,python-pycparser)))
(native-inputs
`(("pkg-config" ,pkg-config)
- ("python-sphinx" ,python-sphinx)
("python-pytest" ,python-pytest)))
(arguments
`(#:modules ((ice-9 ftw)
@@ -134,17 +132,7 @@ conversions for values passed between the two languages.")
(lambda _
(substitute* "testing/cffi0/test_ownlib.py"
(("ret.left") "ownlib.left"))
- #t))
- (add-after 'install 'install-doc
- (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)
- (let* ((doc (string-append (assoc-ref outputs "doc")
- "/share/doc/" ,name "-" ,version))
- (html (string-append doc "/html")))
- (with-directory-excursion "doc"
- (apply invoke "make" "html" make-flags)
- (mkdir-p html)
- (copy-recursively "build/html" html))
- #t))))))
+ #t)))))
(home-page "https://cffi.readthedocs.org")
(synopsis "Foreign function interface for Python")
(description
@@ -154,6 +142,35 @@ conversions for values passed between the two languages.")
(define-public python2-cffi
(package-with-python2 python-cffi))
+(define-public python-cffi-documentation
+ (package
+ (name "python-cffi-documentation")
+ (version (package-version python-cffi))
+ (source (package-source python-cffi))
+ (build-system gnu-build-system)
+ (arguments
+ `(#:tests? #f
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'chdir
+ (lambda _ (chdir "doc") #t))
+ (delete 'configure)
+ (replace 'build
+ (lambda* (#:key (make-flags '()) #:allow-other-keys)
+ (apply invoke "make" "html" make-flags)))
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (copy-recursively "build/html" (string-append out
"/html"))
+ #t))))))
+ (native-inputs
+ `(("sphinx-build" ,python-sphinx)))
+ (home-page (package-home-page python-cffi))
+ (synopsis "Documentation for the Python CFFI interface")
+ (description
+ "This package contains HTML documentation for the @code{python-cffi}
+project.")
+ (license (package-license python-cffi))))
+
(define-public ruby-ffi
(package
(name "ruby-ffi")
- branch staging updated (aa51eb2 -> 85ef07c), guix-commits, 2019/03/01
- 06/06: gnu: python-requests: Propagate required inputs., guix-commits, 2019/03/01
- 04/06: gnu: pciutils: Update to 3.6.2., guix-commits, 2019/03/01
- 01/06: gnu: gdk-pixbuf: Update to 2.38.1., guix-commits, 2019/03/01
- 02/06: gnu: elfutils: Update to 0.176., guix-commits, 2019/03/01
- 03/06: gnu: kmod: Update to 26., guix-commits, 2019/03/01
- 05/06: gnu: python-cffi: Build HTML documentation in separate derivation.,
guix-commits <=