From patchwork Tue Jul 18 13:15:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51790 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 28FC527BBEA; Tue, 18 Jul 2023 14:16:52 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 973AE27BBE2 for ; Tue, 18 Jul 2023 14:16:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYy-00034N-ST; Tue, 18 Jul 2023 09:16:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLkYd-0002yq-RQ for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qLkYd-0006lY-JQ for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLkYd-0003x4-F9 for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 4/8] gnu: commencement: gnumach-headers-boot0: Update to 1.8+git20221224. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 13:16:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64708 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64708@debbugs.gnu.org Received: via spool by 64708-submit@debbugs.gnu.org id=B64708.168968611915051 (code B ref 64708); Tue, 18 Jul 2023 13:16:03 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:19 +0000 Received: from localhost ([127.0.0.1]:52135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXv-0003ug-0Q for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:19 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXs-0003ts-7e for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qLkXn-0006Y2-1V; Tue, 18 Jul 2023 09:15:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=n9l91pEiwzFwkifjjSoKsLFHU8HneakBZI15lxQ7ziw=; b=KZi2Vr4WZXT0Izbacf74 +VGlrMK+OB67ayNiyFSIxiSosgMvXYit65+Nwun/XY//d77VU2pI51ncCGKnn2Bq8umHfkGNTriob P07Yu/Venym6e+KU3q9JIjZzMkuowWY2dA3DgUtgo6jcc+6V3s7edsQ4KRMH5ec/X2/SPKCoL2qMz 1WNdtcR6Jyzik6+Bqg0pYH7BOFi21g/qxQIxkp8AzYC4+9zxoGG+Tpop1/Nn8bXg9d18Zl3jgpvLD nQO+f17Hj7jX1TedW6fNksGMJaYPSg53PC7jLiDh7X3zTClb0DdWY9Z8LXAC/eLSE1ENERCvhRewM BldkK8aWwcsT2Q==; Received: from 2a02-a462-da03-1-aeb0-2f5e-e96a-dccb.fixed6.kpn.net ([2a02:a462:da03:1:aeb0:2f5e:e96a:dccb] helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1qLkXm-0004rp-KU; Tue, 18 Jul 2023 09:15:10 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:15:00 +0200 Message-Id: <0d6b3e695340f343aa03eb279846eb3e4e6ecee3.1689685375.git.janneke@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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