From 28fd8c9f8f1ab2f33018443c77907708f013cdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dernat=20R=C3=A9my?= <remy.dernat@umontpellier.fr>
Date: Fri, 18 Jun 2021 09:36:27 +0200
Subject: [PATCH] 3.8 module updated - working
---
envfiles/python/3.8 | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/envfiles/python/3.8 b/envfiles/python/3.8
index 313de06..e5205a1 100644
--- a/envfiles/python/3.8
+++ b/envfiles/python/3.8
@@ -3,38 +3,38 @@
# python3.8 modulefile 20210616
#
-proc ModulesHelp { } {
-puts stderr "This modulefile defines the library paths and"
-puts stderr "include paths needed to use python3.8"
-puts stderr "This program is loaded by guix tool."
-puts stderr "The program python3.8"
-puts stderr "is added to PATH."
+proc ModulesHelp { } {
+ puts stderr "This modulefile defines the library paths and"
+ puts stderr "include paths needed to use python3.8"
+ puts stderr "This is loaded by guix tool."
+ puts stderr "The program python3.8"
+ puts stderr "is added to PATH."
}
set is_module_rm [module-info mode remove]
-set PYTHON_LVL 3.8
-set HOME getenv(HOME)
-setenv GUIX_PROFILE \$HOME/.guix-profile
-set GUIX_PROFILE \$HOME/.guix-profile
-
-#set PYTHON_CURPATH /usr/lib/python$PYTHON_LVL
-#set PYTHON_SHARE_LIBS /share/apps/lib/python
-#setenv PYTHONPATH $PYTHON_CURPATH:$PYTHON_CURPATH/plat-x86_64-linux-gnu:$PYTHON_CURPATH/lib-tk:$PYTHON_CURPATH/lib-old:$PYTHON_CURPATH/lib-dynload:/usr/local/lib/python$PYTHON_LVL/dist-packages:$PYTHON_CURPATH/dist-packages:PYTHON_CURPATH/dist-packages/gtk-2.0:$PYTHON_SHARE_LIBS/lib/python$PYTHON_LEVEL/site-packages
+set PYTHON_LVL 3.8
+set HOME $env(HOME)
+set GUIX_PROFILE $HOME/.guix-profile
+setenv GUIX_PROFILE $GUIX_PROFILE
+#puts stderr $GUIX_PROFILE
conflict python/3.6 python/2.7
-exec sh -c "/usr/local/bin/guix install python"
-exec bash -c ". \$HOME/.guix-profile/etc/profile"
+exec sh -c "/usr/local/bin/guix install python@3.8 2>/dev/null"
+#exec sh -c . ${GUIX_PROFILE}"/etc/profile
+
+if { [module-info mode load] || [module-info mode switch2] } {
+ puts stdout "Please source your guix profile with:\nsource ${GUIX_PROFILE}/etc/profile;"
+} elseif { [module-info mode remove] && ![module-info mode switch3] } {
+ puts stdout "deactivate;"
+}
+
unset-alias python
-unset-alias python3.6
+unset-alias python3
set-alias python python3.8
-
-#prepend-path PATH $PYTHON_CURPATH/bin/:$PYTHON_SHARE_LIBS/bin
-#prepend-path LD_LIBRARY_PATH $PYTHON_CURPATH/lib/python$PYTHON_LEVEL
-#prepend-path MANPATH $PYTHON_CURPATH/share/man
+set-alias python3 python3.8
append-path PE_PRODUCT_LIST PYTHON.$PYTHON_LVL
-######################################################################
--
GitLab