[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: |
Mon, 1 Feb 2021 11:57:03 -0500 (EST) |
apteryx pushed a commit to branch core-updates
in repository guix.
commit b03b5456b3c15c4d6d72090143c095df1f7e51f0
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
- 84/131: gnu: python-moto: Do not set PYTHONPATH., (continued)
- 84/131: gnu: python-moto: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 92/131: gnu: python-pyelftools: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 91/131: gnu: python-validictory: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 93/131: gnu: python-cheetah: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 98/131: gnu: python2-send2trash: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 100/131: gnu: python-asgiref: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 102/131: gnu: python-cfn-lint: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 112/131: gnu: Adjust package collection to Wrap using GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 110/131: gnu: 389-ds-base: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 106/131: gnu: python-flask-wtf: Do not set PYTHONPATH., guix-commits, 2021/02/01
- 113/131: gnu: enjarify: Do not alter PYTHONPATH.,
guix-commits <=
- 123/131: gnu: roguebox-adventures: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 122/131: gnu: avogadro: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 117/131: gnu: gajim: Use GUIX_PYTHONPATH in search path., guix-commits, 2021/02/01
- 124/131: gnu: seahorse-adventures: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 120/131: gnu: hplip: Adjust to use GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 118/131: gnu: gnuradio: Use GUIX_PYTHONPATH in search path., guix-commits, 2021/02/01
- 125/131: gnu: ganeti: Remove PYTHONPATH-altering patch., guix-commits, 2021/02/01
- 127/131: gnu: manuskript: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/02/01
- 128/131: gnu: ceph: Streamline use of PYTHONPATH., guix-commits, 2021/02/01
- 129/131: gnu: mpd: Update comment., guix-commits, 2021/02/01