me/guix
Archived
1
0
Fork 0
Code Activity

gexp: Allowed/disallowed references and graphs never refer to grafted inputs.

Browse source 
* guix/gexp.scm (lower-reference-graphs, lower-references): Wrap
'lower-object' call in 'without-grafting' since these things never refer
to grafted inputs.
This commit is contained in:
Ludovic Courtès 2021-03-07 15:26:47 +01:00
parent 565733c4d7
commit a779363b6a
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
guix/gexp.scm
View file

@ -887,8 +887,9 @@ corresponding <derivation-input> or store item."
(match graphs
(((file-names . inputs) ...)
(mlet %store-monad ((inputs (lower-inputs (map tuple->gexp-input inputs)
system target)))
(mlet %store-monad ((inputs (without-grafting
(lower-inputs (map tuple->gexp-input inputs)
system target))))
(return (map cons file-names inputs))))))
(define* (lower-references lst #:key system target)
@ -901,13 +902,15 @@ names and file names suitable for the #:allowed-references argument to
((? string? output)
(return output))
(($ <gexp-input> thing output native?)
(mlet %store-monad ((drv (lower-object thing system
#:target (if native?
#f target))))
(mlet %store-monad ((drv (without-grafting
(lower-object thing system
#:target (if native?
#f target)))))
(return (derivation->output-path drv output))))
(thing
(mlet %store-monad ((drv (lower-object thing system
#:target target)))
(mlet %store-monad ((drv (without-grafting
(lower-object thing system
#:target target))))
(return (derivation->output-path drv))))))
(mapm/accumulate-builds lower lst)))