From 3c69701f9735dd62a2f765b8bd23a7eaeb391412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 21 Mar 2020 23:22:19 +0100 Subject: guix-install.sh: Add a trailing colon to 'INFOPATH'. Fixes . Suggested by Adam Porter . * etc/guix-install.sh (sys_create_init_profile): Add a trailing colon to 'INFOPATH'. --- etc/guix-install.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index e7f4d2cd59..d7fde7aacd 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -414,7 +414,9 @@ if [ -L $_GUIX_PROFILE ]; then export PATH="$_GUIX_PROFILE/bin${PATH:+:}$PATH" # Export INFOPATH so that the updated info pages can be found # and read by both /usr/bin/info and/or $GUIX_PROFILE/bin/info - export INFOPATH="$_GUIX_PROFILE/share/info${INFOPATH:+:}$INFOPATH" + # When INFOPATH is unset, add a trailing colon so that Emacs + # searches 'Info-default-directory-list'. + export INFOPATH="$_GUIX_PROFILE/share/info:$INFOPATH" fi # GUIX_PROFILE: User's default profile -- cgit v1.2.3 From e69b8bbae918768487a073e4aad8c08fd662b80b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sat, 21 Mar 2020 23:27:12 +0100 Subject: guix-install.sh: /etc/profile.d/guix.sh sources ~/.guix-profile/etc/profile. * etc/guix-install.sh (sys_create_init_profile): Source ~/.guix-profile/etc/profile instead of running 'guix package --search-paths=prefix' --- etc/guix-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/guix-install.sh b/etc/guix-install.sh index d7fde7aacd..4909d3f162 100755 --- a/etc/guix-install.sh +++ b/etc/guix-install.sh @@ -425,7 +425,7 @@ GUIX_PROFILE="$HOME/.guix-profile" GUIX_LOCPATH="$GUIX_PROFILE/lib/locale" export GUIX_PROFILE GUIX_LOCPATH -eval `guix package --search-paths=prefix 2> /dev/null` +[ -f "$GUIX_PROFILE/etc/profile" ] && . "$GUIX_PROFILE/etc/profile" # set XDG_DATA_DIRS to include Guix installations export XDG_DATA_DIRS="$GUIX_PROFILE/share:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}" -- cgit v1.2.3 From 8b18f5cb309f670b08ad35df6425f4e9e19d8a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 22 Mar 2020 18:47:48 +0100 Subject: tests: Use the same source as ci.guix.gnu.org. * etc/system-tests.scm (system-test-manifest): In 'local-file' call, use a name that is a function of COMMIT to match what Cuirass does. --- etc/system-tests.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'etc') diff --git a/etc/system-tests.scm b/etc/system-tests.scm index ab2827e70a..1085deed24 100644 --- a/etc/system-tests.scm +++ b/etc/system-tests.scm @@ -79,7 +79,11 @@ the 'TESTS' environment variable." ;; Intern SOURCE so that 'build-from-source' in (guix channels) sees ;; "fresh" file names and thus doesn't find itself loading .go files ;; from ~/.cache/guile when it loads 'build-aux/build-self.scm'. - (let* ((source (local-file source "guix-source" + (let* ((source (local-file source + (if commit + (string-append "guix-" + (string-take commit 7)) + "guix-source") #:recursive? #t #:select? (or (git-predicate source) -- cgit v1.2.3