janneke pushed a commit to branch wip-hurd
in repository guix.
commit 6f50aa9c8906d93e9cfcd0c37865ccfb3ae985ba
Author: Jan Nieuwenhuizen <[email protected]>
AuthorDate: Sun Mar 1 13:50:40 2020 +0100
gnu: commencement: hurd-headers-boot0: Build from tarball.
The 'hurd-headers' package now uses a git checkout and added dependencies on
autoconf and automake to build. Using those in commencement creates a
bootstrap loop. So, revert to a tarball release.
* gnu/packages/commencement.scm (hurd-version-boot0, hurd-source-boot0): New
variable.
(hurd-headers-boot0): Use it to build from tarball; remove autoconf,
automake,
texinfo bootstrap dependencies.
---
gnu/packages/commencement.scm | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index fbf8d36..69cf26f 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -3055,10 +3055,24 @@ exec " gcc "/bin/" program
(assoc-ref %build-inputs "flex")
"/lib/")))))))
(with-boot0 mig)))
+(define hurd-version-boot0 "0.9")
+(define hurd-source-boot0
+ (let ((version hurd-version-boot0))
+ (bootstrap-origin
+ (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnu/hurd/hurd-"
+ version ".tar.gz"))
+ (sha256
+ (base32
+ "1nw9gly0n7pyv3cpfm4mmxy4yccrx4g0lyrvd3vk2vil26jpbggw"))))))
+
(define hurd-headers-boot0
(let ((hurd-headers (package (inherit hurd-headers)
- (native-inputs `(("mig" ,mig-boot0)))
- (inputs '()))))
+ (version hurd-version-boot0)
+ (source hurd-source-boot0)
+ (native-inputs `(("mig" ,mig-boot0)))
+ (inputs '()))))
(with-boot0 (package-with-bootstrap-guile hurd-headers))))
(define hurd-minimal-boot0
