[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
113/131: gnu: enjarify: Do not alter PYTHONPATH.
From: |
guix-commits |
Subject: |
113/131: gnu: enjarify: Do not alter PYTHONPATH. |
Date: |
Fri, 29 Jan 2021 09:22:17 -0500 (EST) |
apteryx pushed a commit to branch cu/farewell-to-pythonpath
in repository guix.
commit 6a265f3cbde909f14f456585408e67aaf2998bdc
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jan 27 17:58:54 2021 -0500
gnu: enjarify: Do not alter PYTHONPATH.
* gnu/packages/android.scm (enjarify): Do not alter PYTHONPATH.
---
gnu/packages/android.scm | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index eb538f6..f09d8e9 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -4,7 +4,7 @@
;;; Copyright © 2016, 2020 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2017 Hartmut Goebel <h.goebel@crazy-compilers.com>
-;;; Copyright © 2017 Maxim Cournoyer <maxim.cournoyer@gmail.com>
+;;; Copyright © 2017, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2018, 2019, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019, 2020 Andreas Enge <andreas@enge.fr>
@@ -1026,13 +1026,6 @@ connected devices via ADB.")
(arguments
`(#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'enjarify-wrapper-inherit-pythonpath
- ;; enjarify sets PYTHONPATH from a shell script, overwriting
- ;; PYTHONPATH set from guix. Comment out this line.
- (lambda _
- (substitute* "enjarify.sh"
- (("export PYTHONPATH") "# export PYTHONPATH"))
- #t))
(add-before 'check 'fixup-expected-test-results
;; Upstream adjusted this test in commit:
;; 3ae884a6485af82d300515813f537685b08dd800
- 127/131: gnu: manuskript: Wrap with GUIX_PYTHONPATH., (continued)
- 127/131: gnu: manuskript: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 80/131: gnu: python-multidict: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 84/131: gnu: python-moto: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 108/131: gnu: python-gunicorn: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 112/131: gnu: Adjust package collection to Wrap using GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 115/131: gnu: assword: Do not alter PYTHONPATH., guix-commits, 2021/01/29
- 91/131: gnu: python-validictory: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 95/131: gnu: python-rfc3986: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 123/131: gnu: roguebox-adventures: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 121/131: gnu: freecad: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 113/131: gnu: enjarify: Do not alter PYTHONPATH.,
guix-commits <=
- 131/131: gnu: python-attrs: Update to 20.3.0., guix-commits, 2021/01/29
- 92/131: gnu: python-pyelftools: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 93/131: gnu: python-cheetah: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 94/131: gnu: python-pbkdf2: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 105/131: gnu: python-flask: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 117/131: gnu: gajim: Use GUIX_PYTHONPATH in search path., guix-commits, 2021/01/29
- 130/131: gnu: meson-for-build: Remove package., guix-commits, 2021/01/29
- 87/131: gnu: python-libcst: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 86/131: gnu: python-gevent: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 104/131: gnu: python-databricks-cli: Do not set PYTHONPATH., guix-commits, 2021/01/29