From patchwork Tue Nov 28 11:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 56887 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 1F46C27BBEA; Tue, 28 Nov 2023 11:35:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 A032027BBE2 for ; Tue, 28 Nov 2023 11:35:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7wMn-000506-2n; Tue, 28 Nov 2023 06:35:01 -0500 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 1r7wMl-0004z9-5E for guix-patches@gnu.org; Tue, 28 Nov 2023 06:34:59 -0500 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 1r7wMk-0007Iw-52; Tue, 28 Nov 2023 06:34:58 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r7wMo-0003Eh-0R; Tue, 28 Nov 2023 06:35:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67507] [PATCH] packages: Use glibc-utf8-locales/hurd in %standard-patch-inputs. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix@cbaines.net, dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, rekado@elephly.net, zimon.toutoune@gmail.com, me@tobias.gr, guix-patches@gnu.org Resent-Date: Tue, 28 Nov 2023 11:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 67507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67507@debbugs.gnu.org Cc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Received: via spool by submit@debbugs.gnu.org id=B.170117124512364 (code B ref -1); Tue, 28 Nov 2023 11:35:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Nov 2023 11:34:05 +0000 Received: from localhost ([127.0.0.1]:45564 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7wLs-0003DM-Pe for submit@debbugs.gnu.org; Tue, 28 Nov 2023 06:34:05 -0500 Received: from lists.gnu.org ([2001:470:142::17]:42946) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r7wLr-0003Cs-GU for submit@debbugs.gnu.org; Tue, 28 Nov 2023 06:34:03 -0500 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 1r7wLd-0004mE-HB for guix-patches@gnu.org; Tue, 28 Nov 2023 06:33:50 -0500 Received: from mira.cbaines.net ([2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r7wLb-000791-UV for guix-patches@gnu.org; Tue, 28 Nov 2023 06:33:49 -0500 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id 400AC27BBE2 for ; Tue, 28 Nov 2023 11:33:42 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 5e9dd6bb for ; Tue, 28 Nov 2023 11:33:41 +0000 (UTC) From: Christopher Baines Date: Tue, 28 Nov 2023 11:33:41 +0000 Message-ID: <5bf71a8fa945627d1610b772a04ac65031e8d6b6.1701171221.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a01:7e00:e000:2f8:fd4d:b5c7:13fb:3d27; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 When targeting the hurd. This is a follow up to 95ea1277ae2ebd278bdb51a7887f5ba1116fbc64 that prevents an infinite loop when trying to compute the derivation for guix for the hurd. * guix/packages.scm (%standard-patch-inputs): Use glibc-utf8-locales/hurd when targeting the hurd. Change-Id: I8cdc2d9c28677000290ca1b31f580c4d3043f1ef --- guix/packages.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) base-commit: 62376e3eb67644454bc655bed56be4be965bd13e diff --git a/guix/packages.scm b/guix/packages.scm index e2e82692ad..f4aa0e78fa 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -866,7 +866,10 @@ (define (%standard-patch-inputs) ("lzip" ,(ref '(gnu packages compression) 'lzip)) ("unzip" ,(ref '(gnu packages compression) 'unzip)) ("patch" ,(ref '(gnu packages base) 'patch)) - ("locales" ,(ref '(gnu packages base) 'glibc-utf8-locales))))) + ("locales" ,(ref '(gnu packages base) + (if (target-hurd?) + 'glibc-utf8-locales/hurd + 'glibc-utf8-locales)))))) (define (default-guile) "Return the default Guile package used to run the build code of