[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/163: gnu: python2-virtualenv: Fix build.
From: |
guix-commits |
Subject: |
08/163: gnu: python2-virtualenv: Fix build. |
Date: |
Mon, 25 Jan 2021 02:01:15 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 3e9985b51497a4071f7cbea9baeb77a5090b8fff
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 090ef19..e610669 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))))))
- 29/163: gnu: redshift: Do not set PYTHONPATH., (continued)
- 29/163: gnu: redshift: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 27/163: gnu: catfish: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 37/163: gnu: git-when-merged: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 44/163: gnu: kaldi-gstreamer-server: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 64/163: gnu: cozy: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 59/163: gnu: python-django-pipeline: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 48/163: gnu: python-rpy2: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 66/163: gnu: volk: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 69/163: gnu: renpy: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 88/163: gnu: python-fenics-ufl: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 08/163: gnu: python2-virtualenv: Fix build.,
guix-commits <=
- 05/163: build/python: Always add the install prefix to the Guix PYTHONPATH., guix-commits, 2021/01/25
- 14/163: gnu: fio: Adjust for the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 12/163: gnu: jack2: Adjust build phase., guix-commits, 2021/01/25
- 15/163: gnu: python-pybedtools: Streamline following Python build system changes., guix-commits, 2021/01/25
- 30/163: gnu: linkchecker: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 34/163: gnu: pitivi: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 56/163: gnu: python-django: Do not alter PYTHONPATH., guix-commits, 2021/01/25
- 31/163: gnu: ganeti: Do not set PYTHONPATH., guix-commits, 2021/01/25
- 51/163: gnu: scanmem: Wrap with the new Guix PYTHONPATH., guix-commits, 2021/01/25
- 39/163: gnu: python-libtmux: Do not set PYTHONPATH., guix-commits, 2021/01/25