diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-05-29 21:25:05 +0200 |
|---|---|---|
| committer | Janneke Nieuwenhuizen <janneke@gnu.org> | 2023-07-19 07:32:32 +0200 |
| commit | 5315c237020ae7d7fc3a9ac3fc72e7b99c5b75c9 (patch) | |
| tree | 414a6d9b15e87cdc8a625a181c82203050b96090 | |
| parent | ed88588931bafd6595cc038b9aeb5e8ff37561a8 (diff) | |
| download | guix-5315c237020ae7d7fc3a9ac3fc72e7b99c5b75c9.tar.gz guix-5315c237020ae7d7fc3a9ac3fc72e7b99c5b75c9.zip | |
gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224.
* 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.
| -rw-r--r-- | gnu/packages/commencement.scm | 41 |
1 files changed, 29 insertions, 12 deletions
diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index bec3db43e3..b4d02ac9cd 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2664,18 +2664,35 @@ memoized as a function of '%current-system'." (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 + (inherit (package-source gnumach-headers)) + (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"))))))) + (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 |