From patchwork Tue Jul 18 13:14:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51787 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 7A10F27BBE9; Tue, 18 Jul 2023 14:16:38 +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=unavailable 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 6480427BBE2 for ; Tue, 18 Jul 2023 14:16:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYg-0002zd-UQ; Tue, 18 Jul 2023 09:16:06 -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-0002yd-Iw 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-0006l9-BG 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 1qLkYc-0003wh-La for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 1/8] gnu: commencement: Add autoconf-boot0. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 13:16:02 +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.168968611415013 (code B ref 64708); Tue, 18 Jul 2023 13:16:02 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:14 +0000 Received: from localhost ([127.0.0.1]:52125 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXq-0003u4-EA for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52764) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXo-0003tn-5e for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:13 -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 1qLkXi-0006WR-Tm; Tue, 18 Jul 2023 09:15:06 -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=cUhQshLcBZAWSxxEK8D9Y3Gv2quYCxka+J2APgePjgg=; b=PGdwVG+x5vJA/q0rMKtI FMujANgxP59+8wwMo/Df71TsCcdi7Zt1yP0MZ3XfJf3oXs5DagHC1447TJHXZkRTn7RLuoQu8Jsi+ vyCHEhM4QVDCRV5VXvHkZIn/aaT5vKH03Lar4XZEJPuHTViA7DnIazKSmBo9mOdUy5aRePCT6heDO X7eXygev0YXtcfZDUE9wLvAZg3QRkLDrHXYjK/EFRQNKTBWcr2Esk4qoCfkVthXnSiJBwMa2rUZY/ PFlR4dJ2LexPix7HCIj8e/tq/xzwInqfQWjL6Eo4RGpJJfpyMj6bCKhKxiNp0gh+EbMb5rM4bxwW4 LBs+yXe6S4uW7g==; 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 1qLkXh-0004rp-Ix; Tue, 18 Jul 2023 09:15:06 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:14:57 +0200 Message-Id: <3401eff21a200de7e6571ecb6123558c54c0ec4e.1689685374.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 (autoconf-boot0): New variable. --- gnu/packages/commencement.scm | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 9bd0c113c2..3ccd51ac52 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -33,6 +33,7 @@ (define-module (gnu packages commencement) #:use-module (gnu packages) #:use-module (gnu packages bootstrap) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages c) @@ -2602,6 +2603,15 @@ (define with-boot0 (package-with-explicit-inputs %boot0-inputs %bootstrap-guile)) +(define autoconf-boot0 + (with-boot0 + (package + (inherit autoconf) + (name "autoconf-boot0") + (native-inputs (list m4-boot0 perl-boot0)) + (inputs '()) + (arguments (list #:tests? #f))))) + (define gnumach-headers-boot0 (with-boot0 (package From patchwork Tue Jul 18 13:14:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51786 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 C1B0927BBE9; Tue, 18 Jul 2023 14:16:35 +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=unavailable 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 A7E4027BBE2 for ; Tue, 18 Jul 2023 14:16:34 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYg-0002zH-UC; Tue, 18 Jul 2023 09:16:06 -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-0002yc-Gm 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-0006lO-88 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-0003wx-3u for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 2/8] gnu: commencement: Add automake-boot0. 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.168968611615029 (code B ref 64708); Tue, 18 Jul 2023 13:16:03 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:16 +0000 Received: from localhost ([127.0.0.1]:52129 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXr-0003uL-OI for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40996) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXq-0003tq-Sb for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:15 -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 1qLkXl-0006X8-La; Tue, 18 Jul 2023 09:15:09 -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=yhMdBmvC3yPf0dwtFjDDP0IJQz55tTeiwTX8+0Ta93w=; b=Ivk2S7Q2ZPCm43jkkdgk U2g2Dt2LlbfHdzO10Zdl4Gz4g2BBk5qXDSctkYDhXq8pD9SmATcUOCnQ8nIPLrY9bNGTqPI7R2yP9 WeKbIEFz1lHnW6+7/omiGNa7lODHo0auvHQG70xOFfQ3KvP2H/Sk8r5/UbYEv0TbMQdh6ldH6CFAy ho4MVPXnBEN5wxQ3+0xwjjJW3rY5slS4T6CHZPNVzBPhNjVn25RrSptBXhycufX0jURYl40xiMrZw c8l2mh3qReHiqxM6ivJCRlxvrCQhlHWb4NM/otgWJMo6WyVzxNO5QLwl+a9UgfP/Pfp2AbH8o0vn/ 1iuMzrMwNs+VtQ==; 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 1qLkXj-0004rp-DP; Tue, 18 Jul 2023 09:15:08 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:14:58 +0200 Message-Id: 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 (automake-boot0): New variable. --- gnu/packages/commencement.scm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 3ccd51ac52..d0603e62c8 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2612,6 +2612,19 @@ (define autoconf-boot0 (inputs '()) (arguments (list #:tests? #f))))) +(define automake-boot0 + (with-boot0 + (package + (inherit automake) + (name "automake-boot0") + (source (origin + (inherit (package-source automake)) + (patches '()))) ;test are skipped anyway + (native-inputs (list autoconf-boot0 m4-boot0 perl-boot0)) + (inputs '()) + (arguments + (list #:tests? #f))))) + (define gnumach-headers-boot0 (with-boot0 (package From patchwork Tue Jul 18 13:14:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51785 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 9C91627BBE9; Tue, 18 Jul 2023 14:16:30 +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=unavailable 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 700A127BBE2 for ; Tue, 18 Jul 2023 14:16:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYw-00032f-Qe; Tue, 18 Jul 2023 09:16:22 -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 1qLkYf-0002zG-1D for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:06 -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 1qLkYe-0006lz-L2 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 1qLkYe-0003xQ-Gk for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 3/8] gnu: commencement: Add git-fetch-from-tarball utility. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 13:16:04 +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 Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 64708-submit@debbugs.gnu.org id=B64708.168968612215097 (code B ref 64708); Tue, 18 Jul 2023 13:16:04 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:22 +0000 Received: from localhost ([127.0.0.1]:52149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXy-0003vL-8x for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41028) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXv-0003u5-Kz for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:19 -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 1qLkXm-0006Xb-6B; Tue, 18 Jul 2023 09:15:10 -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=JjdNExDEZ3C55h7l7tyVDVkrfVctwSD28oL54tPCS4M=; b=rPu3Bl1Uv/2siYHL23DT 5ezjK1YAtY0PddQ7uHSopVz4RnBC5PR5jjm6Zk/f7YxwE2sYOA9N65d7H7qWjpbs7qLx1dJE0QGpM d1KCekV7HONKNGJ/NL2uv6g1Clwo6CkfR/WowZe/tmn+DOO7hieWUkfmVIJvjkH+dB8v/AUFcjhGC 0IqLjr2Voo8KFPh56zUAxKBxkEGQHhK4Mx7WwMEQ5/qECBKfefRI7cFFprqtKJ2OtYjyaomSfMwxm WuDy0VS7BZJzvTs3Kwr/hrWZEdH6ibosF6wCytWjaOdhMH5WnGBvKHGCukCmOnJ2sb6UfpW2h4i4A Q8YEIrYbmW98rA==; 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 1qLkXl-0004rp-PI; Tue, 18 Jul 2023 09:15:09 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:14:59 +0200 Message-Id: <161bab138845fe307ec92b8fea181e00ece86e58.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 From: Ludovic Courtès * gnu/packages/commencement.scm (git-fetch-from-tarball): New procedure. --- gnu/packages/commencement.scm | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index d0603e62c8..1d69c2a80f 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -57,7 +57,10 @@ (define-module (gnu packages commencement) #:use-module (gnu packages xml) #:use-module (guix gexp) #:use-module (guix packages) + #:use-module ((guix store) #:select (%store-monad)) + #:use-module (guix monads) #:use-module (guix download) + #:use-module ((guix git-download) #:select (git-reference git-file-name)) #:use-module (guix build-system gnu) #:use-module (guix build-system trivial) #:use-module ((guix licenses) #:prefix license:) @@ -90,6 +93,34 @@ (define-module (gnu packages commencement) ;;; ;;; Code: +(define* (git-fetch-from-tarball tarball) + (lambda* (url hash-algo hash + #:optional name + #:key (system (%current-system)) + (guile %bootstrap-guile)) + (mlet %store-monad ((guile (package->derivation guile system))) + (gexp->derivation + (or name "git-checkout") + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils) + (ice-9 ftw) + (ice-9 match)) + (setenv "PATH" + #+(file-append %bootstrap-coreutils&co "/bin")) + (invoke (string-append #+tar "/bin/tar") + "xf" #$tarball) + (match (scandir ".") + (("." ".." directory) + (copy-recursively directory #$output))))) + #:recursive? #t + #:hash-algo hash-algo + #:hash hash + #:system system + #:guile-for-build guile + #:graft? #f + #:local-build? #t)))) + (define bootar (package (name "bootar") 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 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 From patchwork Tue Jul 18 13:15:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51788 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 7BF3C27BBE9; Tue, 18 Jul 2023 14:16:45 +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=unavailable 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 E6CB827BBE2 for ; Tue, 18 Jul 2023 14:16:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYi-0002zt-Qj; Tue, 18 Jul 2023 09:16:08 -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-0002z1-I7 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 1qLkYe-0006ll-9V 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 1qLkYe-0003xJ-5N for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 6/8] gnu: commencement: hurd-headers-boot0: Update to 0.9.git20230216. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 13:16:04 +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.168968612215090 (code B ref 64708); Tue, 18 Jul 2023 13:16:04 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:22 +0000 Received: from localhost ([127.0.0.1]:52147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXx-0003vE-Tc for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXv-0003u3-56 for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:19 -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-0006YO-V9; 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=kvQl9AyWY3e+r6eynRDbuNeH42OA848EJrN/I2rJQEA=; b=CpLjwdFqc8rVxM76JJLM OF1v4Cqdc0y/Re3WYhi+qJNwFFlDhDlNIHRpUfRVfYMKEc6uXthLtwUniBVLynIPXBWDJX3CB8i+r v93XQmYakoPVheW0uaJjlyaLbcX7e2083k7By8aiPj4zUbnk2YgMrc8k/0Fe29/3F4GGtiRoAA1Za SS+wAiRtd6CfNawUy9CM4Bzd62IspoXn2f2zahL4BcG5hmEuIp85DYclM/r/oAHG0wJfHKOcrnYtT o3ARg3xnzoAVU1a/UhVodjyNaqy8XVpbPaPNKqoLmH6zJfV5xwplQ8Uktd7E6OcaQhJYAlMsNG4bf lS7ZFdl3nd40Mw==; 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 1qLkXp-0004rp-If; Tue, 18 Jul 2023 09:15:13 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:15:02 +0200 Message-Id: <3497e77b40e5573b2969bd171b486f7b7e7e0161.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 (hurd-headers-boot0): Remove redundant outer let and package-with-bootstrap-guile. [name]: New field; give proper name. [version]: New field. [source]: Update to 0.9.git20230216, using git-fetch-from-tarball. [inputs]: Add autoconf-boot0, automake-boot0, gnumach-headers-boot0. --- gnu/packages/commencement.scm | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 05a6badea0..86246c3b08 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2742,12 +2742,31 @@ (define hurd-source-boot0 "0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy"))))) (define hurd-headers-boot0 - (let ((hurd-headers (package (inherit hurd-headers) - (version hurd-version-boot0) - (source hurd-source-boot0) - (native-inputs `(("mig" ,mig-boot0))) - (inputs '())))) - (with-boot0 (package-with-bootstrap-guile hurd-headers)))) + (with-boot0 + (package + (inherit hurd-headers) + (name "hurd-headers-boot0") + (version "0.9.git20230216") + (source + (origin + (method + (git-fetch-from-tarball + (origin + (method url-fetch) + (uri (string-append + "https://git.savannah.gnu.org/cgit/hurd/hurd.git/snapshot/" + "hurd-v" version ".tar.gz")) + (sha256 + (base32 "1f75nlkcl00dqnnrbrj1frvzs2qibfpygj3gwywqi85aldjl48y7"))))) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/hurd.git") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0jm1dnqkx4kdwmby0z5w0yqp9m5qp4hbxd4jxlyhiqm8nkw9mkvv")))) + (native-inputs + (list autoconf-boot0 automake-boot0 mig-boot0)) + (inputs '())))) (define hurd-minimal-boot0 (let ((hurd-minimal (package (inherit hurd-minimal) From patchwork Tue Jul 18 13:15:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51783 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 1574127BBE9; Tue, 18 Jul 2023 14:16:22 +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=unavailable 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 A062627BBE2 for ; Tue, 18 Jul 2023 14:16:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYj-0002zx-Ao; Tue, 18 Jul 2023 09:16:09 -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 1qLkYf-0002zI-94 for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:05 -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 1qLkYf-0006m6-1N for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLkYe-0003xX-SV for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 7/8] gnu: commencement: hurd-minimal-boot0: Update to 0.9.git20230216. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 18 Jul 2023 13:16:04 +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.168968612315104 (code B ref 64708); Tue, 18 Jul 2023 13:16:04 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:23 +0000 Received: from localhost ([127.0.0.1]:52151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXy-0003vS-LW for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41038) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXw-0003uI-6A for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:20 -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 1qLkXq-0006Yf-VF; Tue, 18 Jul 2023 09:15:15 -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=qyO5v29HWvIM6ZEBJ3NNRuy9Q6sefmQ3iZiG8QeWWSQ=; b=M0LSfaamRXyFtL+ubQge nZpQ2ZXO7ZGQnX8QLkeYoaS6u6hcFC5CztiSWtkJ/24p29C8T0WWmr9uL1Kc4Iabreofn/fcFTHDi qayzeDitHKMxdm+drtl66KuHNe5Csswu+8TheZaHVhcLcvQeJzgDwH3T1HCPj5Av8B6DT8JC6VLZN d0BuLpE3xQu+s064NIG7eCBIHY7IAPqz9j/5MzU4BubWBPmQNwaF0pDRLpoDwt0ekm0wu0+CUcpii wRt1fN3jstgeexuRs4S7+b+A46UnsWCFk3kiyHId7x9Tl8ReymAd+U3oTCBwXUhk3gS+BufAYEiYg X39S5cz2sVFujw==; 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 1qLkXq-0004rp-JB; Tue, 18 Jul 2023 09:15:14 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:15:03 +0200 Message-Id: <6876c1d9bc1f349af9d9679127dfdbfebe100712.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 (hurd-minimal-boot0): Remove redundant let and package-with-bootstrap-guile. [name]: New field; give proper name. [version]: New field. [source]: Update to 0.9.git20230216, using hurd-headers-boot0' source. [inputs]: Add autoconf-boot0, automake-boot0, gnumach-headers-boot0. [native-inputs]: Add autoconf-boot0, automake-boot0, and gnumach-headers-boot0. * gnu/packages/commencement.scm (hurd-version-boot0, hurd-source-boot0): Remove. --- gnu/packages/commencement.scm | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 86246c3b08..7e988129a5 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -2728,19 +2728,6 @@ (define mig-boot0 #$(this-package-native-input "flex") "/lib/"))))))) -(define hurd-version-boot0 "0.9-229-ga1efcee8") -(define hurd-source-boot0 - (let ((version hurd-version-boot0)) - (origin - (method url-fetch) - (uri (list (string-append "mirror://gnu/guix/mirror/hurd-v" - version ".tar.gz") - (string-append "https://lilypond.org/janneke/hurd/" - "hurd-v" version ".tar.gz"))) - (sha256 - (base32 - "0bq2q2jisxcy0kgcm6rz0z2fddwxxm7azsama7li28a2m08kdpzy"))))) - (define hurd-headers-boot0 (with-boot0 (package @@ -2769,12 +2756,14 @@ (define hurd-headers-boot0 (inputs '())))) (define hurd-minimal-boot0 - (let ((hurd-minimal (package (inherit hurd-minimal) - (version hurd-version-boot0) - (source hurd-source-boot0) - (native-inputs `(("mig" ,mig-boot0))) - (inputs '())))) - (with-boot0 (package-with-bootstrap-guile hurd-minimal)))) + (with-boot0 + (package + (inherit hurd-minimal) + (name "hurd-minimal-boot0") + (source (package-source hurd-headers-boot0)) + (native-inputs + (list autoconf-boot0 automake-boot0 gnumach-headers-boot0 mig-boot0)) + (inputs (list gnumach-headers-boot0))))) (define/system-dependent hurd-core-headers-boot0 ;; Return the Hurd and Mach headers as well as initial Hurd libraries for From patchwork Tue Jul 18 13:15:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 51789 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 E188627BBE9; Tue, 18 Jul 2023 14:16:50 +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=unavailable 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 D231527BBE2 for ; Tue, 18 Jul 2023 14:16:48 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qLkYy-00034C-Qq; Tue, 18 Jul 2023 09:16:25 -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 1qLkYg-0002zc-M5 for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:06 -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 1qLkYf-0006mB-Bq for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qLkYf-0003xf-7d for guix-patches@gnu.org; Tue, 18 Jul 2023 09:16:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64708] [PATCH 8/8] gnu: mig: 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:05 +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 Cc: Josselin Poiret Received: via spool by 64708-submit@debbugs.gnu.org id=B64708.168968612915118 (code B ref 64708); Tue, 18 Jul 2023 13:16:05 +0000 Received: (at 64708) by debbugs.gnu.org; 18 Jul 2023 13:15:29 +0000 Received: from localhost ([127.0.0.1]:52153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkY5-0003vl-0x for submit@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41054) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qLkXx-0003uT-4e for 64708@debbugs.gnu.org; Tue, 18 Jul 2023 09:15:21 -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 1qLkXr-0006Ys-UU; Tue, 18 Jul 2023 09:15:15 -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=fhxohqBFumQsq/oW4Bmd70GM5J/lybqqt6ohgO93y6Q=; b=PJnxTrN/sqrdMWq6rmnq txAdrBbTYRzhF2BhoKDEbSl9YcdYI0LctE7shASneWHpdfuOZwqFLw37IwxyWbgOReT1cQx2jnmi9 mfvVIPKOs2UUZZqZCpKS62OEM4S1YH9FQa84Sm8Ei5ZsPU5edkTokBgkZmMmSTVl930LFD+saWQ5b O7PjZ607y6u+fVJHa/mbalKOwXSVLElNf56PCkWbbkuJph9o4HCw2fvhrUW0v7TjJUwZjeZUTkvoM 0v6FRawS6JJGY23TaPYf3eOU73PZW1ZRZ0A+Q0ZE8Z6IQIPLQwR54Eei2LeHraUntzXQ1uzB+qtfD MBnV24SswYhZLA==; 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 1qLkXr-0004rp-I4; Tue, 18 Jul 2023 09:15:15 -0400 From: Janneke Nieuwenhuizen Date: Tue, 18 Jul 2023 15:15:04 +0200 Message-Id: <61835f33c6fee35457c7277e3216c10c15d0a391.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 From: Josselin Poiret Now that mig-boot0 has been updated not to use mig's source, we can safely update mig. * gnu/packages/hurd.scm (mig)[source]: Update to 1.8+git20230520. --- gnu/packages/hurd.scm | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/gnu/packages/hurd.scm b/gnu/packages/hurd.scm index 3785c47750..4064a9e2e8 100644 --- a/gnu/packages/hurd.scm +++ b/gnu/packages/hurd.scm @@ -91,24 +91,20 @@ (define-public gnumach-headers (define-public mig (package (name "mig") - (version "1.8+git20220827") + (version "1.8+git20230520") (source (origin - (method url-fetch) - ;; XXX: Version 2.35 of glibc can only be built with an - ;; unreleased version of MiG: - ;; . - ;; It cannot be fetched from Git though, as the extra dependency - ;; on Autoconf/Automake would complicate bootstrapping. - (uri (string-append "mirror://gnu/guix/mirror/mig-" - version ".tar.gz")) + (method git-fetch) + (uri (git-reference + (url "https://git.savannah.gnu.org/git/hurd/mig.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 (base32 - "163d37s9lscd6zxyfng421m9nl857464mgjj90xsrcl5ykbng5p2")) - (patches (search-patches "mig-cpu.h-generation.patch")))) + "10r0fdjqjzqsy6ajb21rifvhw0wpjvrw6a1zdyliqlzqny5k0qlz")))) (build-system gnu-build-system) ;; Flex is needed both at build and run time. (inputs (list gnumach-headers flex)) - (native-inputs (list flex bison)) + (native-inputs (list autoconf automake flex bison)) (arguments (list #:tests? #f #:phases