From patchwork Mon Apr 8 14:24:33 2024 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: 62846 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 E09E827BBEC; Mon, 8 Apr 2024 15:26:20 +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=-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 5A82927BBE2 for ; Mon, 8 Apr 2024 15:26:20 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rtpwq-0006oR-Fw; Mon, 08 Apr 2024 10:26:14 -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 1rtpwi-0006Z6-0A for guix-patches@gnu.org; Mon, 08 Apr 2024 10:26: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 1rtpwb-0004iF-JY for guix-patches@gnu.org; Mon, 08 Apr 2024 10:25:59 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rtpwi-0000um-UF for guix-patches@gnu.org; Mon, 08 Apr 2024 10:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70280] [PATCH 3/5] locale: Shrink =?utf-8?b?4oCYJWRlZmF1bHQt?= =?utf-8?b?bG9jYWxlLWRlZmluaXRpb25z4oCZ?= from 34 to 10 locales. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 08 Apr 2024 14:26:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70280 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70280@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 70280-submit@debbugs.gnu.org id=B70280.17125863083093 (code B ref 70280); Mon, 08 Apr 2024 14:26:04 +0000 Received: (at 70280) by debbugs.gnu.org; 8 Apr 2024 14:25:08 +0000 Received: from localhost ([127.0.0.1]:47334 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtpvo-0000ng-1n for submit@debbugs.gnu.org; Mon, 08 Apr 2024 10:25:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rtpvi-0000lm-Au for 70280@debbugs.gnu.org; Mon, 08 Apr 2024 10:25:03 -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 1rtpvV-0004HW-J3; Mon, 08 Apr 2024 10:24:49 -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=nUc4gjExsWwKUIKNxmJidVYmj7Emp/nATzr6VgU4jsk=; b=TRe35b0XPgNfgS2AuoKx /BqLsurAWIu5Q/LWolNn+8sm9tp5uyGsZwFuaMFGNgOqgHbc02I/OUKDcDwDFARrm54wf8EniB30N HXblxajYfHvAQ9+F+wUk7JhdRj0QNJk0lVnPa/9Pv4S39hji3LZwNqtiCOtt3A+j31qcf0eY6/cif 2i/yPsbhWpNzpu1oEl/QiZN19+T+aG9pgXsbm+Y4CYO2UxwzWgceFL3CL312CmlAMvMFWS3cmsTy2 cd9djUtXcoRts2eo6dLOPXZKHIdL4gBf9TmALfkGIswV5qgbUeKfYMU+oan0vyqBRoAzhrZexgzqf EZq4I88Rb8vYug==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 8 Apr 2024 16:24:33 +0200 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 reduces the default set of locales from 92 MiB to 28 MiB. * gnu/system/locale.scm (%default-locale-definitions): Reduce to 10 locales. Change-Id: I3c092604301d69db591957bcfd62a062c3ac5ab0 --- gnu/system/locale.scm | 56 ++++++++++++------------------------------- 1 file changed, 15 insertions(+), 41 deletions(-) diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm index 4ea82e24d5..00eb902702 100644 --- a/gnu/system/locale.scm +++ b/gnu/system/locale.scm @@ -153,9 +153,10 @@ (define %default-locale-libcs (list glibc))) (define %default-locale-definitions - ;; Arbitrary set of locales that are built by default. They are here mostly - ;; to facilitate first-time use to some people, while others may have to add - ;; a specific . + ;; Arbitrary set of locales that are built by default. They come as a + ;; "bonus" in addition to that specified in the 'locale' field of the + ;; operating system, for the user's convenience, so they shouldn't take too + ;; much space. (letrec-syntax ((utf8-locale (syntax-rules () ((_ name*) (locale-definition @@ -167,44 +168,17 @@ (define %default-locale-definitions (utf8-locales (syntax-rules () ((_ name ...) (list (utf8-locale name) ...))))) - ;; Add "en_US.UTF-8" for compatibility with Guix 0.8. - (cons (locale-definition - (name "en_US.UTF-8") - (source "en_US") - (charset "UTF-8")) - (utf8-locales "ca_ES" - "cs_CZ" - "da_DK" - "de_DE" - "el_GR" - "en_AU" - "en_CA" - "en_GB" - "en_US" - "es_AR" - "es_CL" - "es_ES" - "es_MX" - "fi_FI" - "fr_BE" - "fr_CA" - "fr_CH" - "fr_FR" - "ga_IE" - "it_IT" - "ja_JP" - "ko_KR" - "nb_NO" - "nl_NL" - "pl_PL" - "pt_PT" - "ro_RO" - "ru_RU" - "sv_SE" - "tr_TR" - "uk_UA" - "vi_VN" - "zh_CN")))) + ;; The six UN official languages, with at most two variants per language. + (utf8-locales "ar_DZ" + "ar_JO" + "en_GB" + "en_US" + "es_AR" + "es_ES" + "fr_CA" + "fr_FR" + "ru_RU" + "zh_CN"))) ;;;