janneke pushed a commit to branch wip-bootstrap
in repository guix.
commit 43a2ec260c5ce4004643df323077c23240b04428
Author: Jan Nieuwenhuizen <[email protected]>
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 | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 25efeec..8848efc 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2822,7 +2822,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))))
@@ -2874,6 +2875,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)
@@ -2883,6 +2899,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)))
