[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/131: gnu: python2-virtualenv: Fix build.
From: |
guix-commits |
Subject: |
21/131: gnu: python2-virtualenv: Fix build. |
Date: |
Fri, 29 Jan 2021 09:21:47 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 5a4042e0ba280e7703b1bc8ae4acb8479b5b2d3b
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Fri Jan 22 08:59:29 2021 -0500
gnu: python2-virtualenv: Fix build.
* gnu/packages/python-xyz.scm (python2-virtualenv)[arguments]{phases}:
Remove
argument.
---
gnu/packages/python-xyz.scm | 23 +----------------------
1 file changed, 1 insertion(+), 22 deletions(-)
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index 684da80..3c256f5 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -3188,28 +3188,7 @@ e.g. filters, callbacks and errbacks can all be
promises.")
(package
(inherit base)
(arguments
- `(#:python ,python-2
- #:phases
- (modify-phases %standard-phases
- (add-after 'set-paths 'adjust-PYTHONPATH
- (lambda* (#:key inputs #:allow-other-keys)
- (let* ((python (assoc-ref inputs "python"))
- (python-sitedir (string-append python "/lib/python2.7"
- "/site-packages")))
- ;; XXX: 'python2' always comes first on PYTHONPATH
- ;; and shadows the 'setuptools' input. Move python2
- ;; last: this should be fixed in python-build-system
- ;; in a future rebuild cycle.
- (setenv "PYTHONPATH"
- (string-append (string-join (delete python-sitedir
- (string-split
- (getenv
"PYTHONPATH")
- #\:))
- ":")
- ":" python-sitedir))
- (format #t "environment variable `PYTHONPATH' changed to
`~a'~%"
- (getenv "PYTHONPATH"))
- #t))))))
+ `(#:python ,python-2))
(propagated-inputs
`(("python-contextlib2" ,python2-contextlib2)
,@(package-propagated-inputs base))))))
- 10/131: gnu: python-pyfakefs: Disable unreliable test, (continued)
- 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
- 16/131: gnu: python-twisted: Remove broken console scripts., guix-commits, 2021/01/29
- 22/131: gnu: solaar: Do not read PYTHONPATH from environment., guix-commits, 2021/01/29
- 21/131: gnu: python2-virtualenv: Fix build.,
guix-commits <=
- 25/131: gnu: python-pysam: Adjust following Python build system changes., guix-commits, 2021/01/29
- 27/131: gnu: python-screed: Adjust following Python build system changes., guix-commits, 2021/01/29
- 30/131: gnu: python-xmlschema: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 13/131: gnu: python-black: Remove blackd., guix-commits, 2021/01/29
- 19/131: gnu: python-traceback2: Add missing dependency., guix-commits, 2021/01/29
- 23/131: gnu: intel-xed: Adjust build phase., guix-commits, 2021/01/29
- 18/131: gnu: python-packaging-bootstrap: Remove dependency., guix-commits, 2021/01/29
- 24/131: gnu: python-pybedtools: Streamline following Python build system changes., guix-commits, 2021/01/29
- 26/131: gnu: bamm: Update following changes to the Python build system., guix-commits, 2021/01/29
- 28/131: gnu: python-scanpy: Do not set PYTHONPATH., guix-commits, 2021/01/29