[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/22: gexp: Allowed/disallowed references and graphs never refer to gra
From: |
guix-commits |
Subject: |
15/22: gexp: Allowed/disallowed references and graphs never refer to grafted inputs. |
Date: |
Tue, 30 Mar 2021 17:00:17 -0400 (EDT) |
civodul pushed a commit to branch core-updates
in repository guix.
commit a779363b6aa581e88eda21f9f35530962d54ac25
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 edd1224..ab83c1e 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)))
- branch core-updates updated (cea364e -> 2eafeb2), guix-commits, 2021/03/30
- 01/22: gexp: Add 'with-build-variables'., guix-commits, 2021/03/30
- 02/22: gexp: Optimize 'with-build-variables'., guix-commits, 2021/03/30
- 13/22: packages: Call 'bag-grafts' only on the tip of the package graph., guix-commits, 2021/03/30
- 17/22: gnu: docbook-xsl: Move 'use-modules' form to the top level., guix-commits, 2021/03/30
- 15/22: gexp: Allowed/disallowed references and graphs never refer to grafted inputs.,
guix-commits <=
- 04/22: packages: Turn 'bag->derivation' into a monadic procedure., guix-commits, 2021/03/30
- 03/22: build-system: Rewrite using gexps., guix-commits, 2021/03/30
- 05/22: packages: Simplify patch instantiation., guix-commits, 2021/03/30
- 11/22: packages: '%standard-patch-inputs' is not influenced by '%current-target-system'., guix-commits, 2021/03/30
- 10/22: build-system: Use 'input-tuples->gexp' and 'outputs->gexp'., guix-commits, 2021/03/30
- 07/22: packages: Default origin 'patch-flags' is a gexp., guix-commits, 2021/03/30
- 12/22: packages: 'expand-input' accepts any file-like object., guix-commits, 2021/03/30
- 06/22: packages: Core procedures are written in monadic style., guix-commits, 2021/03/30
- 08/22: gexp: Add 'sexp->gexp'., guix-commits, 2021/03/30
- 18/22: gexp: 'imported+compiled-modules' fully honors #:guile., guix-commits, 2021/03/30