From patchwork Mon Dec 18 16:30:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57677 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 F137D27BBE9; Mon, 18 Dec 2023 16:31:38 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 89CDF27BBE2 for ; Mon, 18 Dec 2023 16:31:37 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGWI-0001Ws-85; Mon, 18 Dec 2023 11:31:06 -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 1rFGWG-0001WC-Mb for guix-patches@gnu.org; Mon, 18 Dec 2023 11:31:04 -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 1rFGWG-0007Wj-Dt; Mon, 18 Dec 2023 11:31:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGWE-0006hh-OE; Mon, 18 Dec 2023 11:31:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 1/9] packages: Remove reference to =?utf-8?b?4oCYZ2xpYmMtdXRmOC1sb2NhbGVz4oCZ?= in =?utf-8?b?4oCYcGF0Y2gtYW5k?= =?utf-8?b?LXJlcGFja+KAmS4=?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= 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: Mon, 18 Dec 2023 16:31:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67824 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67824@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice 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 67824-submit@debbugs.gnu.org id=B67824.170291705325056 (code B ref 67824); Mon, 18 Dec 2023 16:31:02 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:30:53 +0000 Received: from localhost ([127.0.0.1]:33346 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW4-0006VE-Hu for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44468) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW2-0006Gu-Cm for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:51 -0500 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 1rFGVu-0007Pn-C4; Mon, 18 Dec 2023 11:30:42 -0500 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=esGTSCCwbyWAuZisK1NnkyH8jwizKtf2uxVtQOahA4M=; b=qoWWFG5E5oRAOKaN59EH XKCV71eKNJhcjLUMyxkMW/VrYKrnzm2PAIsMbIW22JQso4SlEu2vfZMyz7f3LnJ3pqOKfKb4guBY3 Vb5rWN7WZ2fW9qIkoQv1t7tEjzFVnpoCeuv1BrGecHBYgeagwxrizfgvtECid53hn9NdL5YRXncKt M2i0sZ/rFRIL/y7sMal3b3c4I3x/dCCjk3PHIjjCdbihmHqXtTPEzdoPKq2GKqLQbikza0HnrF1Yd 8250YWg/RFk94H5IpY9aIJZeNqQj52Bf721KAdkT4WHD0nhtXozWpXn6UHzQGff5T35qLG6VR5U+i dHk7xyDQvHZaCA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:12 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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 This is a followup to 1cebc334a77030c0c94955981652f4df7608c9e3. * guix/packages.scm (%standard-patch-inputs): Remove “locales” entry. (patch-and-repack): Remove ‘locales’ variable. [build]: Remove reference to ‘locales’. Use “C.UTF-8” unconditionally. Change-Id: I54219b232880e05534599fbba8738cc00fb5d568 --- guix/packages.scm | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 930b1a3b0e..4b0c478ff4 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -866,13 +866,7 @@ (define (%standard-patch-inputs system) ("gzip" ,(ref '(gnu packages compression) 'gzip)) ("lzip" ,(ref '(gnu packages compression) 'lzip)) ("unzip" ,(ref '(gnu packages compression) 'unzip)) - ("patch" ,(ref '(gnu packages base) 'patch)) - ("locales" - ,(parameterize ((%current-target-system #f) - (%current-system system)) - (canonical - ((module-ref (resolve-interface '(gnu packages base)) - 'libc-utf8-locales-for-target)))))))) + ("patch" ,(ref '(gnu packages base) 'patch))))) (define (default-guile) "Return the default Guile package used to run the build code of @@ -955,7 +949,6 @@ (define* (patch-and-repack source patches (lzip (lookup-input "lzip")) (xz (lookup-input "xz")) (patch (lookup-input "patch")) - (locales (lookup-input "locales")) (comp (and=> (compressor source-file-name) lookup-input)) (patches (map instantiate-patch patches))) (define build @@ -1017,15 +1010,17 @@ (define* (patch-and-repack source patches ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) - (when #+locales - ;; First of all, install a UTF-8 locale so that UTF-8 file names - ;; are correctly interpreted. During bootstrap, LOCALES is #f. - (setenv "LOCPATH" - (string-append #+locales "/lib/locale/" - #+(and locales - (version-major+minor - (package-version locales))))) - (setlocale LC_ALL "en_US.utf8")) + ;; First of all, install a UTF-8 locale so that UTF-8 file names + ;; are correctly interpreted. During bootstrap, locales are + ;; missing. + (let ((locale "C.UTF-8")) + (catch 'system-error + (lambda () + (setlocale LC_ALL locale)) + (lambda args + (format (current-error-port) + "failed to install '~a' locale: ~a~%" + locale (system-error-errno args))))) (setenv "PATH" (string-append #+xz "/bin"