aboutsummaryrefslogtreecommitdiff
path: root/guix/gexp.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2015-02-27 22:05:40 +0100
committerLudovic Courtès <ludo@gnu.org>2015-02-27 22:05:40 +0100
commitf9efe568c3cd46f0aecb5bdd35731e98a29dbcea (patch)
tree3a93bc6103f649ed2cc8afe09783682fc3e32db9 /guix/gexp.scm
parent4b23c4664ec67b8c6329c4aa82a331d2e48341cb (diff)
downloadgnu-guix-f9efe568c3cd46f0aecb5bdd35731e98a29dbcea.tar
gnu-guix-f9efe568c3cd46f0aecb5bdd35731e98a29dbcea.tar.gz
gexp: Aggregate outputs of compound gexps.
* guix/gexp.scm (gexp-outputs)[add-reference-output]: Recurse into lists. * tests/gexp.scm ("output list + ungexp-splicing list, combined gexps"): New test.
Diffstat (limited to 'guix/gexp.scm')
-rw-r--r--guix/gexp.scm6
1 files changed, 3 insertions, 3 deletions
diff --git a/guix/gexp.scm b/guix/gexp.scm
index a8349c7d6e..1f64cf75ae 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -314,12 +314,12 @@ references."
(cons name result))
((? gexp? exp)
(append (gexp-outputs exp) result))
+ ((lst ...)
+ (fold-right add-reference-output result lst))
(_
result)))
- (fold-right add-reference-output
- '()
- (gexp-references exp)))
+ (add-reference-output (gexp-references exp) '()))
(define* (gexp->sexp exp #:key
(system (%current-system))