03/42: gnu: guix: Indent `copy-bootstrap-guile' code.

[guix-commits]

janneke pushed a commit to branch wip-hurd-vm
in repository guix.

commit 185aba87019798ad258907b2ab29464e6b5164f3
Author: Jan (janneke) Nieuwenhuizen <address@hidden>
AuthorDate: Fri Apr 24 10:11:48 2020 +0200

    gnu: guix: Indent `copy-bootstrap-guile' code.
    
    Wrapping in `if' and adding indentation in two commit, for clarity.
    
    * gnu/packages/package-management.scm (guix): Fix indentation.
---
 gnu/packages/package-management.scm | 82 ++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 02ddf1d..52092df 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -185,47 +185,47 @@ $(prefix)/etc/init.d\n")))
                     ,@(if (%current-target-system)
                           '()
                           `((add-before 'check 'copy-bootstrap-guile
-                      (lambda* (#:key system inputs #:allow-other-keys)
-                        ;; Copy the bootstrap guile tarball in the store used
-                        ;; by the test suite.
-                        (define (intern file recursive?)
-                          ;; Note: don't use 'guix download' here because we
-                          ;; need to set the 'recursive?' argument.
-                          (define base
-                            (strip-store-file-name file))
-
-                          (define code
-                            `(begin
-                               (use-modules (guix))
-                               (with-store store
-                                 (let* ((item (add-to-store store ,base
-                                                            ,recursive?
-                                                            "sha256" ,file))
-                                        (root (string-append "/tmp/gc-root-"
-                                                             (basename item))))
-                                   ;; Register a root so that the GC tests
-                                   ;; don't delete those.
-                                   (symlink item root)
-                                   (add-indirect-root store root)))))
-
-                          (invoke "./test-env" "guile" "-c"
-                                  (object->string code)))
-
-                        (intern (assoc-ref inputs "boot-guile") #f)
-
-                        ;; On x86_64 some tests need the i686 Guile.
-                        ,@(if (and (not (%current-target-system))
-                                   (string=? (%current-system)
-                                             "x86_64-linux"))
-                              '((intern (assoc-ref inputs "boot-guile/i686") 
#f))
-                              '())
-
-                        ;; Copy the bootstrap executables.
-                        (for-each (lambda (input)
-                                    (intern (assoc-ref inputs input) #t))
-                                  '("bootstrap/bash" "bootstrap/mkdir"
-                                    "bootstrap/tar" "bootstrap/xz"))
-                        #t))))
+                              (lambda* (#:key system inputs #:allow-other-keys)
+                                ;; Copy the bootstrap guile tarball in the 
store used
+                                ;; by the test suite.
+                                (define (intern file recursive?)
+                                  ;; Note: don't use 'guix download' here 
because we
+                                  ;; need to set the 'recursive?' argument.
+                                  (define base
+                                    (strip-store-file-name file))
+
+                                  (define code
+                                    `(begin
+                                       (use-modules (guix))
+                                       (with-store store
+                                         (let* ((item (add-to-store store ,base
+                                                                    ,recursive?
+                                                                    "sha256" 
,file))
+                                                (root (string-append 
"/tmp/gc-root-"
+                                                                     (basename 
item))))
+                                           ;; Register a root so that the GC 
tests
+                                           ;; don't delete those.
+                                           (symlink item root)
+                                           (add-indirect-root store root)))))
+
+                                  (invoke "./test-env" "guile" "-c"
+                                          (object->string code)))
+
+                                (intern (assoc-ref inputs "boot-guile") #f)
+
+                                ;; On x86_64 some tests need the i686 Guile.
+                                ,@(if (and (not (%current-target-system))
+                                           (string=? (%current-system)
+                                                     "x86_64-linux"))
+                                      '((intern (assoc-ref inputs 
"boot-guile/i686") #f))
+                                      '())
+
+                                ;; Copy the bootstrap executables.
+                                (for-each (lambda (input)
+                                            (intern (assoc-ref inputs input) 
#t))
+                                          '("bootstrap/bash" "bootstrap/mkdir"
+                                            "bootstrap/tar" "bootstrap/xz"))
+                                #t))))
                     (add-after 'unpack 'disable-failing-tests
                       ;; XXX FIXME: These tests fail within the build 
container.
                       (lambda _