summary refs log tree commit diff
path: root/etc
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-03-27 00:12:15 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-03-27 00:12:15 +0100
commit18af6870370226b4d502d7372844e7f2aded5887 (patch)
tree749d93209bd0cb9710ccaae2207df670f37eaa36 /etc
parent0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff)
parent3089b70d766bd9ec70e1464867130b7b864fbe17 (diff)
downloadguix-18af6870370226b4d502d7372844e7f2aded5887.tar.gz
Merge branch 'master' into core-updates
 Conflicts:
	gnu/packages/icu4c.scm
	gnu/packages/man.scm
	gnu/packages/python-xyz.scm
	guix/scripts/environment.scm
	guix/scripts/pack.scm
	guix/scripts/package.scm
	guix/scripts/pull.scm
	guix/store.scm
Diffstat (limited to 'etc')
-rwxr-xr-xetc/guix-install.sh6
-rw-r--r--etc/system-tests.scm6
2 files changed, 9 insertions, 3 deletions
diff --git a/etc/guix-install.sh b/etc/guix-install.sh
index e7f4d2cd59..4909d3f162 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
@@ -423,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/}"
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)