From patchwork Wed Nov 29 15:44:50 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: 57044 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 43DA627BBE9; Wed, 29 Nov 2023 15:46:48 +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 0A52827BBE2 for ; Wed, 29 Nov 2023 15:46:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r8MlZ-0004kS-Aa; Wed, 29 Nov 2023 10:46:21 -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 1r8MlB-0004fx-Pk for guix-patches@gnu.org; Wed, 29 Nov 2023 10:45:58 -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 1r8Ml9-0000jC-1U for guix-patches@gnu.org; Wed, 29 Nov 2023 10:45:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r8MlG-0005Fq-It for guix-patches@gnu.org; Wed, 29 Nov 2023 10:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67507] [PATCH v2 1/2] gnu: Add =?utf-8?b?4oCYbGliYy1sb2NhbGVz?= =?utf-8?b?LWZvci10YXJnZXTigJk=?= and related. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 29 Nov 2023 15:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67507 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67507@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= , Janneke Nieuwenhuizen Received: via spool by 67507-submit@debbugs.gnu.org id=B67507.170127275120159 (code B ref 67507); Wed, 29 Nov 2023 15:46:02 +0000 Received: (at 67507) by debbugs.gnu.org; 29 Nov 2023 15:45:51 +0000 Received: from localhost ([127.0.0.1]:50759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8Ml4-0005F4-LE for submit@debbugs.gnu.org; Wed, 29 Nov 2023 10:45:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60634) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r8Mkz-0005EY-Pd for 67507@debbugs.gnu.org; Wed, 29 Nov 2023 10:45:46 -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 1r8Mkk-0000Zx-Ou; Wed, 29 Nov 2023 10:45:31 -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=k4RIoBdbSoCiKgz4rJ9tGfleEFRqky4OMqFyBO7USYM=; b=SG8k/RFdH+YcOYNT7wZJ bdeEGvlHkeP9GIIqjiIhvNApyY6FGjh4SJwM2DHyc/LArU7aVJZ2bJ3yxLd1vSjm5+jVz0dcx1luw J4/SlRwfuLM0BMqVeYpZPd+66qnTA42dGLNKPbELdGzcpGWgDECTZu+FyH9+uiir6s96E742W/HQz BGhepMg01J8G7kjq4GqJAryeOqn2DJErKvWgputEZZfxq62sEdw6+tTwr9CUmZdTK7zVCaHSrD9my 8a1BGu3hWyQP6O0Y7cJu2vh0DQ53zJhl3PWR78KsE6prqjrG00o1GgjRGwz2CP2Mvx6UCBv3k4VKy EBRAZM3Nv81PAg==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 29 Nov 2023 16:44:50 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <5bf71a8fa945627d1610b772a04ac65031e8d6b6.1701171221.git.mail@cbaines.net> References: <5bf71a8fa945627d1610b772a04ac65031e8d6b6.1701171221.git.mail@cbaines.net> 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 From: Janneke Nieuwenhuizen Partly fixes . This is a followup to 95ea1277ae2ebd278bdb51a7887f5ba1116fbc64. * gnu/packages/base.scm (glibc-locales/hurd): New variable (libc-locales-for-target): Use it in new procedure. (libc-utf8-locales-for-target): New procedure. Co-authored-by: Ludovic Courtès Change-Id: I16e187fcc65a5d4a3b065066b45ef9e45d1875f6 --- gnu/packages/base.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index 41aff0ca97..6b2e96dc9b 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -76,6 +76,8 @@ (define-module (gnu packages base) #:use-module (srfi srfi-26) #:export (glibc libc-for-target + libc-locales-for-target + libc-utf8-locales-for-target make-ld-wrapper libiconv-if-needed %final-inputs)) @@ -1526,6 +1528,23 @@ (define* (libc-for-target #:optional (_ glibc))) +(define-public glibc-locales/hurd + (make-glibc-locales glibc/hurd)) + +(define* (libc-locales-for-target #:optional + (target (or (%current-target-system) + (%current-system)))) + (if (target-hurd? target) + glibc-locales/hurd + glibc-locales)) + +(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)) + (define-public tzdata (package (name "tzdata")