[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
60/63: bootstrap: Add tar-boot0.
From: |
guix-commits |
Subject: |
60/63: bootstrap: Add tar-boot0. |
Date: |
Sun, 24 Nov 2019 06:18:43 -0500 (EST) |
janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit f5d6972411cb1cf43c6722c15fe7f1ee424f92e7
Author: Jan Nieuwenhuizen <address@hidden>
Date: Sat Nov 23 09:13:50 2019 +0100
bootstrap: Add tar-boot0.
* gnu/packages/commencement.scm (tar-boot0): New variable.
(%boot0-inputs): Add it.
---
gnu/packages/commencement.scm | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index dad392c..59d783b 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2744,7 +2744,7 @@ exec " gcc "/bin/" program
(define patch-boot0
(package
- (inherit file)
+ (inherit patch)
(source (bootstrap-origin (package-source patch)))
(name "patch-boot0")
(native-inputs `(("ed" ,ed-boot0)))
@@ -2752,7 +2752,8 @@ exec " gcc "/bin/" program
`(("make" ,gnu-make-boot0)
,@(%bootstrap-inputs+toolchain)))
(arguments
- `(#:implicit-inputs? #f
+ `(#:tests? #f ; merge test fails
+ #:implicit-inputs? #f
#:guile ,%bootstrap-guile
#:strip-binaries? #f
#:validate-runpath? #f))))
@@ -2772,6 +2773,21 @@ exec " gcc "/bin/" program
#:guile ,%bootstrap-guile
,@(package-arguments sed)))))
+(define tar-boot0
+ (package
+ (inherit tar)
+ (name "tar-boot0")
+ (source (bootstrap-origin (package-source tar)))
+ (native-inputs '())
+ (inputs
+ `(("make" ,gnu-make-boot0)
+ ,@(%bootstrap-inputs+toolchain)))
+ (arguments
+ `(#:implicit-inputs? #f
+ #:tests? #f
+ #:guile ,%bootstrap-guile
+ ,@(package-arguments tar)))))
+
(define (%boot0-inputs)
`(("bzip2" ,bzip2-boot0)
("diffutils" ,diffutils-boot0)
@@ -2780,6 +2796,7 @@ exec " gcc "/bin/" program
("make" ,gnu-make-boot0)
("patch" ,patch-boot0)
("sed" ,sed-boot0)
+ ("tar" ,tar-boot0)
,@(%bootstrap-inputs+toolchain)))
(define* (boot-triplet #:optional (system (%current-system)))
- 50/63: bootstrap: gcc-mesboot-wrapper: Scheme-only bootstrap., (continued)
- 50/63: bootstrap: gcc-mesboot-wrapper: Scheme-only bootstrap., guix-commits, 2019/11/24
- 52/63: bootstrap: Remove m4-bootstrap., guix-commits, 2019/11/24
- 51/63: bootstrap: Add coreutils-mesboot., guix-commits, 2019/11/24
- 53/63: bootstrap: %bootstrap-inputs+toolchain: Scheme-only bootstrap., guix-commits, 2019/11/24
- 54/63: bootstrap: Add sed-boot0., guix-commits, 2019/11/24
- 55/63: bootstrap: Remove %bootstrap-coreutils&co, %bootstrap-bash., guix-commits, 2019/11/24
- 56/63: gnu: Add ed-1.4., guix-commits, 2019/11/24
- 57/63: bootstrap: Add ed-boot0., guix-commits, 2019/11/24
- 58/63: bootstrap: Add patch-boot0., guix-commits, 2019/11/24
- 59/63: bootstrap: Add bzip2-boot0., guix-commits, 2019/11/24
- 60/63: bootstrap: Add tar-boot0.,
guix-commits <=
- 61/63: bootstrap: Typo., guix-commits, 2019/11/24
- 62/63: bootstrap: Add coreutils-boot0., guix-commits, 2019/11/24
- 63/63: bootstrap: ACL: disable tests. FIXME: LD_PRELOAD., guix-commits, 2019/11/24