guix-commits
[Top][All Lists]
Advanced

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

01/01: profiles: Move 'manifest-entry-dependencies' user after definitio


From: Ludovic Courtès
Subject: 01/01: profiles: Move 'manifest-entry-dependencies' user after definition.
Date: Wed, 21 Jun 2017 05:59:39 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 2e2b5ad7bbf6cf693519e51500ad1cc7dce93ef5
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jun 21 11:58:39 2017 +0200

    profiles: Move 'manifest-entry-dependencies' user after definition.
    
    Reported by Efraim Flashner.
    
    * guix/profiles.scm (manifest-transitive-entries): Move after
    <manifest-entry> definition.
---
 guix/profiles.scm | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/guix/profiles.scm b/guix/profiles.scm
index 9858ec7..0c70975 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -159,23 +159,6 @@
 ;; Convenient alias, to avoid name clashes.
 (define make-manifest manifest)
 
-(define (manifest-transitive-entries manifest)
-  "Return the entries of MANIFEST along with their propagated inputs,
-recursively."
-  (let loop ((entries (manifest-entries manifest))
-             (result  '())
-             (visited (set)))                     ;compare with 'equal?'
-    (match entries
-      (()
-       (reverse result))
-      ((head . tail)
-       (if (set-contains? visited head)
-           (loop tail result visited)
-           (loop (append (manifest-entry-dependencies head)
-                         tail)
-                 (cons head result)
-                 (set-insert head visited)))))))
-
 (define-record-type* <manifest-entry> manifest-entry
   make-manifest-entry
   manifest-entry?
@@ -200,6 +183,23 @@ recursively."
   (output       manifest-pattern-output           ; string | #f
                 (default "out")))
 
+(define (manifest-transitive-entries manifest)
+  "Return the entries of MANIFEST along with their propagated inputs,
+recursively."
+  (let loop ((entries (manifest-entries manifest))
+             (result  '())
+             (visited (set)))                     ;compare with 'equal?'
+    (match entries
+      (()
+       (reverse result))
+      ((head . tail)
+       (if (set-contains? visited head)
+           (loop tail result visited)
+           (loop (append (manifest-entry-dependencies head)
+                         tail)
+                 (cons head result)
+                 (set-insert head visited)))))))
+
 (define (profile-manifest profile)
   "Return the PROFILE's manifest."
   (let ((file (string-append profile "/manifest")))



reply via email to

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