From: Janneke Nieuwenhuizen <janneke@gnu.org>
To: 64708@debbugs.gnu.org
Subject: [bug#64708] [PATCH 4/8] gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224.
Date: Tue, 18 Jul 2023 15:15:00 +0200 [thread overview]
Message-ID: <0d6b3e695340f343aa03eb279846eb3e4e6ecee3.1689685375.git.janneke@gnu.org> (raw)
In-Reply-To: <cover.1689685374.git.janneke@gnu.org>
* gnu/packages/commencement.scm (gnumach-headers-boot0)[name]: New field; give
proper name.
[source]: Update to 1.8+git20221224, using git-fetch-from-tarball.
[native-inputs]: Add autoconf-boot0, automake-boot0, texinfo-boot0.
[arguments]: Add 'patch-compat' phase to allow building hurd-minimal etc, with
our out-of-date bootstsrap binaries.
---
gnu/packages/commencement.scm | 46 ++++++++++++++++++++++++++---------
1 file changed, 34 insertions(+), 12 deletions(-)
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 1d69c2a80f..b15a71feb3 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2660,18 +2660,40 @@ (define gnumach-headers-boot0
(with-boot0
(package
(inherit gnumach-headers)
- (version "1.8-116-g28b53508")
- (source (bootstrap-origin
- (origin
- (method url-fetch)
- (uri (list (string-append "mirror://gnu/guix/mirror/gnumach-"
- version ".tar.gz")
- (string-append "https://lilypond.org/janneke/hurd/"
- "gnumach-" version ".tar.gz")))
- (sha256
- (base32
- "006i0zgwy81vxarpfm12vip4q6i5mgmi5mmy5ldvxp5hx9h3l0zg")))))
- (native-inputs '()))))
+ (name "gnumach-headers-boot0")
+ (version "1.8+git20221224")
+ (source
+ (origin
+ (method
+ (git-fetch-from-tarball
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://git.savannah.gnu.org/cgit/hurd/gnumach.git/snapshot/"
+ "gnumach-" version ".tar.gz"))
+ (sha256
+ (base32 "0vb19ynvrxz302snqxkd0wgizwa5fw2x06a4zjsllqb9ijbq9mc8")))))
+ (uri (git-reference
+ (url "https://git.savannah.gnu.org/git/hurd/gnumach.git")
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "0f49zqxf64ds75rmskizpybl2mw7sxs05k59gjp3pgspvr87w7gs"))))
+ (native-inputs (list autoconf-boot0 automake-boot0 texinfo-boot0))
+ (arguments
+ (substitute-keyword-arguments (package-arguments gnumach-headers)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (add-after 'unpack 'patch-compat
+ (lambda _
+ (substitute* '("include/device/device_types.h"
+ "include/mach_debug/slab_info.h"
+ "include/mach_debug/vm_info.h")
+ (("rpc_vm_size_t") "unsigned int")
+ (("rpc_vm_offset_t") "unsigned int")
+ (("rpc_long_natural_t") "unsigned long")
+ (("long_natural_t") "unsigned long")))))))))))
(define mig-boot0
(let* ((mig (package
--
2.40.1
next prev parent reply other threads:[~2023-07-18 13:16 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-18 13:11 [bug#64708] [PATCH 0/8] Fix cross build and native build for the Hurd Janneke Nieuwenhuizen
2023-07-18 13:14 ` [bug#64708] [PATCH 1/8] gnu: commencement: Add autoconf-boot0 Janneke Nieuwenhuizen
2023-07-18 13:14 ` [bug#64708] [PATCH 2/8] gnu: commencement: Add automake-boot0 Janneke Nieuwenhuizen
2023-07-18 13:14 ` [bug#64708] [PATCH 3/8] gnu: commencement: Add git-fetch-from-tarball utility Janneke Nieuwenhuizen
2023-07-18 21:13 ` [bug#64708] [PATCH 0/8] Fix cross build and native build for the Hurd Ludovic Courtès
2023-07-19 9:11 ` Josselin Poiret via Guix-patches via
2023-07-18 13:15 ` Janneke Nieuwenhuizen [this message]
2023-07-18 21:16 ` Ludovic Courtès
2023-07-18 21:31 ` Janneke Nieuwenhuizen
2023-07-18 22:21 ` Ludovic Courtès
2023-07-19 5:00 ` Janneke Nieuwenhuizen
2023-07-18 13:15 ` [bug#64708] [PATCH 5/8] gnu: commencement: mig-boot0: Update to 1.8+git20230520 Janneke Nieuwenhuizen
2023-07-18 21:17 ` [bug#64708] [PATCH 0/8] Fix cross build and native build for the Hurd Ludovic Courtès
2023-07-18 13:15 ` [bug#64708] [PATCH 6/8] gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216 Janneke Nieuwenhuizen
2023-07-18 13:15 ` [bug#64708] [PATCH 7/8] gnu: commencement: hurd-minimal-boot0: " Janneke Nieuwenhuizen
2023-07-18 13:15 ` [bug#64708] [PATCH 8/8] gnu: mig: Update to 1.8+git20230520 Janneke Nieuwenhuizen
2023-07-18 21:20 ` [bug#64708] [PATCH 0/8] Fix cross build and native build for the Hurd Ludovic Courtès
2023-07-18 21:38 ` Janneke Nieuwenhuizen
2023-07-19 9:08 ` Josselin Poiret via Guix-patches via
2023-07-19 9:32 ` Janneke Nieuwenhuizen
2023-07-18 21:23 ` Ludovic Courtès
2023-07-19 5:53 ` bug#64708: " Janneke Nieuwenhuizen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0d6b3e695340f343aa03eb279846eb3e4e6ecee3.1689685375.git.janneke@gnu.org \
--to=janneke@gnu.org \
--cc=64708@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).