[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
65/65: locale: Set %default-locale-definitions to glibc/hurd on the Hurd
From: |
guix-commits |
Subject: |
65/65: locale: Set %default-locale-definitions to glibc/hurd on the Hurd. |
Date: |
Fri, 14 Jul 2023 10:06:09 -0400 (EDT) |
janneke pushed a commit to branch hurd-team
in repository guix.
commit 32f10e8601585c7abcfc5a998026ad00eaa8af96
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
- 59/65: gnu: guix: Update to 1.4.0-8.7f38c79689., (continued)
- 59/65: gnu: guix: Update to 1.4.0-8.7f38c79689., guix-commits, 2023/07/14
- 62/65: DRAFT hurd-boot: Support second boot., guix-commits, 2023/07/14
- 61/65: DRAFT hurd: Support second boot., guix-commits, 2023/07/14
- 13/65: gnu: diffutils: Remove test-perror2 from XFAIL_TESTS on the Hurd., guix-commits, 2023/07/14
- 31/65: gnu: e2fsprogs: Skip failing tests on the Hurd., guix-commits, 2023/07/14
- 33/65: gnu: libpaper: Disable tests for the Hurd., guix-commits, 2023/07/14
- 37/65: gnu: tcsh: Skip substitution tests on the Hurd., guix-commits, 2023/07/14
- 40/65: gnu: cmake-bootstrap: Fix build for the Hurd., guix-commits, 2023/07/14
- 52/65: system: hurd: Add procps to %base-packages/hurd., guix-commits, 2023/07/14
- 48/65: gnu: pango: Support build for the Hurd., guix-commits, 2023/07/14
- 65/65: locale: Set %default-locale-definitions to glibc/hurd on the Hurd.,
guix-commits <=
- 53/65: system: hurd: Add swap-services to hurd-default-essential-services., guix-commits, 2023/07/14
- 46/65: gnu: ghostscript: Fix build for the Hurd., guix-commits, 2023/07/14
- 50/65: gnu: po4a: Skip failing test on the Hurd., guix-commits, 2023/07/14
- 57/65: gnu: guix: Disable some test on 32bit., guix-commits, 2023/07/14
- 63/65: DRAFT system: examples: Add devel-hurd.tmpl., guix-commits, 2023/07/14