me
/
guix
Archived
1
0
Fork 0

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

* 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
Ludovic Courtès 2023-11-13 17:43:29 +01:00
parent d9190abbd2
commit 11a454f9da
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
3 changed files with 41 additions and 8 deletions

View File

@ -12314,10 +12314,9 @@ When @var{references-graphs} is true, it must be a list of tuples of one of the
following forms: following forms:
@example @example
(@var{file-name} @var{package}) (@var{file-name} @var{obj})
(@var{file-name} @var{package} @var{output}) (@var{file-name} @var{obj} @var{output})
(@var{file-name} @var{derivation}) (@var{file-name} @var{gexp-input})
(@var{file-name} @var{derivation} @var{output})
(@var{file-name} @var{store-item}) (@var{file-name} @var{store-item})
@end example @end example

View File

@ -934,6 +934,11 @@ When TARGET is true, use it as the cross-compilation target triplet."
corresponding <derivation-input> or store item." corresponding <derivation-input> or store item."
(define tuple->gexp-input (define tuple->gexp-input
(match-lambda (match-lambda
(((? gexp-input? input))
;; This case lets users specify the output of interest more
;; conveniently, for instance by passing (gexp-input hwloc "lib") to
;; the 'references-file' procedure.
input)
((thing) ((thing)
(%gexp-input thing "out" (not target))) (%gexp-input thing "out" (not target)))
((thing output) ((thing output)
@ -1152,10 +1157,9 @@ applicable.
When REFERENCES-GRAPHS is true, it must be a list of tuples of one of the When REFERENCES-GRAPHS is true, it must be a list of tuples of one of the
following forms: following forms:
(FILE-NAME PACKAGE) (FILE-NAME OBJ)
(FILE-NAME PACKAGE OUTPUT) (FILE-NAME OBJ OUTPUT)
(FILE-NAME DERIVATION) (FILE-NAME GEXP-INPUT)
(FILE-NAME DERIVATION OUTPUT)
(FILE-NAME STORE-ITEM) (FILE-NAME STORE-ITEM)
The right-hand-side of each element of REFERENCES-GRAPHS is automatically made The right-hand-side of each element of REFERENCES-GRAPHS is automatically made

View File

@ -1652,6 +1652,36 @@ importing.* \\(guix config\\) from the host"
read) read)
refs))))))) 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?" (test-assert "lower-object & gexp-input-error?"
(guard (c ((gexp-input-error? c) (guard (c ((gexp-input-error? c)
(gexp-error-invalid-input c))) (gexp-error-invalid-input c)))