tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

environment: Non ad-hoc mode also honors transformation options.

Browse Source 
Fixes <https://bugs.gnu.org/35618>.
Reported by Florent Pruvost <florent.pruvost@inria.fr>.

* guix/scripts/environment.scm (options/resolve-packages): Add call to
TRANSFORM in non "ad-hoc" case.
* tests/guix-environment.sh: Add test.
This commit is contained in:
Ludovic Courtès
2019-05-07 14:38:06 +02:00
committed by Ludovic Courtès
parent bdd30bf00b
commit d108f59761
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tests/guix-environment.sh
View File

@@ -133,6 +133,25 @@ case "$transformed_drv" in
esac
rmdir "$tmpdir/emacs-36.8"
# Transformation options without '--ad-hoc'.
drv="`guix environment -n emacs-geiser 2>&1 | grep '\.drv$'`"
transformed_drv="`guix environment -n emacs-geiser \
--with-input=emacs-minimal=vim 2>&1 | grep '\.drv$'`"
test "$drv" != "$transformed_drv"
case "$drv" in
*-emacs-minimal*.drv*) true;;
*) false;;
esac
case "$transformed_drv" in
*-emacs-minimal*.drv*) false;;
*) true;;
esac
case "$transformed_drv" in
*-vim*.drv*) true;;
*) false;;
esac
if guile -c '(getaddrinfo "www.gnu.org" "80" AI_NUMERICSERV)' 2> /dev/null
then
# Compute the build environment for the initial GNU Make.