From patchwork Thu Dec 14 13:37:37 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: 57599 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 19D6E27BBED; Thu, 14 Dec 2023 13:40:08 +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 AD65227BBEA for ; Thu, 14 Dec 2023 13:40:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDlvh-0005Yg-7h; Thu, 14 Dec 2023 08:39:09 -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 1rDlvf-0005Xw-UR for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:07 -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 1rDlvf-0003Yc-Lm; Thu, 14 Dec 2023 08:39:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDlva-0007Gj-7e; Thu, 14 Dec 2023 08:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates 1/6] 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: Thu, 14 Dec 2023 13:39: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.170256109027793 (code B ref 67824); Thu, 14 Dec 2023 13:39:02 +0000 Received: (at 67824) by debbugs.gnu.org; 14 Dec 2023 13:38:10 +0000 Received: from localhost ([127.0.0.1]:48950 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDluk-0007EC-Dc for submit@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37310) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlui-0007Dx-LF for 67824@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:09 -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 1rDluc-0002fr-Ko; Thu, 14 Dec 2023 08:38:02 -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=j6SzzXJdMe5/JodZ2Mmc 5yN9qej3jDdoy5P68nrRAAiLIM8BQ0xYlYEheqBa8HF23Atd1q3qj0DGqUWw/+qW8Zkk2oScObaEI uDpzzk/ecDQ/JyoRcN+vdvO+HublE2Esi2Ll+bPd/tXvjKHWKIZ8H+tqRt/RgcnT/ronHWm/1k/v7 2AA7IG0uGuvMGdudcaDI+TieFxXwQhEjezSlX5aHpje7oilGdSC/LEQfA54cwsLuxifxVeWVSJoM2 tdEISymY2BvCp6UdrgH7EPXKeyW+V47zvzqMGZELu0YRESLDigau3WSh6LEnTbc+8ILtR+f84+U56 bVW9BQ/eVlxuJQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 14 Dec 2023 14:37:37 +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" From patchwork Thu Dec 14 13:37:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57595 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 2524127BBEE; Thu, 14 Dec 2023 13:40:03 +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 DDA4227BBEA for ; Thu, 14 Dec 2023 13:40:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDlve-0005X6-HT; Thu, 14 Dec 2023 08:39: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 1rDlvb-0005Vs-Ny for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39: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 1rDlvb-0003Vj-Fh for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDlva-0007Gp-MJ for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates 2/6] build-system/gnu: Change default locale to C.UTF-8. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Dec 2023 13:39: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?= Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170256109927814 (code B ref 67824); Thu, 14 Dec 2023 13:39:02 +0000 Received: (at 67824) by debbugs.gnu.org; 14 Dec 2023 13:38:19 +0000 Received: from localhost ([127.0.0.1]:48954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlus-0007EY-QC for submit@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlur-0007EL-86 for 67824@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:17 -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 1rDlum-0002nR-MO; Thu, 14 Dec 2023 08:38:12 -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=yEzo0D57tC1n5USaZP8ls4vTfLo1FE5r2OarIyYJPK4=; b=ozuFdqB+Jk9ZHjLYwLct dlAtI3zZUBz8wQQ4Ct/FAThb3t/Alq6xViHAQG7ANKAmDYuMscqo667BbBqHgtchCfX6BJnJXas6D FIhItzY6VmT7nPICErAJ4kaIhkQx2qcEWeeMCqUn9BhCyzIhbjx5WsocGm+sgR5YdOTM+QDq8gQPz sOeyQzCIu9Gk0HiKy2b4E05QdNcu4Fp/5iyZcdpiMajjxRw6Kr2oPmZTCfybn+NM460TDLNemW0Mv B2nZNerLcdZLsB/wPCb/aAagK+ZI6oMEieOT8Q7qA7KCUzbZIpeWNoAf486tlttya5VBWDIO2hWUz +RGNGyAoHWQQEw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 14 Dec 2023 14:37:38 +0100 Message-ID: <1df36313ccd91f5249261ae14d222658d5564183.1702550735.git.ludo@gnu.org> 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/build-system/gnu.scm (gnu-build, gnu-cross-build): #:locale now defaults to "C.UTF-8". Change-Id: I9a4bfe564bcd8bbd0d57ba04568eb6b8020bd051 --- guix/build-system/gnu.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index ed1dc33c76..0f886fe21d 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -361,7 +361,7 @@ (define* (gnu-build name inputs (make-dynamic-linker-cache? #t) (license-file-regexp %license-file-regexp) (phases '%standard-phases) - (locale "en_US.utf8") + (locale "C.UTF-8") (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %default-gnu-imported-modules) @@ -501,7 +501,7 @@ (define* (gnu-cross-build name (license-file-regexp %license-file-regexp) (phases '%standard-phases) - (locale "en_US.utf8") + (locale "C.UTF-8") (system (%current-system)) (build (nix-system->gnu-triplet system)) (imported-modules %default-gnu-imported-modules) From patchwork Thu Dec 14 13:37:39 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: 57598 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 A6DFE27BBE2; Thu, 14 Dec 2023 13:40:06 +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=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 3AC0C27BBED for ; Thu, 14 Dec 2023 13:40:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDlve-0005XO-Ou; Thu, 14 Dec 2023 08:39: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 1rDlvc-0005W4-8n for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39: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 1rDlvc-0003WH-06 for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDlvb-0007Gx-6w for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates 3/6] gnu: commencement: Remove =?utf-8?b?4oCYZ2xpYmMtdXRmOC1sb2NhbGVz4oCZ?= from =?utf-8?b?4oCYJWZpbmFs?= =?utf-8?b?LWlucHV0c+KAmS4=?= Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Dec 2023 13:39:03 +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?= Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170256110727849 (code B ref 67824); Thu, 14 Dec 2023 13:39:03 +0000 Received: (at 67824) by debbugs.gnu.org; 14 Dec 2023 13:38:27 +0000 Received: from localhost ([127.0.0.1]:48961 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlv0-0007Ev-5b for submit@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlux-0007EX-PZ for 67824@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:24 -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 1rDlus-0002xS-UX; Thu, 14 Dec 2023 08:38:19 -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=r9wGA/+CXEPOp5EOH40rNSzpYDxMrzUg+jLA9nlIY2s=; b=sDXq6sGm8mnraPfx75Gx 97/rdbhdcdEUc1D4qf6ux7fDjbyeZ5ghnq/2D/UZDBHiC1fG0NqiX7wMB9CpVLSMSrqLqT/PDf5ZB YQ8DtcVRmE6EWN7qi4LrObvJ8mqu8KLi+6tb5bkGX4aQgTuolLVL2cd0caVpGdQwAw5mvJOjDYXA5 OPg8hb5BLYWOyyDanAl6DtbO5yfaW+knfmIlBmpf4hm8K2JoEzYzhdw1Upkbej5Cf2oJ9GX4b1lEx WZBs1NvMkJ+b2iZA/rtoiMdpy9bUVdz1BJq/VUhgfSCpb9zkzrnH0llixVL0lalcanLXYUJmDtofP THt2vw6lR65EPw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 14 Dec 2023 14:37:39 +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 * gnu/packages/commencement.scm (%boot5-inputs): Make an alias for ‘%boot4-inputs’. (with-boot5): Turn into an alias for ‘with-boot4’. (%final-inputs): Override ‘native-inputs’ of GAWK. Remove "locales" entry. (canonical-package): Add “glibc-utf8-locales” entry. * gnu/packages/base.scm (libc-utf8-locales-for-target): Use ‘canonical-package’. * gnu/packages/gawk.scm (gawk)[native-inputs]: New field. * gnu/packages/texinfo.scm (texinfo)[native-inputs]: Add ‘libc-utf8-locales-for-target’. Change-Id: I2283ffc6c6000c98ad2db89c04d581e050667c94 --- gnu/packages/base.scm | 11 ++++++++--- gnu/packages/commencement.scm | 31 +++++++++++++++---------------- gnu/packages/gawk.scm | 6 +++++- gnu/packages/texinfo.scm | 7 +++++-- 4 files changed, 33 insertions(+), 22 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 235ad7fecc..d31c0b0772 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1593,9 +1593,14 @@ (define* (libc-locales-for-target #:optional (define* (libc-utf8-locales-for-target #:optional (target (or (%current-target-system) (%current-system)))) - (if (target-hurd? target) - glibc-utf8-locales/hurd - glibc-utf8-locales)) + "Return the glibc UTF-8 locale package for TARGET." + ;; Note: To avoid circular dependencies (such as: texinfo -> + ;; glibc-utf8-locales -> glibc -> texinfo), refer to + ;; 'glibc-utf8-locales-final' via 'canonical-package'. + (canonical-package + (if (target-hurd? target) + glibc-utf8-locales/hurd + glibc-utf8-locales))) (define-public tzdata (package diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 988e497ee7..f4882f7cdd 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3394,17 +3394,11 @@ (define-public ld-gold-wrapper #:guile guile-final #:bash bash-final)) -(define (%boot5-inputs) - ;; Now with UTF-8 locales. Remember that the bootstrap binaries were built - ;; with an older libc, which cannot load the new locale format. See - ;; . - `(("locales" ,(if (target-hurd?) - glibc-utf8-locales-final/hurd - glibc-utf8-locales-final)) - ,@(%boot4-inputs))) - -(define with-boot5 - (package-with-explicit-inputs %boot5-inputs)) +;; There used to be a "stage 5" including a variant of the +;; 'glibc-utf8-locales' package. This is no longer necessary since 'glibc' +;; embeds the "C.UTF-8" locale, but these aliases are kept for convenience. +(define %boot5-inputs %boot4-inputs) +(define with-boot5 with-boot4) (define gnu-make-final ;; The final GNU Make, which uses the final Guile. @@ -3493,7 +3487,11 @@ (define-public %final-inputs ("diffutils" ,diffutils) ("patch" ,patch) ("findutils" ,findutils) - ("gawk" ,gawk))) + ("gawk" ,(package/inherit gawk + (native-inputs + (list (if (target-hurd?) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final))))))) ("sed" ,sed-final) ("grep" ,grep-final) ("xz" ,xz-final) @@ -3504,10 +3502,7 @@ (define-public %final-inputs ("binutils" ,binutils-final) ("gcc" ,gcc-final) ("libc" ,glibc-final) - ("libc:static" ,glibc-final "static") - ("locales" ,(if (target-hurd? (%current-system)) - glibc-utf8-locales-final/hurd - glibc-utf8-locales-final))))))) + ("libc:static" ,glibc-final "static")))))) (define-public canonical-package (let ((name->package (mlambda (system) @@ -3518,6 +3513,10 @@ (define-public canonical-package package result)))) vlist-null `(("guile" ,guile-final) + ("glibc-utf8-locales" + ,(if (target-hurd? system) + glibc-utf8-locales-final/hurd + glibc-utf8-locales-final)) ,@(%final-inputs system)))))) (lambda (package) "Return the 'canonical' variant of PACKAGE---i.e., if PACKAGE is one of diff --git a/gnu/packages/gawk.scm b/gnu/packages/gawk.scm index 2d8bc581ef..476865ada3 100644 --- a/gnu/packages/gawk.scm +++ b/gnu/packages/gawk.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016 Ludovic Courtès +;;; Copyright © 2012-2016, 2023 Ludovic Courtès ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2018, 2022, 2023 Efraim Flashner ;;; Copyright © 2021, 2022 Marius Bakke @@ -79,6 +79,10 @@ (define-public gawk (("#! /usr/bin/gawk") (string-append "#!" (which "gawk"))))))))) + ;; Tests explicitly require en_US.UTF-8, fr_FR.UTF-8, ru_RU.UTF-8 and + ;; ja_JP.UTF-8. + (native-inputs (list (libc-utf8-locales-for-target))) + (inputs (list libsigsegv ;; Use the full-fledged Bash package, otherwise the test suite ;; sometimes fail non-deterministically. diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index ab4583071e..92c9d800a9 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -38,6 +38,7 @@ (define-module (gnu packages texinfo) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages base) #:use-module (gnu packages compression) #:use-module (gnu packages gettext) #:use-module (gnu packages ncurses) @@ -79,10 +80,12 @@ (define-public texinfo #:tests? ,(and (not (target-hurd?)) (not (%current-target-system))))) (inputs (list ncurses perl)) + ;; When cross-compiling, texinfo will build some of its own binaries with ;; the native compiler. This means ncurses is needed both in both inputs - ;; and native-inputs. - (native-inputs (list perl ncurses)) + ;; and native-inputs. Some of its tests require extra locales such as + ;; fr_FR.UTF-8. + (native-inputs (list perl ncurses (libc-utf8-locales-for-target))) (native-search-paths ;; This is the variable used by the standalone Info reader. From patchwork Thu Dec 14 13:37:40 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: 57597 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 E0CB527BBEB; Thu, 14 Dec 2023 13:40:05 +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 8028027BBE2 for ; Thu, 14 Dec 2023 13:40:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDlvh-0005Ye-0c; Thu, 14 Dec 2023 08:39:09 -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 1rDlve-0005XC-Kw for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:06 -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 1rDlve-0003Y2-C0; Thu, 14 Dec 2023 08:39:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDlvb-0007H4-Nu; Thu, 14 Dec 2023 08:39:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates 4/6] profiles: Use C.UTF-8 instead of =?utf-8?b?4oCYZ2xpYmMtdXRmOC1sb2NhbGVz4oCZ?= where possible. 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: Thu, 14 Dec 2023 13:39:03 +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.170256110927865 (code B ref 67824); Thu, 14 Dec 2023 13:39:03 +0000 Received: (at 67824) by debbugs.gnu.org; 14 Dec 2023 13:38:29 +0000 Received: from localhost ([127.0.0.1]:48963 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlv2-0007FF-8X for submit@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:29 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDluz-0007Eh-KY for 67824@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:26 -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 1rDluu-0002yf-TK; Thu, 14 Dec 2023 08:38:20 -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=TwvTpdL8/xMKO5FWaa90V1adDxfqVe8ftAvsBI051cA=; b=ihjtVFc4hTCdn7wJaOYR 868oUujS4J+8UNYFrL6iVKqAWRIw+hFnj55tlcUWYSiUB1jBl7tMAccRRKGuRVLpaVzRLEG+ou1UC LT46z8CMKU3+tl0JFm7IHM37qbBMQ5XyoM2jzf4fgeHVyBpqnsWDOvPkcKoY19UvW5KDZkvjlps8S ZPbfostr6XAeBQpVQ51A8Gc+XelmAc0I3oVK3xjToIwg/9J3yh8tvf1NJ3rO5PAHUvpnmAp5dMtFy 601RTa3HPAfao1W9l3VudwBMcITSukS1IpBi0AYYpFtv283psa6o3/9gqvjXZQ/gc26PIcydrvVRc QMQ8pHtDYN2C9Q==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 14 Dec 2023 14:37:40 +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/profiles.scm (ca-certificate-bundle)[libc-utf8-locales-for-target]: Remove. [build]: Use “C.UTF-8” instead of “en_US.utf8”. (profile-derivation)[libc-utf8-locales-for-target]: Remove. [set-utf8-locale]: Rewrite to a gexp that calls ‘setlocale’ for “C.UTF-8”. * tests/profiles.scm ("profile-derivation, cross-compilation"): Remove ‘locales’ variable and related check. Change-Id: I7cb148b9149fe5fbe5b9b1b25fdce1002ad1f37e --- guix/profiles.scm | 33 +++++---------------------------- tests/profiles.scm | 7 +------ 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/guix/profiles.scm b/guix/profiles.scm index ce2f8337bf..da7790d819 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1125,11 +1125,6 @@ (define* (ca-certificate-bundle manifest #:optional system) MANIFEST. Single-file bundles are required by programs such as Git and Lynx." ;; See ;; for a discussion. - - (define libc-utf8-locales-for-target ;lazy reference - (module-ref (resolve-interface '(gnu packages base)) - 'libc-utf8-locales-for-target)) - (define build (with-imported-modules '((guix build utils)) #~(begin @@ -1161,13 +1156,7 @@ (define* (ca-certificate-bundle manifest #:optional system) ;; Some file names in the NSS certificates are UTF-8 encoded so ;; install a UTF-8 locale. - (setenv "LOCPATH" - (string-append #+(libc-utf8-locales-for-target system) - "/lib/locale/" - #+(version-major+minor - (package-version - (libc-utf8-locales-for-target system))))) - (setlocale LC_ALL "en_US.utf8") + (setlocale LC_ALL "C.UTF-8") (match (append-map ca-files '#$(manifest-inputs manifest)) (() @@ -1960,8 +1949,7 @@ (define* (profile-derivation manifest or TARGET is set, raise an error if MANIFEST contains a package that does not support SYSTEM. -When LOCALES? is true, the build is performed under a UTF-8 locale; this adds -a dependency on the 'glibc-utf8-locales' package. +When LOCALES? is true, the build is performed under a UTF-8 locale. When RELATIVE-SYMLINKS? is true, use relative file names for symlink targets. This is one of the things to do for the result to be relocatable. @@ -2004,21 +1992,10 @@ (define* (profile-derivation manifest (and (derivation? drv) (gexp-input drv))) extras)) - (define libc-utf8-locales-for-target ;lazy reference - (module-ref (resolve-interface '(gnu packages base)) - 'libc-utf8-locales-for-target)) - (define set-utf8-locale - ;; Some file names (e.g., in 'nss-certs') are UTF-8 encoded so - ;; install a UTF-8 locale. - (let ((locales (libc-utf8-locales-for-target - (or system (%current-system))))) - #~(begin - (setenv "LOCPATH" - #$(file-append locales "/lib/locale/" - (version-major+minor - (package-version locales)))) - (setlocale LC_ALL "en_US.utf8")))) + ;; Some file names (e.g., in 'nss-certs') are UTF-8 encoded so install a + ;; UTF-8 locale. Assume libc comes with a copy of C.UTF-8. + #~(setlocale LC_ALL "C.UTF-8")) (define builder (with-imported-modules '((guix build profiles) diff --git a/tests/profiles.scm b/tests/profiles.scm index ddd6d74f3b..e448137cff 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -463,7 +463,6 @@ (define glibc (target -> "arm-linux-gnueabihf") (grep (package->cross-derivation packages:grep target)) (sed (package->cross-derivation packages:sed target)) - (locales (package->derivation (packages:libc-utf8-locales-for-target))) (drv (profile-derivation manifest #:hooks '() #:locales? #t @@ -475,15 +474,11 @@ (define glibc (and (string-suffix? name input) input))) (derivation-inputs drv)))) - ;; The inputs for grep and sed should be cross-build derivations, but that - ;; for the glibc-utf8-locales should be a native build. (return (and (string=? (derivation-system drv) (%current-system)) (string=? (find-input packages:grep) (derivation-file-name grep)) (string=? (find-input packages:sed) - (derivation-file-name sed)) - (string=? (find-input (packages:libc-utf8-locales-for-target)) - (derivation-file-name locales)))))) + (derivation-file-name sed)))))) (test-assert "package->manifest-entry defaults to \"out\"" (let ((outputs (package-outputs packages:glibc))) From patchwork Thu Dec 14 13:37:41 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: 57596 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 0F99027BBF0; Thu, 14 Dec 2023 13:40:05 +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 E720927BBEB for ; Thu, 14 Dec 2023 13:40:00 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDlvf-0005Xj-Ry; Thu, 14 Dec 2023 08:39:07 -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 1rDlve-0005Wz-7U for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:06 -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 1rDlvd-0003Xq-Uj; Thu, 14 Dec 2023 08:39:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDlvc-0007HE-7E; Thu, 14 Dec 2023 08:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates 5/6] packages: Output and error ports are line-buffered in =?utf-8?b?4oCYcGF0Y2gtYW5kLXJlcGFja+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: Thu, 14 Dec 2023 13:39:04 +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.170256111227885 (code B ref 67824); Thu, 14 Dec 2023 13:39:04 +0000 Received: (at 67824) by debbugs.gnu.org; 14 Dec 2023 13:38:32 +0000 Received: from localhost ([127.0.0.1]:48969 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlv5-0007Fe-Q4 for submit@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:32 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43062) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlv2-0007Em-Ai for 67824@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:28 -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 1rDluw-0002zc-Lo; Thu, 14 Dec 2023 08:38:22 -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=gJLkm5f50IdnsS1kUIz/qsUkKwRYPGDpDAcRBMXWB7A=; b=QlmtWlwRBv3M49cKjkAh WweQT1nFhVWSZOvbta4v3DbvB0GXMoURnyoK6WfIMLw75nQqbvsO2Mwcg4Ssvwh9QlDDM9GSPR9bq 777o66ttdkZkxEiVVC6Qy0W/Qisy+86rObM3dMY7Qnfh0Ogg+orCl0giLVNYYZO5N3yu+7LduBB/T 5Lty1/rkqN9ETCWy0Xazic3GTnDk3hP9nqMObox0bmjAVP0UjrjXGuAzYx4yMi2UXgrze8kJ4Z1Ok gRmXj/4iTqeCLIROdN5N3RVFXQMvtTWAOJLDshAeJ0286nUW40WAwy97HJaqp+LGEHLhRx7ciZQqs pKqLxYh5f1Lrrw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 14 Dec 2023 14:37:41 +0100 Message-ID: <2533db50b4cf1f21baf85b63d2266055d53618a2.1702550735.git.ludo@gnu.org> 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 * guix/packages.scm (patch-and-repack): Add ‘setvbuf’ calls. Change-Id: I039bb6407263d5172bf0bc716bda6860dc2615fb --- guix/packages.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/guix/packages.scm b/guix/packages.scm index 4b0c478ff4..cb8db925f8 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1007,6 +1007,11 @@ (define* (patch-and-repack source patches '("--no-recursion" "--files-from=.file_list")))) + (let ((line (cond-expand (guile-2.0 _IOLBF) + (else 'line)))) + (setvbuf (current-output-port) line) + (setvbuf (current-error-port) line)) + ;; Encoding/decoding errors shouldn't be silent. (fluid-set! %default-port-conversion-strategy 'error) From patchwork Thu Dec 14 13:37:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 57600 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 8504827BBE2; Thu, 14 Dec 2023 13:40:10 +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 F19E827BBE9 for ; Thu, 14 Dec 2023 13:40:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rDlve-0005XX-Tr; Thu, 14 Dec 2023 08:39: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 1rDlvd-0005Wr-Rx for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:05 -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 1rDlvd-0003XW-HU for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rDlvc-0007HN-Ne for guix-patches@gnu.org; Thu, 14 Dec 2023 08:39:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates 6/6] gnu: glibc-utf8-locales: Add the C.UTF-8 locale. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 14 Dec 2023 13:39:04 +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?= Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170256112027910 (code B ref 67824); Thu, 14 Dec 2023 13:39:04 +0000 Received: (at 67824) by debbugs.gnu.org; 14 Dec 2023 13:38:40 +0000 Received: from localhost ([127.0.0.1]:48976 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlvD-0007G6-Pa for submit@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:40 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49474) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rDlvC-0007Fs-2H for 67824@debbugs.gnu.org; Thu, 14 Dec 2023 08:38:38 -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 1rDlv7-0003Iy-H3; Thu, 14 Dec 2023 08:38:33 -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=tN+Fn29suZxK3b8EnX4BuK8bWqEj5AMsqDEwh9mq2sI=; b=IqXJIy3n/RfGXo2efTpL wZLmR8jrCg+An+lHuUHf+UlvAddlstyJEfdb0R1HZS1BMkqtHO/Ew8GYS1Jt/GB7ri4+c8NSrClIs Rw1y25Q9HY+q5qJjbN5Y81mgUZHdz/YgpsEaN7RlSh3iqSRVuV6tJuBKGgmoR+Fbyj7WCpKXEeN13 Ss9CUew3FiRqI31+rru0+DAvwAaAv+OVED/Sf6U9Z7MDix4CJkhlpu5Tmv/sq8rn756fdwD7sP7IZ 4qA256zJSJyk4kZ83QUmGdwuuN+9m5i0FiNkPME7fNvyNs8B7jHLy/HnO+bL1r0+ZCA0PMEriyUj1 XXUG5llNY693pw==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 14 Dec 2023 14:37:42 +0100 Message-ID: <48fba13f955b3552c7f011672763052752cc7c35.1702550735.git.ludo@gnu.org> 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 * gnu/packages/base.scm (%default-utf8-locales): Add "C". (make-glibc-utf8-locales): Delete "C" from LOCALES for glibc versions lower than or equal to 2.35. Change-Id: I6a6faa68dc18bf0f87c372109a17f476d3561278 --- gnu/packages/base.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index d31c0b0772..eab9ff411d 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -1396,7 +1396,8 @@ (define-public (make-glibc-locales glibc) (define %default-utf8-locales ;; These are the locales commonly used for tests---e.g., in Guile's i18n ;; tests. - '("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) + '("C" "de_DE" "el_GR" "en_US" "fr_FR" "tr_TR")) + (define*-public (make-glibc-utf8-locales glibc #:key (locales %default-utf8-locales) (name "glibc-utf8-locales")) @@ -1444,7 +1445,14 @@ (define*-public (make-glibc-utf8-locales glibc #:key (symlink (string-append locale ".utf8") (string-append localedir "/" locale ".UTF-8"))) - '#$locales))))) + + ;; The C.UTF-8 locale was introduced in 2.35 but it + ;; fails to build there: + ;; . + '#$(if (version>? (package-version this-package) + "2.35") + locales + (delete "C" locales))))))) (native-inputs (list glibc gzip)) (synopsis (if default-locales? (P_ "Small sample of UTF-8 locales")