[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/36: gnu: guix: Indent `copy-bootstrap-guile' code.
From: |
guix-commits |
Subject: |
05/36: gnu: guix: Indent `copy-bootstrap-guile' code. |
Date: |
Fri, 24 Apr 2020 08:14:06 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit bf0fdbfddadf3f6bb9a7a7ad800805c2e46cfe85
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 d2eb6c7..4c55902 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 _
- branch wip-hurd-vm created (now 6c9efcd), guix-commits, 2020/04/24
- 04/36: gnu: guix: Do not copy bootstrap-guile when cross-compiling., guix-commits, 2020/04/24
- 01/36: compile: Pre-load the compiler outside 'with-target'., guix-commits, 2020/04/24
- 09/36: gnu: guix: Cross-build fix: override compressors., guix-commits, 2020/04/24
- 07/36: gnu: guix: Cross-build fixup for wrap-program., guix-commits, 2020/04/24
- 05/36: gnu: guix: Indent `copy-bootstrap-guile' code.,
guix-commits <=
- 06/36: gnu: guix: Cross-build workaround: Run native guile for version., guix-commits, 2020/04/24
- 14/36: gnu: hurd: Use default Qemu guest ip: 10.0.2.15., guix-commits, 2020/04/24
- 10/36: gnu: guix: Run `make update-guix-package'., guix-commits, 2020/04/24
- 11/36: vm: Make the device node procedure a parameter., guix-commits, 2020/04/24
- 12/36: gnu: hurd: Build DDE libraries., guix-commits, 2020/04/24
- 17/36: gnu: hurd: Add NFS support., guix-commits, 2020/04/24
- 19/36: system: hurd: Add less, which to %base-packages/hurd., guix-commits, 2020/04/24
- 03/36: gnu: guix: Apply courage for the Hurd., guix-commits, 2020/04/24
- 15/36: gnu: Add dde-sources., guix-commits, 2020/04/24
- 16/36: gnu: Add netdde., guix-commits, 2020/04/24