[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

04/13: derivations: Add #:skip-dependencies? parameter to 'derivation-in

From: guix-commits
Subject: 04/13: derivations: Add #:skip-dependencies? parameter to 'derivation-input-fold'.
Date: Thu, 12 Dec 2019 07:49:40 -0500 (EST)

civodul pushed a commit to branch wip-system-bootstrap
in repository guix.

commit 922c4f51c96e6763835f98eaffd4357b4bb63b39
Author: Ludovic Court├Ęs <address@hidden>
Date:   Thu Dec 12 12:56:55 2019 +0100

    derivations: Add #:skip-dependencies? parameter to 'derivation-input-fold'.
    * guix/derivations.scm (derivation-input-fold): Add #:skip-dependencies?.
 guix/derivations.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/guix/derivations.scm b/guix/derivations.scm
index 480a65c..0ee325d 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -305,10 +305,13 @@ result is the set of prerequisites of DRV not already in 
 (define* (derivation-input-fold proc seed inputs
-                                #:key (cut? (const #f)))
+                                #:key
+                                (cut? (const #f))
+                                (skip-dependencies? (const #f)))
   "Perform a breadth-first traversal of INPUTS, calling PROC on each input
-with the current result, starting from SEED.  Skip recursion on inputs that
-match CUT?."
+with the current result, starting from SEED.  Skip inputs that match CUT? as
+well as all their dependencies; skip the dependencies of inputs that match
+SKIP-DEPENDENCIES?, but not the input itself."
   (let loop ((inputs inputs)
              (result seed)
              (visited (set)))
@@ -323,7 +326,9 @@ match CUT?."
                 (loop rest result (set-insert key visited)))
                 (let ((drv (derivation-input-derivation input)))
-                  (loop (append (derivation-inputs drv) rest)
+                  (loop (if (skip-dependencies? input)
+                            rest
+                            (append (derivation-inputs drv) rest))
                         (proc input result)
                         (set-insert key visited))))))))))

reply via email to

[Prev in Thread] Current Thread [Next in Thread]