[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
29/29: gexp: Allowed/disallowed references and graphs never refer to gra
From: |
guix-commits |
Subject: |
29/29: gexp: Allowed/disallowed references and graphs never refer to grafted inputs. |
Date: |
Mon, 8 Mar 2021 06:24:56 -0500 (EST) |
civodul pushed a commit to branch wip-build-systems-gexp
in repository guix.
commit 61e90416ac99e4fbf3c684d2150209d1d47cf547
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Sun Mar 7 15:26:47 2021 +0100
gexp: Allowed/disallowed references and graphs never refer to grafted
inputs.
* guix/gexp.scm (lower-reference-graphs, lower-references): Wrap
'lower-object' call in 'without-grafting' since these things never refer
to grafted inputs.
---
guix/gexp.scm | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index ded205f..b8a9d33 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -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)))
- 06/29: gexp: 'gexp-inputs' returns a list of <gexp-input> records., (continued)
- 06/29: gexp: 'gexp-inputs' returns a list of <gexp-input> records., guix-commits, 2021/03/08
- 07/29: gexp: 'gexp-inputs' returns both native and non-native inputs., guix-commits, 2021/03/08
- 11/29: gexp: Reduce allocations in 'gexp-attribute'., guix-commits, 2021/03/08
- 09/29: gexp: Micro-optimize 'gexp->sexp' and 'lower-inputs'., guix-commits, 2021/03/08
- 13/29: gexp: Optimize 'with-build-variables'., guix-commits, 2021/03/08
- 10/29: gexp: Reduce allocations while traversing lists., guix-commits, 2021/03/08
- 20/29: build-system: Use 'sexp->gexp' for plain sexps., guix-commits, 2021/03/08
- 21/29: build-system: Use 'input-tuples->gexp' and 'outputs->gexp'., guix-commits, 2021/03/08
- 02/29: store: Micro-optimize object cache lookup., guix-commits, 2021/03/08
- 28/29: grafts: Add 'without-grafting'., guix-commits, 2021/03/08
- 29/29: gexp: Allowed/disallowed references and graphs never refer to grafted inputs.,
guix-commits <=
- 14/29: build-system: Rewrite using gexps., guix-commits, 2021/03/08
- 15/29: packages: Turn 'bag->derivation' into a monadic procedure., guix-commits, 2021/03/08
- 16/29: packages: Simplify patch instantiation., guix-commits, 2021/03/08
- 25/29: tests: Refer to '%derivation-cache' in the right module., guix-commits, 2021/03/08
- 26/29: packages: 'expand-input' accepts any file-like object., guix-commits, 2021/03/08
- 17/29: packages: Core procedures are written in monadic style., guix-commits, 2021/03/08
- 19/29: gexp: Add 'sexp->gexp'., guix-commits, 2021/03/08
- 05/29: gexp: Micro-optimize sexp serialization., guix-commits, 2021/03/08
- 12/29: gexp: Add 'with-build-variables'., guix-commits, 2021/03/08
- 18/29: packages: Default origin 'patch-flags' is a gexp., guix-commits, 2021/03/08