mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 21:38:07 -05:00
gnu: base: Add keywords to make-glibc-utf8-locales.
* gnu/packages/base.scm (make-glibc-utf8-locales): Add keyword parameters locales and name with the old values as default. [name]: Use name parameter. [arguments]: Use locales parameter. Co-authored-by: Efraim Flashner <efraim@flashner.co.il> Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
106c663dd8
commit
0d3f2716a8
1 changed files with 23 additions and 8 deletions
|
@ -52,13 +52,16 @@ (define-module (gnu packages base)
|
||||||
#:use-module (gnu packages pkg-config)
|
#:use-module (gnu packages pkg-config)
|
||||||
#:use-module (gnu packages python)
|
#:use-module (gnu packages python)
|
||||||
#:use-module (gnu packages gettext)
|
#:use-module (gnu packages gettext)
|
||||||
|
#:use-module (guix i18n)
|
||||||
#:use-module (guix utils)
|
#:use-module (guix utils)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
#:use-module (guix build-system gnu)
|
#:use-module (guix build-system gnu)
|
||||||
#:use-module (guix build-system trivial)
|
#:use-module (guix build-system trivial)
|
||||||
|
#:use-module (ice-9 format)
|
||||||
#:use-module (ice-9 match)
|
#:use-module (ice-9 match)
|
||||||
|
#:use-module (ice-9 optargs)
|
||||||
#:use-module (srfi srfi-1)
|
#:use-module (srfi srfi-1)
|
||||||
#:use-module (srfi srfi-26)
|
#:use-module (srfi srfi-26)
|
||||||
#:export (glibc
|
#:export (glibc
|
||||||
|
@ -1106,9 +1109,16 @@ (define (locale-directory? file stat)
|
||||||
,(version-major+minor
|
,(version-major+minor
|
||||||
(package-version glibc)))))))))))
|
(package-version glibc)))))))))))
|
||||||
|
|
||||||
(define-public (make-glibc-utf8-locales glibc)
|
(define %default-utf8-locales
|
||||||
|
;; These are the locales commonly used for tests---e.g., in Guile's i18n
|
||||||
|
;; tests.
|
||||||
|
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
|
||||||
|
(define*-public (make-glibc-utf8-locales glibc #:key
|
||||||
|
(locales %default-utf8-locales)
|
||||||
|
(name "glibc-utf8-locales"))
|
||||||
|
(define default-locales? (equal? locales %default-utf8-locales))
|
||||||
(package
|
(package
|
||||||
(name "glibc-utf8-locales")
|
(name name)
|
||||||
(version (package-version glibc))
|
(version (package-version glibc))
|
||||||
(source #f)
|
(source #f)
|
||||||
(build-system trivial-build-system)
|
(build-system trivial-build-system)
|
||||||
|
@ -1142,17 +1152,22 @@ (define file
|
||||||
(symlink (string-append locale ".utf8")
|
(symlink (string-append locale ".utf8")
|
||||||
(string-append localedir "/"
|
(string-append localedir "/"
|
||||||
locale ".UTF-8")))
|
locale ".UTF-8")))
|
||||||
|
',locales)
|
||||||
;; These are the locales commonly used for
|
|
||||||
;; tests---e.g., in Guile's i18n tests.
|
|
||||||
'("de_DE" "el_GR" "en_US" "fr_FR" "tr_TR"))
|
|
||||||
#t))))
|
#t))))
|
||||||
(native-inputs `(("glibc" ,glibc)
|
(native-inputs `(("glibc" ,glibc)
|
||||||
("gzip" ,gzip)))
|
("gzip" ,gzip)))
|
||||||
(synopsis "Small sample of UTF-8 locales")
|
(synopsis (if default-locales?
|
||||||
|
(P_ "Small sample of UTF-8 locales")
|
||||||
|
(P_ "Customized sample of UTF-8 locales")))
|
||||||
(description
|
(description
|
||||||
"This package provides a small sample of UTF-8 locales mostly useful in
|
(if default-locales?
|
||||||
|
(P_ "This package provides a small sample of UTF-8 locales mostly useful in
|
||||||
test environments.")
|
test environments.")
|
||||||
|
(format #f (P_ "This package provides the following UTF-8 locales:
|
||||||
|
@itemize
|
||||||
|
~{@item ~a~%~}
|
||||||
|
@end itemize~%")
|
||||||
|
locales)))
|
||||||
(home-page (package-home-page glibc))
|
(home-page (package-home-page glibc))
|
||||||
(license (package-license glibc))))
|
(license (package-license glibc))))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue