[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/07: gnu: Add ‘libc-locales-for-target’ and related.
From: |
guix-commits |
Subject: |
01/07: gnu: Add ‘libc-locales-for-target’ and related. |
Date: |
Sat, 2 Dec 2023 06:36:22 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 9442b53c6b4dbf078f37a52687a32ecbd2ca430d
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Wed Jun 7 19:19:01 2023 +0200
gnu: Add ‘libc-locales-for-target’ and related.
Partly fixes <https://issues.guix.gnu.org/66472>.
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 <ludo@gnu.org>
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 @@
#: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 @@ command.")
(_
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")
- branch master updated (ea348b105d -> aeb494322c), guix-commits, 2023/12/02
- 02/07: gnu: Use ‘libc-utf8-locales-for-target’., guix-commits, 2023/12/02
- 03/07: gnu: Add pcg-c., guix-commits, 2023/12/02
- 06/07: gnu: Add python-scikit-learn-extra., guix-commits, 2023/12/02
- 01/07: gnu: Add ‘libc-locales-for-target’ and related.,
guix-commits <=
- 05/07: gnu: python-pythonanywhere: Update to 0.12.1, guix-commits, 2023/12/02
- 04/07: gnu: igraph: Update to 0.10.7., guix-commits, 2023/12/02
- 07/07: gnu: d-tools: Update to 2.105.3., guix-commits, 2023/12/02