[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/131: build/python: Replace PYTHONPATH by GUIX_PYTHONPATH.
From: |
guix-commits |
Subject: |
02/131: build/python: Replace PYTHONPATH by GUIX_PYTHONPATH. |
Date: |
Fri, 29 Jan 2021 09:21:41 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 0e014be4071d51e280397caf1b5caa06142b051d
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 09:39:01 2021 -0500
build/python: Replace PYTHONPATH by GUIX_PYTHONPATH.
* guix/build/python-build-system.scm (add-installed-pythonpath): Replace
"PYTHONPATH" by "GUIX_PYTHONPATH".
---
guix/build/python-build-system.scm | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index c6c88e6..8e35939 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -170,14 +170,13 @@
(string-append out "/lib/python" (python-version python)
"/site-packages")))
(define (add-installed-pythonpath inputs outputs)
- "Prepend the Python site-package of OUTPUT to PYTHONPATH. This is useful
+ "Add the Python site-package of OUTPUT to GUIX_PYTHONPATH. This is useful
when running checks after installing the package."
- (let ((old-path (getenv "PYTHONPATH"))
- (add-path (site-packages inputs outputs)))
- (setenv "PYTHONPATH"
- (string-append add-path
- (if old-path (string-append ":" old-path) "")))
- #t))
+ (let ((old-path (getenv "GUIX_PYTHONPATH"))
+ (new-path (site-packages inputs outputs)))
+ (setenv "GUIX_PYTHONPATH"
+ (string-append new-path
+ (if old-path (string-append ":" old-path) "")))))
(define* (install #:key inputs outputs (configure-flags '()) use-setuptools?
#:allow-other-keys)
- branch cu/farewell-to-pythonpath created (now 96077e5), guix-commits, 2021/01/29
- 01/131: gnu: python: Replace PYTHONPATH by GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 02/131: build/python: Replace PYTHONPATH by GUIX_PYTHONPATH.,
guix-commits <=
- 03/131: build/python: Always add the install prefix to the Guix PYTHONPATH., guix-commits, 2021/01/29
- 04/131: build/python: Add the installation bin directory to PATH., guix-commits, 2021/01/29
- 05/131: build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 06/131: build/python: Add a sanity check phase., guix-commits, 2021/01/29
- 08/131: gnu: python-fixtures-bootstrap: Do not sanity check., guix-commits, 2021/01/29
- 10/131: gnu: python-pyfakefs: Disable unreliable test, guix-commits, 2021/01/29
- 09/131: gnu: python-pytest-pep8: Fix package., guix-commits, 2021/01/29
- 11/131: gnu: python-slugify: Add missing input., guix-commits, 2021/01/29
- 12/131: gnu: python-websockets: Fix Python package name., guix-commits, 2021/01/29
- 14/131: gnu: python-traitlets: Add missing input., guix-commits, 2021/01/29