gexp: Allow gexp inputs when creating vectors using the read syntax.

* guix/gexp.scm (gexp) [collect-escapes, substitute-references]: Support vectors
created using the read syntax.
* tests/gexp.scm ("one input package, vector"): New test.

Merges: #10121

2 files changed, 14 insertions, 0 deletions

diff --git a/guix/gexp.scm b/guix/gexp.scm
index 8f9cb70d50f..02b05fb95eb 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1510,6 +1510,8 @@ execution environment."
           ((exp0 . exp)
            (let ((result (loop #'exp0 result)))
              (loop  #'exp result)))
+          (#(exp ...)
+           (loop #'(exp ...) result))
           (_
            result))))
 
@@ -1573,6 +1575,8 @@ execution environment."
         ((exp0 . exp)
          #`(cons #,(substitute-references #'exp0 substs)
                  #,(substitute-references #'exp substs)))
+        (#(exp ...)
+         #`(list->vector #,(substitute-references #'(exp ...) substs)))
         (x #''x)))
 
     (syntax-case s (ungexp output)
diff --git a/tests/gexp.scm b/tests/gexp.scm
index fcc269d75a7..2715a46ae5f 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -194,6 +194,16 @@
                                  (package-derivation %store coreutils)))
                  (gexp->sexp* exp)))))
 
+(test-assert "one input package, vector"
+  (let ((exp (gexp #((ungexp coreutils)))))
+    (and (gexp? exp)
+         (match (gexp-inputs exp)
+           ((input)
+            (eq? (gexp-input-thing input) coreutils)))
+         (equal? (vector (derivation->output-path
+                          (package-derivation %store coreutils)))
+                 (gexp->sexp* exp)))))
+
 (test-assert "one input origin"
   (let ((exp (gexp (display (ungexp (package-source coreutils))))))
     (and (gexp? exp)