[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/131: build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH.
From: |
guix-commits |
Subject: |
05/131: build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH. |
Date: |
Fri, 29 Jan 2021 09:21:42 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit c53daa7940a28456c0d4cb9a5c42143423e24ff3
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 11:08:57 2021 -0500
build/python: Adjust wrap phase to use the new GUIX_PYTHONPATH.
* guix/build/python-build-system.scm (wrap): Adjust to use the new
GUIX_PYTHONPATH. Remove trailing #t.
---
guix/build/python-build-system.scm | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/guix/build/python-build-system.scm
b/guix/build/python-build-system.scm
index c73f6b0..0f2402d 100644
--- a/guix/build/python-build-system.scm
+++ b/guix/build/python-build-system.scm
@@ -220,21 +220,19 @@ running checks after installing the package."
(define bindirs
(append-map (match-lambda
- ((_ . dir)
- (list (string-append dir "/bin")
- (string-append dir "/sbin"))))
+ ((_ . dir)
+ (list (string-append dir "/bin")
+ (string-append dir "/sbin"))))
outputs))
- (let* ((var `("PYTHONPATH" prefix
- ,(cons (site-packages inputs outputs)
- (search-path-as-string->list
- (or (getenv "PYTHONPATH") ""))))))
+ (let* ((var `("GUIX_PYTHONPATH" prefix
+ ,(search-path-as-string->list
+ (or (getenv "GUIX_PYTHONPATH") "")))))
(for-each (lambda (dir)
(let ((files (list-of-files dir)))
(for-each (cut wrap-program <> var)
files)))
- bindirs)
- #t))
+ bindirs)))
(define* (rename-pth-file #:key name inputs outputs #:allow-other-keys)
"Rename easy-install.pth to NAME.pth to avoid conflicts between packages
- 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, 2021/01/29
- 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 <=
- 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
- 15/131: gnu: python-idna-ssl: Add missing input., guix-commits, 2021/01/29
- 17/131: gnu: python-automat: Remove broken console script., guix-commits, 2021/01/29
- 07/131: gnu: python-pytest-xdist: Add missing input, relax pytest requirement., guix-commits, 2021/01/29