diff options
author | Jakub Kądziołka <kuba@kadziolka.net> | 2020-04-06 16:48:09 +0200 |
---|---|---|
committer | Guix Patches Tester <> | 2020-04-06 15:50:06 +0100 |
commit | eda5ec4429c9947e078a03923319718f50e9e0a1 (patch) | |
tree | dba08ff212fe091e3a1664617587f142f18a4ffd /guix | |
parent | 1ba85062c23051bfab07043ba5b9fa58fc4c9465 (diff) | |
download | patches-series-3456.tar patches-series-3456.tar.gz |
build-system/python: Add a #:python-output argument.series-3456
This simplifies packages that ship Python bindings in a separate output.
* guix/build-system/python.scm (python-build): Add the argument, pass it
build-side.
* guix/build/python-build-system.scm (site-packages): Add an #:output
argument.
(add-installed-pythonpath): Likewise.
(install): Use the #:python-output argument.
(wrap): Likewise.
(rename-pth-file): Likewise. Use the site-packages procedure.
Diffstat (limited to 'guix')
-rw-r--r-- | guix/build-system/python.scm | 2 | ||||
-rw-r--r-- | guix/build/python-build-system.scm | 27 |
2 files changed, 16 insertions, 13 deletions
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index e39c06528e..34cc487c8c 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -170,6 +170,7 @@ pre-defined variants." (phases '(@ (guix build python-build-system) %standard-phases)) (outputs '("out")) + (python-output "out") (search-paths '()) (system (%current-system)) (guile #f) @@ -196,6 +197,7 @@ provides a 'setup.py' file as its build system." #:use-setuptools? ,use-setuptools? #:phases ,phases #:outputs %outputs + #:python-output ,python-output #:search-paths ',(map search-path-specification->sexp search-paths) #:inputs %build-inputs))) diff --git a/guix/build/python-build-system.scm b/guix/build/python-build-system.scm index 09bd8465c8..3b19072264 100644 --- a/guix/build/python-build-system.scm +++ b/guix/build/python-build-system.scm @@ -154,28 +154,29 @@ (major+minor (take components 2))) (string-join major+minor "."))) -(define (site-packages inputs outputs) +(define* (site-packages inputs outputs #:key (output "out")) "Return the path of the current output's Python site-package." - (let* ((out (assoc-ref outputs "out")) + (let* ((out (assoc-ref outputs output)) (python (assoc-ref inputs "python"))) (string-append out "/lib/python" (python-version python) "/site-packages/"))) -(define (add-installed-pythonpath inputs outputs) +(define* (add-installed-pythonpath inputs outputs #:key (output "out")) "Prepend the Python site-package of OUTPUT to PYTHONPATH. This is useful when running checks after installing the package." (let ((old-path (getenv "PYTHONPATH")) - (add-path (site-packages inputs outputs))) + (add-path (site-packages inputs outputs #:output output))) (setenv "PYTHONPATH" (string-append add-path (if old-path (string-append ":" old-path) ""))) #t)) (define* (install #:key outputs (configure-flags '()) use-setuptools? + (python-output "out") #:allow-other-keys) "Install a given Python package." - (let* ((out (assoc-ref outputs "out")) + (let* ((out (assoc-ref outputs python-output)) (params (append (list (string-append "--prefix=" out)) (if use-setuptools? ;; distutils does not accept these flags @@ -186,7 +187,9 @@ when running checks after installing the package." (call-setuppy "install" params use-setuptools?) #t)) -(define* (wrap #:key inputs outputs #:allow-other-keys) +(define* (wrap #:key inputs outputs + (python-output "out") + #:allow-other-keys) (define (list-of-files dir) (find-files dir (lambda (file stat) (and (eq? 'regular (stat:type stat)) @@ -199,7 +202,7 @@ when running checks after installing the package." (string-append dir "/sbin")))) outputs)) - (let* ((out (assoc-ref outputs "out")) + (let* ((out (assoc-ref outputs python-output)) (python (assoc-ref inputs "python")) (var `("PYTHONPATH" prefix ,(cons (string-append out "/lib/python" @@ -214,17 +217,15 @@ when running checks after installing the package." bindirs) #t)) -(define* (rename-pth-file #:key name inputs outputs #:allow-other-keys) +(define* (rename-pth-file #:key name inputs outputs + (python-output "out") + #:allow-other-keys) "Rename easy-install.pth to NAME.pth to avoid conflicts between packages installed with setuptools." ;; Even if the "easy-install.pth" is not longer created, we kept this phase. ;; There still may be packages creating an "easy-install.pth" manually for ;; some good reason. - (let* ((out (assoc-ref outputs "out")) - (python (assoc-ref inputs "python")) - (site-packages (string-append out "/lib/python" - (python-version python) - "/site-packages")) + (let* ((site-packages (site-packages inputs outputs #:output python-output)) (easy-install-pth (string-append site-packages "/easy-install.pth")) (new-pth (string-append site-packages "/" name ".pth"))) (when (file-exists? easy-install-pth) |