nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
master
Ludovic Courtès 2015-02-27 22:05:40 +01:00
parent 4b23c4664e
commit f9efe568c3
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/gexp.scm
View File

@ -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))

10
tests/gexp.scm
View File

@ -230,6 +230,16 @@
(gexp-outputs exp2))
(= 2 (length (gexp-outputs exp2))))))
(test-assert "output list + ungexp-splicing list, combined gexps"
(let* ((exp0 (gexp (mkdir (ungexp output))))
(exp1 (gexp (mkdir (ungexp output "foo"))))
(exp2 (gexp (begin (display "hi!")
(ungexp-splicing (list exp0 exp1))))))
(and (lset= equal?
(append (gexp-outputs exp0) (gexp-outputs exp1))
(gexp-outputs exp2))
(= 2 (length (gexp-outputs exp2))))))
(test-assertm "gexp->file"
(mlet* %store-monad ((exp -> (gexp (display (ungexp %bootstrap-guile))))
(guile (package-file %bootstrap-guile))