From patchwork Tue Jul 18 13:15:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51784 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 3915C27BBE9; Tue, 18 Jul 2023 14:16:23 +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 2FC2327BBE2 for ; Tue, 18 Jul 2023 14:16:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYs-000310-EO; Tue, 18 Jul 2023 09:16:18 -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 1qLkYe-0002yz-Ei for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:04 -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-0006lf-Uc for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLkYd-0003xB-Qc for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 5/8] gnu: commencement: mig-boot0: Update to 1.8+git20230520. 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.168968612215083 (code B ref 64708); Tue, 18 Jul 2023 13:16:03 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:22 +0000 Received: from localhost ([127.0.0.1]:52145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXx-0003v6-Ey for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41010) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXu-0003u0-8W for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:18 -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 1qLkXp-0006YF-2W; Tue, 18 Jul 2023 09:15:13 -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=qFT8Iet1t1/ckzwxUPjrlCUFYQ0LKWNBZegD1G1yXcg=; b=cWpObxZ6gpmtKyn0Wb8U Id353+byiKa8sqV/ksQvgpdapWmTS7jDw0fmSt3c8OptQZ0G5739tBL5GPC/nzFNNbWlYRDIx0hi+ 0/YmdyC81HX64iDocsRlPJA64P2gRIKLBntnFqJ2r2uIXHrQY6rgPGCEQnlxY1eHMy6zcA0ZV1P+D UUxrAhWGCB/SEOevhF/V2pzTqNSDkb/vJ5zGkV/KLLWFX2XE0XbcCyA58QWWxIZ2FvH2c676Q+try GO6t49ADdc1+f/WKFSxJxX4qtGJkHY9OCyEKQILNE8tjIEkWjCNwRwzERyVF+FMhLycGdfTOb2sZF RhuS0koc/JyDiA==; 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 1qLkXn-0004rp-HJ; Tue, 18 Jul 2023 09:15:12 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:15:01 +0200 Message-Id: <96de3c312923a14bf2d1803aa13ace58ed9bd9c8.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 (mig-boot0): Remove redundant outer let. [name]: New field, give proper name. [version]: New field [source]: Update to 1.8+git20230520, using git-fetch-from-tarball. [native-inputs]: Add autoconf-boot0, automake-boot0. [inputs]: Add gnumach-headers-boot0. --- gnu/packages/commencement.scm | 42 ++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b15a71feb3..05a6badea0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2696,17 +2696,37 @@ (define gnumach-headers-boot0 (("long_natural_t") "unsigned long"))))))))))) (define mig-boot0 - (let* ((mig (package - (inherit (package-with-bootstrap-guile mig)) - (native-inputs `(("bison" ,bison-boot0) - ("flex" ,flex-boot0))) - (inputs `(("flex" ,flex-boot0))) - (arguments - ;; TODO: On next rebuild cycle, reuse phases from 'mig'. - `(#:configure-flags - `(,(string-append "LDFLAGS=-Wl,-rpath=" - (assoc-ref %build-inputs "flex") "/lib/"))))))) - (with-boot0 mig))) + (with-boot0 + (package + (inherit mig) + (name "mig-boot0") + (version "1.8+git20230520") + (source + (origin + (method + (git-fetch-from-tarball + (origin + (method url-fetch) + (uri (string-append + "https://git.savannah.gnu.org/cgit/hurd/mig.git/snapshot/" + "mig-" version ".tar.gz")) + (sha256 + (base32 "1l1vfm4wap5yxylv91wssgpy7fnq22wp3akgd5nv995kychfa9jy"))))) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/mig.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz")))) + (native-inputs (list autoconf-boot0 automake-boot0 bison-boot0 flex-boot0 + gnumach-headers-boot0)) + (inputs (list flex-boot0 gnumach-headers-boot0)) + (arguments + (list + #:configure-flags + #~(list (string-append "LDFLAGS=-Wl,-rpath=" + #$(this-package-native-input "flex") + "/lib/"))))))) (define hurd-version-boot0 "0.9-229-ga1efcee8") (define hurd-source-boot0