[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
112/131: gnu: Adjust package collection to Wrap using GUIX_PYTHONPATH.
|
From: |
guix-commits |
|
Subject: |
112/131: gnu: Adjust package collection to Wrap using GUIX_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 e4390c6a9167ee48400a6d8acb9413addde2e7c5
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jan 27 17:33:13 2021 -0500
gnu: Adjust package collection to Wrap using GUIX_PYTHONPATH.
This change was automated using:
$ git ls-files | grep .scm | \
xargs sed 's/(getenv "PYTHONPATH")/(getenv "GUIX_PYTHONPATH")/' -i
$ git ls-files | grep .scm | \
xargs sed 's/`("PYTHONPATH"/`("GUIX_PYTHONPATH"/' -i
* gnu/packages/admin.scm (nmap):
(dstat): Wrap using GUIX_PYTHONPATH.
* gnu/packages/audio.scm (jack-2):
(carla): Likewise.
* gnu/packages/benchmark.scm (fio): Likewise.
* gnu/packages/bioinformatics.scm (couger): Likewise.
(gess, find-circ, filtlong, nanopolish): Likewise.
* gnu/packages/cdrom.scm (cdemu-client): Likewise.
* gnu/packages/chemistry.scm (avogadro): Likewise.
* gnu/packages/connman.scm (econnman): Likewise.
* gnu/packages/cups.scm (hplip): Likewise.
* gnu/packages/debug.scm (scanmem): Likewise.
* gnu/packages/display-managers.scm (lightdm): Likewise.
* gnu/packages/ebook.scm (cozy): Likewise.
* gnu/packages/education.scm (anki): Likewise.
* gnu/packages/engineering.scm (kicad, volk, freecad): Likewise.
* gnu/packages/game-development.scm (renpy): Likewise.
* gnu/packages/games.scm (roguebox-adventures)
(seahorse-adventures, kajongg): Likewise.
* gnu/packages/gimp.scm (gimp, glimpse): Likewise.
* gnu/packages/glib.scm (itstool): Likewise.
* gnu/packages/gnome.scm (gnome-music, gtg, rhythmbox): Likewise.
(eolie, d-feet, gedit, caribou, gnome-shell, authenticator)
(gnome-todo, orca, passwordsafe, terminator, setzer)
(libratbag, komikku): Likewise.
* gnu/packages/gps.scm (gpsd): Likewise.
* gnu/packages/gtk.scm (gtk-doc): Likewise.
* gnu/packages/ibus.scm (ibus, ibus-libpinyin, ibus-anthy)
(ibus-libhangul): Likewise.
* gnu/packages/inkscape.scm (inkscape-1.0): Likewise.
* gnu/packages/linux.scm (bcc): Likewise.
* gnu/packages/mail.scm (notifymuch): Likewise.
* gnu/packages/maths.scm (units): Likewise.
* gnu/packages/music.scm (solfege): Likewise.
* gnu/packages/networking.scm (blueman): Likewise.
* gnu/packages/patchutils.scm (patchwork): Likewise.
* gnu/packages/photo.scm (rapid-photo-downloader, entangle): Likewise.
* gnu/packages/plotutils.scm (asymptote): Likewise.
* gnu/packages/presentation.scm (presentty): Likewise.
* gnu/packages/screen.scm (byobu): Likewise.
* gnu/packages/storage.scm (ceph): Likewise.
* gnu/packages/syndication.scm (liferea): Likewise.
* gnu/packages/task-management.scm (blanket): Likewise.
* gnu/packages/text-editors.scm (manuskript): Likewise.
* gnu/packages/version-control.scm (gitless, cgit, git-when-merged)
(git-imerge): Likewise.
* gnu/packages/video.scm (pitivi): Likewise.
* gnu/packages/virtualization.scm (criu): Likewise.
* gnu/packages/xfce.scm (catfish): Likewise.
---
gnu/packages/admin.scm | 4 ++--
gnu/packages/audio.scm | 6 +++---
gnu/packages/benchmark.scm | 2 +-
gnu/packages/bioinformatics.scm | 16 +++++++-------
gnu/packages/cdrom.scm | 2 +-
gnu/packages/chemistry.scm | 4 ++--
gnu/packages/connman.scm | 2 +-
gnu/packages/cups.scm | 2 +-
gnu/packages/debug.scm | 4 ++--
gnu/packages/display-managers.scm | 2 +-
gnu/packages/ebook.scm | 4 ++--
gnu/packages/education.scm | 2 +-
gnu/packages/engineering.scm | 10 ++++-----
gnu/packages/game-development.scm | 2 +-
gnu/packages/games.scm | 6 +++---
gnu/packages/gimp.scm | 4 ++--
gnu/packages/glib.scm | 2 +-
gnu/packages/gnome.scm | 44 +++++++++++++++++++--------------------
gnu/packages/gps.scm | 2 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/ibus.scm | 12 +++++------
gnu/packages/inkscape.scm | 2 +-
gnu/packages/linux.scm | 2 +-
gnu/packages/machine-learning.scm | 2 +-
gnu/packages/mail.scm | 2 +-
gnu/packages/maths.scm | 4 ++--
gnu/packages/mpd.scm | 4 ++--
gnu/packages/music.scm | 4 ++--
gnu/packages/networking.scm | 2 +-
gnu/packages/patchutils.scm | 2 +-
gnu/packages/photo.scm | 8 +++----
gnu/packages/plotutils.scm | 4 ++--
gnu/packages/presentation.scm | 4 ++--
gnu/packages/screen.scm | 2 +-
gnu/packages/storage.scm | 4 ++--
gnu/packages/syndication.scm | 4 ++--
gnu/packages/task-management.scm | 4 ++--
gnu/packages/text-editors.scm | 2 +-
gnu/packages/version-control.scm | 10 ++++-----
gnu/packages/video.scm | 2 +-
gnu/packages/virtualization.scm | 4 ++--
gnu/packages/xfce.scm | 2 +-
42 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 586ec98..2933c6a 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -2694,7 +2694,7 @@ done with the @code{auditctl} utility.")
"install-nping")
(make ndiff "install-ndiff")
(wrap-program (string-append ndiff "/bin/ndiff")
- `("PYTHONPATH" prefix
+ `("GUIX_PYTHONPATH" prefix
(,(python-path ndiff)))))
#t))
;; These are the tests that do not require network access.
@@ -2749,7 +2749,7 @@ results (ndiff), and a packet generation and response
analysis tool (nping).")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/dstat")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(inputs
`(("python" ,python-wrapper)
diff --git a/gnu/packages/audio.scm b/gnu/packages/audio.scm
index 6fe441f..90b3c49 100644
--- a/gnu/packages/audio.scm
+++ b/gnu/packages/audio.scm
@@ -2023,9 +2023,9 @@ synchronous execution of all clients, and low latency
operation.")
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'jack_control' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH")))
+ (path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/jack_control")
- `("PYTHONPATH" ":" prefix (,path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))))
#t)))))
(inputs
`(("alsa-lib" ,alsa-lib)
@@ -4579,7 +4579,7 @@ as is the case with audio plugins.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-script (string-append out "/bin/carla")
- `("PYTHONPATH" ":" prefix (,(getenv
"PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH"))))
#t))))))
(inputs
`(("alsa-lib" ,alsa-lib)
diff --git a/gnu/packages/benchmark.scm b/gnu/packages/benchmark.scm
index 3470f38..6c04b23 100644
--- a/gnu/packages/benchmark.scm
+++ b/gnu/packages/benchmark.scm
@@ -103,7 +103,7 @@
"fiologparser.py"))
;; Make sure numpy et.al is found.
(wrap-program (string-append newbin "/fiologparser_hist.py")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(outputs '("out" "utils"))
(inputs
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm
index 61c492d..119dd9a 100644
--- a/gnu/packages/bioinformatics.scm
+++ b/gnu/packages/bioinformatics.scm
@@ -2263,9 +2263,9 @@ gene predictor designed to work with assembled, aligned
RNA-seq transcripts.")
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'couger' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH")))
+ (path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/couger")
- `("PYTHONPATH" ":" prefix (,path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))))
#t)))))
(inputs
`(("python" ,python-2)
@@ -10696,7 +10696,7 @@ matplotlib.use('Agg')
" line)))
;; Make sure GESS has all modules in its path
(wrap-script (string-append target "GESS.py")
- `("PYTHONPATH" ":" = (,target ,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" = (,target ,(getenv
"GUIX_PYTHONPATH"))))
(mkdir-p bin)
(symlink (string-append target "GESS.py")
(string-append bin "GESS.py"))
@@ -12871,11 +12871,11 @@ conversions, region filtering, FASTA sequence
extraction and more.")
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
- (path (getenv "PYTHONPATH")))
+ (path (getenv "GUIX_PYTHONPATH")))
(for-each (lambda (script)
(install-file script bin)
(wrap-program (string-append bin "/" script)
- `("PYTHONPATH" ":" prefix (,path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))))
'("cmp_bed.py"
"find_circ.py"
"maxlength.py"
@@ -13817,10 +13817,10 @@ datasets.")
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH")))
+ (path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out
"/share/filtlong/scripts/histogram.py")
- `("PYTHONPATH" ":" prefix (,path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))))
#t))
(add-before 'check 'patch-tests
(lambda _
@@ -13894,7 +13894,7 @@ choosing which reads pass the filter.")
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
(for-each (lambda (file)
- (wrap-program file `("PYTHONPATH" ":" prefix
(,path))))
+ (wrap-program file `("GUIX_PYTHONPATH" ":" prefix
(,path))))
(find-files "/share/nanopolish/scripts" "\\.py"))
(for-each (lambda (file)
(wrap-program file `("PERL5LIB" ":" prefix
(,path))))
diff --git a/gnu/packages/cdrom.scm b/gnu/packages/cdrom.scm
index a8da7ba..b2d593d 100644
--- a/gnu/packages/cdrom.scm
+++ b/gnu/packages/cdrom.scm
@@ -1039,7 +1039,7 @@ drive and disc (including CD-ROMs and DVD-ROMs).")
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/cdemu")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(home-page "https://cdemu.sourceforge.io/";)
(synopsis "Command-line client for controlling cdemu-daemon")
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm
index ddbf5ca..0fef6a7 100644
--- a/gnu/packages/chemistry.scm
+++ b/gnu/packages/chemistry.scm
@@ -107,9 +107,9 @@
,(version-major+minor
(package-version python))
"/site-packages:"
- (getenv "PYTHONPATH")))
+ (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/avogadro")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
#t)))))
(native-inputs
`(("doxygen" ,doxygen)
diff --git a/gnu/packages/connman.scm b/gnu/packages/connman.scm
index 5f17a0e..11b9d4e 100644
--- a/gnu/packages/connman.scm
+++ b/gnu/packages/connman.scm
@@ -121,7 +121,7 @@ sharing) to clients via USB, ethernet, WiFi, cellular and
Bluetooth.")
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/econnman-bin")))
(wrap-program bin
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(native-inputs `(("pkg-config" ,pkg-config)))
(inputs
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm
index f2b78e3..9b00fe1 100644
--- a/gnu/packages/cups.scm
+++ b/gnu/packages/cups.scm
@@ -581,7 +581,7 @@ should only be used as part of the Guix cups-pk-helper
service.")
out "/lib/python"
(python:python-version python)
"/site-packages")
- (getenv "PYTHONPATH")
+ (getenv "GUIX_PYTHONPATH")
bin target)))
(chmod file #o755)))
(find-files "." (lambda (file stat)
diff --git a/gnu/packages/debug.scm b/gnu/packages/debug.scm
index b3a000e..2913c34 100644
--- a/gnu/packages/debug.scm
+++ b/gnu/packages/debug.scm
@@ -510,10 +510,10 @@ input. Zzuf's behaviour is deterministic, making it easy
to reproduce bugs.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out
"/share/gameconqueror/GameConqueror.py")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(native-inputs
`(("libtool" ,libtool)
diff --git a/gnu/packages/display-managers.scm
b/gnu/packages/display-managers.scm
index b6e5ab7..a6a1c97 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -192,7 +192,7 @@ Guix's logo. Based on Arch linux's archlinux-simplyblack
theme.")
;; Run test-suite under a dbus session.
(lambda* (#:key inputs #:allow-other-keys)
(wrap-program "tests/src/test-python-greeter"
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))))
;; Avoid printing locale warnings, which trip up the text
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 47bbd1a..34a04e5 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -482,12 +482,12 @@ following formats:
(libmagic-path (string-append
(assoc-ref %build-inputs "file")
"/lib"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/cozy")
`("LD_LIBRARY_PATH" ":" prefix (,libmagic-path))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
- `("PYTHONPATH" ":" prefix (,python-path ,pylib))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path ,pylib))))
#t)))))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
diff --git a/gnu/packages/education.scm b/gnu/packages/education.scm
index 0786229..3ffc789 100644
--- a/gnu/packages/education.scm
+++ b/gnu/packages/education.scm
@@ -798,7 +798,7 @@ adjust the level of difficulty.")
`("PATH" prefix (,(string-append
(assoc-ref inputs "mpv")
"/bin")))
- `("PYTHONPATH" = ,site-packages)))
+ `("GUIX_PYTHONPATH" = ,site-packages)))
(find-files bin ".")))
#t)))))
(native-inputs
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 3b8bcd9..d0c7a2b 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -929,9 +929,9 @@ Emacs).")
,(version-major+minor
(package-version python))
"/site-packages:"
- (getenv "PYTHONPATH"))))
+ (getenv "GUIX_PYTHONPATH"))))
(wrap-program file
- `("PYTHONPATH" ":" prefix (,path))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))
`("PATH" ":" prefix
(,(string-append python "/bin:")))))
#t)))))
@@ -1192,9 +1192,9 @@ the 'showing the effect of'-style of operation.")
,(version-major+minor
(package-version python))
"/site-packages:"
- (getenv "PYTHONPATH"))))
+ (getenv "GUIX_PYTHONPATH"))))
(wrap-program file
- `("PYTHONPATH" ":" prefix (,path))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))
`("PATH" ":" prefix
(,(string-append python "/bin:")))))
#t)))))
@@ -2601,7 +2601,7 @@ full programmatic control over your models.")
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/FreeCAD")
(list "PYTHONPATH"
- 'prefix (list (getenv "PYTHONPATH")))))
+ 'prefix (list (getenv "GUIX_PYTHONPATH")))))
#t)))))
(home-page "https://www.freecadweb.org/";)
(synopsis "Your Own 3D Parametric Modeler")
diff --git a/gnu/packages/game-development.scm
b/gnu/packages/game-development.scm
index fa7875d..58c397e 100644
--- a/gnu/packages/game-development.scm
+++ b/gnu/packages/game-development.scm
@@ -1377,7 +1377,7 @@ if __name__ == \"__main__\":
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/renpy")
- `("PYTHONPATH" = (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))
#t)))))
(inputs
`(("python2-tkinter" ,python-2 "tk")
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index b059c52..de018cb 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -2102,7 +2102,7 @@ utilizing the art assets from the @code{SuperTux}
project.")
#!~a
export PYTHONPATH=~a/LIB:~a
exec -a \"~a\" ~a \"$@\"\n"
- (which "bash") data (getenv "PYTHONPATH")
+ (which "bash") data (getenv "GUIX_PYTHONPATH")
(which "python3")
(string-append lib "/main.py"))))
(chmod roguebox-adventures #o555))
@@ -2178,7 +2178,7 @@ can be explored and changed freely.")
"#!~a~@
export PYTHONPATH=~a:~a~@
exec -a \"~a\" ~a \"$@\"~%"
- (which "bash") data (getenv "PYTHONPATH")
+ (which "bash") data (getenv "GUIX_PYTHONPATH")
(which "python3")
(string-append data "/run_game.py"))))
(chmod executable #o555))
@@ -10118,7 +10118,7 @@ This package is part of the KDE games module.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/kajongg")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(native-inputs
`(("extra-cmake-modules" ,extra-cmake-modules)
diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm
index 4d229a1..fc8e009 100644
--- a/gnu/packages/gimp.scm
+++ b/gnu/packages/gimp.scm
@@ -300,7 +300,7 @@ buffers.")
;; Install 'sitecustomize.py' into gimp's python directory to
;; add pygobject and pygtk to pygimp's search path.
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((pythonpath (getenv "PYTHONPATH"))
+ (let* ((pythonpath (getenv "GUIX_PYTHONPATH"))
(out (assoc-ref outputs "out"))
(sitecustomize.py
(string-append
@@ -579,7 +579,7 @@ transferring the style of an image.")
;; Install 'sitecustomize.py' into glimpse's python directory to
;; add pygobject and pygtk to pygimp's search path.
(lambda* (#:key outputs #:allow-other-keys)
- (let* ((pythonpath (getenv "PYTHONPATH"))
+ (let* ((pythonpath (getenv "GUIX_PYTHONPATH"))
(out (assoc-ref outputs "out"))
(sitecustomize.py
(string-append
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b6e4b88..fdbe6d0 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -553,7 +553,7 @@ The intltool collection can be used to do these things:
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/itstool")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(home-page "http://www.itstool.org";)
(synopsis "Tool to translate XML documents with PO files")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3399b5a..1b8ada6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -895,7 +895,7 @@ cloud integration is offered through GNOME Online
Accounts.")
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
`("GST_PLUGIN_SYSTEM_PATH" = (,(getenv
"GST_PLUGIN_SYSTEM_PATH")))
`("GRL_PLUGIN_PATH" = (,(getenv "GRL_PLUGIN_PATH")))
- `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))))
#t)))))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
@@ -2670,7 +2670,7 @@ and how they are displayed (View).")
(package-version python))
"/site-packages")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(native-inputs
@@ -6174,12 +6174,12 @@ which can read a large number of file formats.")
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
(grl-plugin-path (getenv "GRL_PLUGIN_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/rhythmbox")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
`("GRL_PLUGIN_PATH" ":" prefix (,grl-plugin-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(propagated-inputs
`(("dconf" ,dconf)))
@@ -6547,7 +6547,7 @@ almost all of them.")
":")))
(wrap-program (string-append out "/bin/eolie")
`("LD_LIBRARY_PATH" ":" prefix (,path))
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
#t)))))
(native-inputs
@@ -6691,7 +6691,7 @@ principles are simplicity and standards compliance.")
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/d-feet")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(native-inputs
@@ -7150,11 +7150,11 @@ javascript engine and the GObject introspection
framework.")
(let ((out (assoc-ref outputs "out"))
(gtksourceview (assoc-ref inputs "gtksourceview"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/gedit")
;; For plugins.
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))
;; For language-specs.
`("XDG_DATA_DIRS" ":" prefix (,(string-append gtksourceview
"/share")))))
@@ -7515,12 +7515,12 @@ Evolution (hence the name), but is now used by other
packages as well.")
(add-after 'install 'wrap-programs
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
- (python-path (getenv "PYTHONPATH"))
+ (python-path (getenv "GUIX_PYTHONPATH"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH")))
(for-each
(lambda (prog)
(wrap-program prog
- `("PYTHONPATH" ":" prefix (,python-path))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
(list (string-append out "/bin/caribou-preferences")
(string-append out "/libexec/antler-keyboard"))))
@@ -8422,7 +8422,7 @@ properties, screen resolution, and other GNOME
parameters.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/gnome-shell")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
;; FIXME: gnome-shell loads these libraries with unqualified
@@ -8436,7 +8436,7 @@ properties, screen resolution, and other GNOME
parameters.")
(for-each
(lambda (prog)
(wrap-program (string-append out "/bin/" prog)
- `("PYTHONPATH" ":" prefix (,python-path))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
'("gnome-shell-extension-tool" "gnome-shell-perf-tool"))
#t)))
@@ -9217,7 +9217,7 @@ specified duration and save it as a GIF encoded animated
image file.")
(package-version python))
"/site-packages")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(native-inputs
@@ -9428,13 +9428,13 @@ desktop. It supports multiple calendars, month, week
and year view.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/gnome-todo")
;; XXX: gi plugins are broken.
;; See
https://bugzilla.gnome.org/show_bug.cgi?id=787212
;; For plugins.
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(native-inputs
`(("gettext" ,gettext-minimal)
@@ -10037,8 +10037,8 @@ accessibility infrastructure.")
(,(getenv "GI_TYPELIB_PATH")))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix
(,(getenv "GST_PLUGIN_SYSTEM_PATH")))
- `("PYTHONPATH" ":" prefix
- (,(getenv "PYTHONPATH")))))
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))))
#t)))))
(native-inputs
`(("intltool" ,intltool)
@@ -10370,7 +10370,7 @@ apply fancy special effects and lets you share the fun
with others.")
(package-version python))
"/site-packages")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(native-inputs
@@ -10790,7 +10790,7 @@ advanced image management tool")
(package-version python))
"/site-packages")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t)))
(add-after 'wrap-program 'glib-or-gtk-wrap
@@ -11423,7 +11423,7 @@ and toolbars.")
(package-version python))
"/site-packages")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(native-inputs
@@ -11483,7 +11483,7 @@ GTK+. It integrates well with the GNOME desktop
environment.")
(pygo (string-append
(assoc-ref inputs "python-pygobject") site))
(python-wrap
- `("PYTHONPATH" = (,evdev ,pygo))))
+ `("GUIX_PYTHONPATH" = (,evdev ,pygo))))
(wrap-program (string-append out "/bin/" "ratbagctl")
python-wrap)
#t))))))
@@ -11865,7 +11865,7 @@ integrated profiler via Sysprof, debugging support, and
more.")
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/komikku")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))))))
(inputs
diff --git a/gnu/packages/gps.scm b/gnu/packages/gps.scm
index 4fa3bce..7f047aa 100644
--- a/gnu/packages/gps.scm
+++ b/gnu/packages/gps.scm
@@ -280,7 +280,7 @@ such as elevation, speed, heart rate, power, temperature,
and gear shifts.")
":")))
(for-each (lambda (script)
(wrap-program (string-append out "/bin/" script)
- `("PYTHONPATH" ":" prefix (,pythonpath))))
+ `("GUIX_PYTHONPATH" ":" prefix (,pythonpath))))
'("gegps" "gpscat" "gpsfake" "gpsprof"
"ubxtool" "xgps" "xgpsspeed" "zerk")))
#t)))))
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6a35e32..384ee60 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1766,7 +1766,7 @@ information.")
(let ((out (assoc-ref outputs "out")))
(for-each (lambda (prog)
(wrap-program prog
- `("PYTHONPATH" ":" prefix (,(getenv
"PYTHONPATH")))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
(find-files (string-append out "/bin")))
#t))))
#:configure-flags
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 9e13f86..1ce826d 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -130,7 +130,7 @@
;; GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/ibus-setup")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append out "/lib/girepository-1.0")))))
@@ -192,8 +192,8 @@ may also simplify input method development.")
;; PYTHONPATH and GI_TYPELIB_PATH.
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out
"/libexec/ibus-setup-libpinyin")
- `("PYTHONPATH" ":" prefix
- (,(getenv "PYTHONPATH")
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")
,(string-append (assoc-ref inputs "ibus")
"/lib/girepository-1.0")))
`("GI_TYPELIB_PATH" ":" prefix
@@ -270,8 +270,8 @@ Chinese pinyin input methods.")
(for-each
(lambda (prog)
(wrap-program (string-append out "/libexec/" prog)
- `("PYTHONPATH" ":" prefix
- (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append out "/lib/girepository-1.0")))))
@@ -733,7 +733,7 @@ hanja dictionary and small hangul character
classification.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/libexec/ibus-setup-hangul")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
`("LD_LIBRARY_PATH" ":" prefix
(,(string-append (assoc-ref inputs "libhangul") "/lib")))
`("GI_TYPELIB_PATH" ":" prefix
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 48dc46e..e9cdb16 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -258,7 +258,7 @@ endif()~%~%"
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
#t)))))
(inputs
`(("aspell" ,aspell)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 2e7230c..db67fea 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -7701,7 +7701,7 @@ headers.")
(lambda (python-executable)
(format #t "Wrapping: ~A.~%" python-executable)
(wrap-program python-executable
- `("PYTHONPATH" ":" prefix
+ `("GUIX_PYTHONPATH" ":" prefix
(,(string-append lib
"/python"
,(version-major+minor
diff --git a/gnu/packages/machine-learning.scm
b/gnu/packages/machine-learning.scm
index 7a77897..59a4222 100644
--- a/gnu/packages/machine-learning.scm
+++ b/gnu/packages/machine-learning.scm
@@ -1372,7 +1372,7 @@ automatically.")
(let* ((server (string-append bin "/kaldi-gst-server"))
(client (string-append bin "/kaldi-gst-client"))
(worker (string-append bin "/kaldi-gst-worker"))
- (PYTHONPATH (getenv "PYTHONPATH"))
+ (PYTHONPATH (getenv "GUIX_PYTHONPATH"))
(GST_PLUGIN_PATH (string-append
(assoc-ref inputs
"gst-kaldi-nnet2-online")
"/lib/gstreamer-1.0:${GST_PLUGIN_PATH}"))
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm
index 9756a36..b55b0d3 100644
--- a/gnu/packages/mail.scm
+++ b/gnu/packages/mail.scm
@@ -1231,7 +1231,7 @@ Notmuch.")
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/notifymuch")))
(wrap-program bin
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" ":" prefix
(,(getenv "GI_TYPELIB_PATH")
,(string-append out "/lib/girepository-1.0")))))
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 4019c7e..82f9b7d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -326,8 +326,8 @@ programming language.")
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")))
(wrap-program (string-append bin "/units_cur")
- `("PYTHONPATH" ":" prefix
- ,(search-path-as-string->list (getenv
"PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix
+ ,(search-path-as-string->list (getenv
"GUIX_PYTHONPATH"))))
#t))))))
(synopsis "Conversion between thousands of scales")
(description
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm
index 6066913..d5811cc 100644
--- a/gnu/packages/mpd.scm
+++ b/gnu/packages/mpd.scm
@@ -401,9 +401,9 @@ other MPD frontends.")
(add-after 'install 'wrap-program
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/mpDris2")
- `("PYTHONPATH" ":" prefix (,python-path)))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path)))
#t))))))
(inputs
`(("python-mpd2" ,python-mpd2)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index b3c25a7..621bf54 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1711,9 +1711,9 @@ for path in [path for path in sys.path if 'site-packages'
in path]: site.addsite
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'solfege' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH")))
+ (path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/solfege")
- `("PYTHONPATH" ":" prefix (,path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))))
#t)))))
(inputs
`(("python" ,python-2)
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index a00ce4c..9a51e6b 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -621,7 +621,7 @@ systems with no further dependencies.")
(for-each
(lambda (program)
(wrap-program program
- `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,lib))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,lib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))
(append
(map (lambda (prog) (string-append bin prog))
diff --git a/gnu/packages/patchutils.scm b/gnu/packages/patchutils.scm
index 1354c86..444f458 100644
--- a/gnu/packages/patchutils.scm
+++ b/gnu/packages/patchutils.scm
@@ -348,7 +348,7 @@ you to figure out what is going on in that merge you keep
avoiding.")
;; as the python modules in this package in the wsgi.py file,
;; as this will ensure they are available at runtime.
(define pythonpath
- (string-append (getenv "PYTHONPATH")
+ (string-append (getenv "GUIX_PYTHONPATH")
":"
(site-packages inputs outputs)))
(display
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm
index 5402826..fc4467c 100644
--- a/gnu/packages/photo.scm
+++ b/gnu/packages/photo.scm
@@ -156,13 +156,13 @@
"/bin"))
":"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(for-each
(lambda (program)
(wrap-program program
`("PATH" ":" prefix (,path))
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
+ `("GUIX_PYTHONPATH" ":" prefix
(,python-path))))
(map (lambda (name)
(string-append out "/bin/" name))
'("analyze-pv-structure"
@@ -655,10 +655,10 @@ such as Batch image processing.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/entangle")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(native-inputs
`(("cmake" ,cmake)
diff --git a/gnu/packages/plotutils.scm b/gnu/packages/plotutils.scm
index f23b567..d7eb5b0 100644
--- a/gnu/packages/plotutils.scm
+++ b/gnu/packages/plotutils.scm
@@ -308,9 +308,9 @@ colors, styles, options and details.")
(lambda* (#:key inputs outputs #:allow-other-keys)
;; Make sure 'xasy' runs with the correct PYTHONPATH.
(let* ((out (assoc-ref outputs "out"))
- (path (getenv "PYTHONPATH")))
+ (path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/share/asymptote/GUI/xasy.py")
- `("PYTHONPATH" ":" prefix (,path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))))
#t)))))
(home-page "http://asymptote.sourceforge.net";)
(synopsis "Script-based vector graphics language")
diff --git a/gnu/packages/presentation.scm b/gnu/packages/presentation.scm
index 0ad407d..8d24a81 100644
--- a/gnu/packages/presentation.scm
+++ b/gnu/packages/presentation.scm
@@ -62,12 +62,12 @@
`("PATH" ":" prefix (,(dirname (which "cowsay"))
,(dirname (which "figlet"))
,(dirname (which "jp2a"))))
- `("PYTHONPATH" prefix
+ `("GUIX_PYTHONPATH" prefix
,(cons (string-append out "/lib/python"
(python-version python)
"/site-packages")
(search-path-as-string->list
- (or (getenv "PYTHONPATH") ""))))))
+ (or (getenv "GUIX_PYTHONPATH") ""))))))
'("presentty" "presentty-console")))
#t)))))
(inputs
diff --git a/gnu/packages/screen.scm b/gnu/packages/screen.scm
index 0491731..40584d7 100644
--- a/gnu/packages/screen.scm
+++ b/gnu/packages/screen.scm
@@ -138,7 +138,7 @@ controlling terminal and attach to it later.")
(select (string-append out "/bin/byobu-select-session")))
(wrap-program config
`("BYOBU_PYTHON" = (,python))
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
(wrap-program select
`("BYOBU_PYTHON" = (,python)))
#t))))))
diff --git a/gnu/packages/storage.scm b/gnu/packages/storage.scm
index d53327d..978ecd5 100644
--- a/gnu/packages/storage.scm
+++ b/gnu/packages/storage.scm
@@ -170,7 +170,7 @@
;; the install directory is not on PYTHONPATH.
(setenv "PYTHONPATH"
(string-append py3sitedir ":"
- (getenv "PYTHONPATH")))
+ (getenv "GUIX_PYTHONPATH")))
#t)))
(add-after 'install 'wrap-python-scripts
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -190,7 +190,7 @@
(sitedir prettytable))))
(for-each (lambda (executable)
(wrap-program (string-append out "/bin/" executable)
- `("PYTHONPATH" ":" prefix (,PYTHONPATH))))
+ `("GUIX_PYTHONPATH" ":" prefix (,PYTHONPATH))))
scripts)
#t))))))
(outputs
diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm
index efe231c..9b7d84b 100644
--- a/gnu/packages/syndication.scm
+++ b/gnu/packages/syndication.scm
@@ -205,10 +205,10 @@ file system, and many more features.")
(lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/liferea")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(native-inputs
`(("autoconf" ,autoconf)
diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm
index 3c0efe1..47a3552 100644
--- a/gnu/packages/task-management.scm
+++ b/gnu/packages/task-management.scm
@@ -96,11 +96,11 @@ and querying data, exposing task data in multiple formats
to other tools.")
(let* ((out (assoc-ref outputs "out"))
(gi-typelib-path (getenv "GI_TYPELIB_PATH"))
(gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))
- (python-path (getenv "PYTHONPATH")))
+ (python-path (getenv "GUIX_PYTHONPATH")))
(wrap-program (string-append out "/bin/blanket")
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))
`("GST_PLUGIN_SYSTEM_PATH" ":" prefix (,gst-plugin-path))
- `("PYTHONPATH" ":" prefix (,python-path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,python-path))))
#t)))))
(native-inputs
`(("desktop-file-utils" ,desktop-file-utils)
diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm
index 81915ca..ddc6722 100644
--- a/gnu/packages/text-editors.scm
+++ b/gnu/packages/text-editors.scm
@@ -650,7 +650,7 @@ environment with Markdown markup.")
(let ((bin (string-append out "/bin"))
(executable (string-append share "/bin/manuskript")))
(wrap-program executable
- (list "PYTHONPATH" 'prefix (list (getenv "PYTHONPATH"))))
+ (list "PYTHONPATH" 'prefix (list (getenv
"GUIX_PYTHONPATH"))))
(mkdir-p bin)
(with-directory-excursion bin
(symlink (string-append share "/bin/manuskript")
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index da0ab44..45b68a4 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -619,12 +619,12 @@ everything from small to very large projects with speed
and efficiency.")
(git (assoc-ref inputs "git")))
(wrap-program (string-append out "/bin/gl")
`("PATH" ":" prefix (,(string-append git "/bin")))
- `("PYTHONPATH" ":" =
+ `("GUIX_PYTHONPATH" ":" =
(,(string-append out "/lib/python"
,(version-major+minor
(package-version python))
"/site-packages:")
- ,(getenv "PYTHONPATH"))))
+ ,(getenv "GUIX_PYTHONPATH"))))
#t))))))
(native-inputs
`(("git-for-tests" ,git-minimal)))
@@ -925,7 +925,7 @@ collaboration using typical untrusted file hosts or
services.")
(lambda (file)
(wrap-program (string-append (assoc-ref outputs "out")
"/lib/cgit/filters/" file)
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH")))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
'("syntax-highlighting.py"
"html-converters/md2html"))
#t)))))
@@ -2604,7 +2604,7 @@ directory full of HOWTOs.")
(lambda* (#:key outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/git-when-merged")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t)))))
(inputs
`(("git" ,git)
@@ -2649,7 +2649,7 @@ how information about the merge is displayed.")
(lambda* (#:key outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
"/bin/git-imerge")
- `("PYTHONPATH" ":" prefix (,(getenv "PYTHONPATH"))))
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))))
#t)))))
(inputs
`(("git" ,git)
diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm
index 824ea62..313eaa0 100644
--- a/gnu/packages/video.scm
+++ b/gnu/packages/video.scm
@@ -4052,7 +4052,7 @@ tools for styling them, including a built-in real-time
video preview.")
(let ((prog (string-append (assoc-ref outputs "out")
"/bin/pitivi")))
(wrap-program prog
- `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))
;; We've only added inputs for what Pitivi deems either
;; necessary or optional. Let the user's packages take
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm
index 59c35af..4470bed 100644
--- a/gnu/packages/virtualization.scm
+++ b/gnu/packages/virtualization.scm
@@ -1335,9 +1335,9 @@ domains, their live performance and resource utilization
statistics.")
(string-take (string-take-right
(assoc-ref inputs
"python") 5) 3)
"/site-packages:"
- (or (getenv "PYTHONPATH") ""))))
+ (or (getenv "GUIX_PYTHONPATH") ""))))
(wrap-program (string-append out "/bin/crit")
- `("PYTHONPATH" ":" prefix (,path))))
+ `("GUIX_PYTHONPATH" ":" prefix (,path))))
#t)))))
(inputs
`(("protobuf" ,protobuf)
diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 2192f61..544416a 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -241,7 +241,7 @@ to share commonly used Xfce widgets among the Xfce
applications.")
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/catfish")
- `("PYTHONPATH" = (,(getenv "PYTHONPATH")))
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))
#:tests? #f))
(native-inputs
- 88/131: gnu: python-binwalk: Do not set PYTHONPATH., (continued)
- 88/131: gnu: python-binwalk: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 98/131: gnu: python2-send2trash: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 100/131: gnu: python-asgiref: Do not set PYTHONPATH., guix-commits, 2021/01/29
- 120/131: gnu: hplip: Adjust to use GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 114/131: gnu: gpodder: Do not alter PYTHONPATH., guix-commits, 2021/01/29
- 126/131: gnu: kaldi-gstreamer-server: Wrap with GUIX_PYTHONPATH., guix-commits, 2021/01/29
- 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 <=
- 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, 2021/01/29
- 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