summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/scripts/shell.scm2
-rw-r--r--tests/guix-shell-export-manifest.sh5
2 files changed, 6 insertions, 1 deletions
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."
410 (if (null? (manifest-entries manifest)) 410 (if (null? (manifest-entries manifest))
411 (match extra-manifests 411 (match extra-manifests
412 ((one) one) 412 ((one) one)
413 (lst `(concatenate-manifests ,@extra-manifests))) 413 (lst `(concatenate-manifests (list ,@extra-manifests))))
414 (match (manifest->code manifest 414 (match (manifest->code manifest
415 #:entry-package-version 415 #:entry-package-version
416 manifest-entry-version-prefix) 416 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 | \
69guix build -m "$manifest" -d | \ 69guix build -m "$manifest" -d | \
70 grep "$(guix build git -d)" 70 grep "$(guix build git -d)"
71 71
72guix shell --export-manifest -D guile -D python-itsdangerous > "$manifest"
73guix build -m "$manifest" -d | grep "$(guix build libffi -d)"
74guix build -m "$manifest" -d | \
75 grep "$(guix build -e '(@ (gnu packages python) python)' -d)"
76
72# Test various combinations to make sure generated code uses interfaces 77# Test various combinations to make sure generated code uses interfaces
73# correctly. 78# correctly.
74for options in \ 79for options in \