[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
13/15: locale: Set %default-locale-definitions to glibc/hurd on the Hurd
From: |
guix-commits |
Subject: |
13/15: locale: Set %default-locale-definitions to glibc/hurd on the Hurd. |
Date: |
Wed, 23 Aug 2023 12:37:00 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit e35a3718fe184d4307f3bf085b4f769c30f45de3
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat Jun 24 15:17:42 2023 +0200
locale: Set %default-locale-definitions to glibc/hurd on the Hurd.
* gnu/system/locale.scm (%default-locale-libcs): Use only glib/hurd when
building on the Hurd.
---
gnu/system/locale.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/gnu/system/locale.scm b/gnu/system/locale.scm
index 6895b209dc..bc572baeb9 100644
--- a/gnu/system/locale.scm
+++ b/gnu/system/locale.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2014-2017, 2019-2021, 2023 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2018 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2023 Janneke Nieuwenhuizen <jannek@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -147,7 +148,9 @@ data format changes between libc versions."
(define %default-locale-libcs
;; The libcs for which we build locales by default.
- (list glibc-2.33 glibc))
+ (if (system-hurd?)
+ (list glibc/hurd)
+ (list glibc-2.33 glibc)))
(define %default-locale-definitions
;; Arbitrary set of locales that are built by default. They are here mostly
- branch hurd-team created (now be2e4d701b), guix-commits, 2023/08/23
- 04/15: maint: Support `guix shell' in Guix's git archive with manifest.scm., guix-commits, 2023/08/23
- 05/15: hurd: Support system init in /libexec/runsystem., guix-commits, 2023/08/23
- 07/15: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/08/23
- 08/15: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/08/23
- 10/15: DRAFT hurd-boot: Support second boot., guix-commits, 2023/08/23
- 13/15: locale: Set %default-locale-definitions to glibc/hurd on the Hurd.,
guix-commits <=
- 14/15: DRAFT daemon: Support chroot builds on GNU/Hurd., guix-commits, 2023/08/23
- 15/15: Revert "DRAFT daemon: Support chroot builds on GNU/Hurd.", guix-commits, 2023/08/23
- 03/15: gnu: guix: Update to 1.4.0-12.329069a2fb., guix-commits, 2023/08/23
- 09/15: DRAFT hurd: Support second boot., guix-commits, 2023/08/23
- 12/15: gnu: Add libc-locales-for-target and glibc-locales/hurd., guix-commits, 2023/08/23
- 06/15: hurd-boot: Support system init: Create essential device nodes., guix-commits, 2023/08/23
- 11/15: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/08/23
- 01/15: self: Build directories in chunks of max 25 files at a time., guix-commits, 2023/08/23
- 02/15: gnu: guix: Update to 1.4.0-11.45de303d8b., guix-commits, 2023/08/23