gnu: Add glibc-locales variants for older versions of glibc.

* gnu/packages/base.scm (make-glibc-locales, make-glibc-utf8-locales): New
procedures.
(glibc-locales): Express in terms of make-glibc-locales.
(glibc-utf8-locales): Express in terms of make-glibc-utf8-locales.
(glibc-locales-2.27, glibc-utf8-locales-2.27): New variables.
This commit is contained in:
Ricardo Wurmus 2019-01-17 12:55:53 +01:00
parent 11627ca550
commit 0845999a5e
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -13,7 +13,7 @@
;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com> ;;; Copyright © 2017, 2018 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2017 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;; Copyright © 2018 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2018, 2019 Ricardo Wurmus <rekado@elephly.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -975,7 +975,7 @@ (define-public glibc-2.22
(("/bin/pwd") "pwd")) (("/bin/pwd") "pwd"))
#t)))))))) #t))))))))
(define-public glibc-locales (define-public (make-glibc-locales glibc)
(package (package
(inherit glibc) (inherit glibc)
(name "glibc-locales") (name "glibc-locales")
@ -1010,7 +1010,7 @@ (define-public glibc-locales
,(version-major+minor ,(version-major+minor
(package-version glibc))))))))))) (package-version glibc)))))))))))
(define-public glibc-utf8-locales (define-public (make-glibc-utf8-locales glibc)
(package (package
(name "glibc-utf8-locales") (name "glibc-utf8-locales")
(version (package-version glibc)) (version (package-version glibc))
@ -1060,6 +1060,18 @@ (define file
(home-page (package-home-page glibc)) (home-page (package-home-page glibc))
(license (package-license glibc)))) (license (package-license glibc))))
(define-public glibc-locales
(make-glibc-locales glibc))
(define-public glibc-utf8-locales
(make-glibc-utf8-locales glibc))
(define-public glibc-locales-2.27
(package (inherit (make-glibc-locales glibc-2.27))
(name "glibc-locales-2.27")))
(define-public glibc-utf8-locales-2.27
(package (inherit (make-glibc-utf8-locales glibc-2.27))
(name "glibc-utf8-locales-2.27")))
(define-public which (define-public which
(package (package
(name "which") (name "which")