From patchwork Mon Dec 18 16:30:13 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: 57676 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 E648627BBE9; Mon, 18 Dec 2023 16:31:26 +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 BC7AD27BBEB for ; Mon, 18 Dec 2023 16:31:24 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rFGWG-0001WH-WE; Mon, 18 Dec 2023 11:31:05 -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 1rFGWE-0001Vj-Hg for guix-patches@gnu.org; Mon, 18 Dec 2023 11:31:02 -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 1rFGWE-0007WD-8a for guix-patches@gnu.org; Mon, 18 Dec 2023 11:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rFGWF-0006jK-O1; Mon, 18 Dec 2023 11:31:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67824] [PATCH core-updates v2 2/9] 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: leo@famulari.name, me@tobias.gr, guix-patches@gnu.org Resent-Date: Mon, 18 Dec 2023 16:31: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?= , Leo Famulari , Tobias Geerinckx-Rice X-Debbugs-Original-Xcc: Leo Famulari , Tobias Geerinckx-Rice Received: via spool by 67824-submit@debbugs.gnu.org id=B67824.170291705425150 (code B ref 67824); Mon, 18 Dec 2023 16:31:03 +0000 Received: (at 67824) by debbugs.gnu.org; 18 Dec 2023 16:30:54 +0000 Received: from localhost ([127.0.0.1]:33352 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW6-0006Wy-6z for submit@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44496) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rFGW3-0006IG-3g for 67824@debbugs.gnu.org; Mon, 18 Dec 2023 11:30:52 -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 1rFGVv-0007RL-QK; Mon, 18 Dec 2023 11:30:43 -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=et/sECpzylS1JuG0KCO2HY6TF+xrYhHhF6XJVAmbFdE=; b=Cas19niNXpV/8dTjlO82 0zo45oa1iEK5LT0i4wm0wDt7YDIZLWXQp2oGgWfe2jyvaIlV83FTzOS6GpQF+L2Hzha1CcnA/ba2H Dn/1DQr9lWpN9eMw3AZjMskGeDU0KvxjrjIcKmhfHe9uFt+K8+nXTE6D81DN7dCEFbkWD+pVIZ/oF V6n1Gnv8ryHAxRoM2VTkDRnZtrPUp33CfJ/+SprJeJqRjD73KAwEXsOIsUc6Hc47IzvHu2M5CXmSp iiWMdEDsCVl/Gv05NOy1ItWAshpLUbR6olbQ+5xK36AiKXgKbevBXQ65LlMyQleH6+bh3zs97UI53 /fo8QaZmvKCDPA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Mon, 18 Dec 2023 17:30:13 +0100 Message-ID: <6fbee1e6544d1abcaf781fc246004de494396868.1702916397.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". * guix/build/gnu-build-system.scm (install-locale): Likewise. * gnu/packages/linux.scm (util-linux)[arguments]: In ‘pre-check’ phase, remove ‘invalid-multibyte’ modification so the test runs under C.UTF-8. Change-Id: I9a4bfe564bcd8bbd0d57ba04568eb6b8020bd051 --- gnu/packages/linux.scm | 6 +----- guix/build-system/gnu.scm | 4 ++-- guix/build/gnu-build-system.scm | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 430645e4ad..0572ad3a73 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2257,11 +2257,7 @@ (define-public util-linux ;; Change the test to refer to the right file. (substitute* "tests/ts/misc/mcookie" (("/etc/services") - services)) - - ;; The C.UTF-8 locale does not exist in our libc. - (substitute* "tests/ts/column/invalid-multibyte" - (("C\\.UTF-8") "en_US.utf8"))))) + services))))) (add-before 'check 'disable-setarch-test (lambda _ ;; The setarch tests are unreliable in QEMU's user-mode 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) diff --git a/guix/build/gnu-build-system.scm b/guix/build/gnu-build-system.scm index ef5873d793..39707e7ace 100644 --- a/guix/build/gnu-build-system.scm +++ b/guix/build/gnu-build-system.scm @@ -123,7 +123,7 @@ (define* (set-paths #:key target inputs native-inputs native-search-paths))) (define* (install-locale #:key - (locale "en_US.utf8") + (locale "C.UTF-8") (locale-category LC_ALL) #:allow-other-keys) "Try to install LOCALE; emit a warning if that fails. The main goal is to