diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm index d9af2517c27..1a6df988292 100644 --- a/guix/scripts/shell.scm +++ b/guix/scripts/shell.scm @@ -410,7 +410,7 @@ concatenates MANIFESTS, a list of expressions." (if (null? (manifest-entries manifest)) (match extra-manifests ((one) one) - (lst `(concatenate-manifests ,@extra-manifests))) + (lst `(concatenate-manifests (list ,@extra-manifests)))) (match (manifest->code manifest #:entry-package-version manifest-entry-version-prefix) diff --git a/tests/guix-shell-export-manifest.sh b/tests/guix-shell-export-manifest.sh index f83904deb40..05429955b9a 100644 --- a/tests/guix-shell-export-manifest.sh +++ b/tests/guix-shell-export-manifest.sh @@ -69,6 +69,11 @@ guix build -m "$manifest" -d | \ guix build -m "$manifest" -d | \ grep "$(guix build git -d)" +guix shell --export-manifest -D guile -D python-itsdangerous > "$manifest" +guix build -m "$manifest" -d | grep "$(guix build libffi -d)" +guix build -m "$manifest" -d | \ + grep "$(guix build -e '(@ (gnu packages python) python)' -d)" + # Test various combinations to make sure generated code uses interfaces # correctly. for options in \