From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] gnu: Add glibc-locales variants for older versions of glibc. Date: Thu, 17 Jan 2019 14:17:53 +0100 Message-ID: <20190117131753.15696-1-rekado@elephly.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Return-path: Received: from eggs.gnu.org ([209.51.188.92]:59744) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gk7nj-00020w-1e for guix-devel@gnu.org; Thu, 17 Jan 2019 08:34:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gk7nQ-0001Vh-5J for guix-devel@gnu.org; Thu, 17 Jan 2019 08:33:42 -0500 Received: from sender-of-o53.zoho.com ([135.84.80.218]:21747) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gk7nM-0001NA-A2 for guix-devel@gnu.org; Thu, 17 Jan 2019 08:33:22 -0500 List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org * 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. --- gnu/packages/base.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm index e79d2a987..cf86f0658 100644 --- a/gnu/packages/base.scm +++ b/gnu/packages/base.scm @@ -13,7 +13,7 @@ ;;; Copyright =C2=A9 2017, 2018 Marius Bakke ;;; Copyright =C2=A9 2017 Eric Bavier ;;; Copyright =C2=A9 2018 Tobias Geerinckx-Rice -;;; Copyright =C2=A9 2018 Ricardo Wurmus +;;; Copyright =C2=A9 2018, 2019 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -975,7 +975,7 @@ with the Linux kernel.") (("/bin/pwd") "pwd")) #t)))))))) =20 -(define-public glibc-locales +(define-public (make-glibc-locales glibc) (package (inherit glibc) (name "glibc-locales") @@ -1010,7 +1010,7 @@ the 'share/locale' sub-directory of this package.") ,(version-major+minor (package-version glibc))))))))))= ) =20 -(define-public glibc-utf8-locales +(define-public (make-glibc-utf8-locales glibc) (package (name "glibc-utf8-locales") (version (package-version glibc)) @@ -1060,6 +1060,18 @@ test environments.") (home-page (package-home-page glibc)) (license (package-license glibc)))) =20 +(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 (package (name "which") --=20 2.20.1