From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 8EIGA724+142fwAA0tVLHw (envelope-from ) for ; Tue, 30 Jun 2020 22:12:13 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id wHWUOry4+17GbAAA1q6Kng (envelope-from ) for ; Tue, 30 Jun 2020 22:12:12 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A63969404D9 for ; Tue, 30 Jun 2020 22:12:12 +0000 (UTC) Received: from localhost ([::1]:33106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqOU7-0005Fj-KO for larch@yhetil.org; Tue, 30 Jun 2020 18:12:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59198) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqOTz-0005AB-6N for guix-patches@gnu.org; Tue, 30 Jun 2020 18:12:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40364) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqOTy-0001Dy-Td for guix-patches@gnu.org; Tue, 30 Jun 2020 18:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jqOTy-0008DG-Po for guix-patches@gnu.org; Tue, 30 Jun 2020 18:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42146] [PATCH 3/?] gnu: commencement: Build fix for %bootstrap-mes-rewired. References: <20200630220913.14665-1-kuba@kadziolka.net> In-Reply-To: <20200630220913.14665-1-kuba@kadziolka.net> Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Jun 2020 22:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42146@debbugs.gnu.org Received: via spool by 42146-submit@debbugs.gnu.org id=B42146.159355509831531 (code B ref 42146); Tue, 30 Jun 2020 22:12:02 +0000 Received: (at 42146) by debbugs.gnu.org; 30 Jun 2020 22:11:38 +0000 Received: from localhost ([127.0.0.1]:51909 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqOTa-0008CU-4M for submit@debbugs.gnu.org; Tue, 30 Jun 2020 18:11:38 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:46556) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqOTY-0008CL-7H for 42146@debbugs.gnu.org; Tue, 30 Jun 2020 18:11:37 -0400 Received: (qmail 8847 invoked by uid 1009); 1 Jul 2020 00:11:35 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25858. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.01319 secs); 30 Jun 2020 22:11:35 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 1 Jul 2020 00:11:35 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Wed, 1 Jul 2020 00:11:34 +0200 Message-Id: <20200630221134.16350-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: Hf05Ai0xobSs Not every file has to refer to all dependencies. * gnu/packages/commencement.scm (%bootstrap-mes-rewired)[builder]: Allow lack of matches in substitute*. --- gnu/packages/commencement.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index ef250e037b..1c7cf3d810 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -8,6 +8,7 @@ ;;; Copyright © 2018, 2019, 2020 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2019, 2020 Marius Bakke ;;; Copyright © 2020 Timothy Sample +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -283,7 +284,7 @@ pure Scheme to Tar and decompression in one easy step.") (mescc (string-append bin "/mescc")) (module (string-append out "/share/mes/module"))) (define (rewire file) - (substitute* file + (substitute* file #:require-matches? #f ((mes) out) (("/gnu/store[^ ]+mes-minimal-[^/)}\"]*") out) (("/gnu/store[^ ]+guile-[^/]*/bin/guile") guile) -- 2.26.2