tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00
Code Activity

gexp: #:references-graphs accepts and honors <gexp-input> records.

Browse Source 
* guix/gexp.scm (lower-reference-graphs)[tuple->gexp-input]: Add
‘gexp-input?’ case.
(gexp->derivation): Update docstring.
* doc/guix.texi (G-Expressions): Adjust accordingly.
* tests/gexp.scm ("references-file, non-default output"): New test.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Change-Id: I595cb75da0867ab8ab44552887dc06ed1d23315e
This commit is contained in:
Ludovic Courtès
2023-11-13 17:43:29 +01:00
parent d9190abbd2
commit 11a454f9da
3 changed files with 41 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/gexp.scm
View File

@@ -1652,6 +1652,36 @@ importing.* \\(guix config\\) from the host"
read)
refs)))))))
(test-assertm "references-file, non-default output"
(let* ((exp #~(begin
(mkdir #$output)
(symlink #$%bootstrap-guile #$output:extra)))
(computed (computed-file "computed" exp
#:guile %bootstrap-guile))
(refs1 (references-file computed
#:guile %bootstrap-guile))
;; Wrap COMPUTE in 'gexp-input' to get the "extra" output.
(refs2 (references-file (gexp-input computed "extra")
#:guile %bootstrap-guile)))
(mlet* %store-monad ((drv0 (lower-object %bootstrap-guile))
(drv1 (lower-object computed))
(drv2 (lower-object refs2))
(drv3 (lower-object refs1)))
(mbegin %store-monad
(built-derivations (list drv2 drv3))
(mlet %store-monad ((refs ((store-lift requisites)
(list (derivation->output-path
drv1 "extra")))))
(return
(and (lset= string=?
(call-with-input-file (derivation->output-path drv2)
read)
refs)
(lset= string=?
(call-with-input-file (derivation->output-path drv3)
read)
(list (derivation->output-path drv1))))))))))
(test-assert "lower-object & gexp-input-error?"
(guard (c ((gexp-input-error? c)
(gexp-error-invalid-input c)))