* Add locales such as en_US.UTF-8 and nl_NL.UTF-8 to the list of

supported locales.  This is very useful as those are the default
  locales on Red Hat and SuSE (>= 9.2).  (When LANG is set to an
  unsupported locale, some applications fall back on the C locale;
  others (like Subversion) just barf.)

svn path=/nixpkgs/trunk/; revision=1977
This commit is contained in:
Eelco Dolstra 2004-12-30 20:56:08 +00:00
parent f39229bac9
commit 7f3dc52aba
2 changed files with 462 additions and 0 deletions

View File

@ -35,6 +35,10 @@ stdenv.mkDerivation {
# Fix for localedata loading bug.
./loadlocale.patch
# Add a whole bunch of UTF-8 locales. Most of these seem to be in
# the CVS mainline now.
./utf8-locales.patch
];
inherit kernelHeaders installLocales;

View File

@ -0,0 +1,458 @@
diff -rc glibc-orig/localedata/SUPPORTED glibc-2.3.3/localedata/SUPPORTED
*** glibc-orig/localedata/SUPPORTED 2003-11-08 18:34:50.000000000 +0100
--- glibc-2.3.3/localedata/SUPPORTED 2004-12-30 19:25:30.000000000 +0100
***************
*** 9,103 ****
--- 9,181 ----
af_ZA/ISO-8859-1 \
am_ET/UTF-8 \
an_ES/ISO-8859-15 \
+ ar_AE.UTF-8/UTF-8 \
ar_AE/ISO-8859-6 \
+ ar_BH.UTF-8/UTF-8 \
ar_BH/ISO-8859-6 \
+ ar_DZ.UTF-8/UTF-8 \
ar_DZ/ISO-8859-6 \
+ ar_EG.UTF-8/UTF-8 \
ar_EG/ISO-8859-6 \
ar_IN/UTF-8 \
+ ar_IQ.UTF-8/UTF-8 \
ar_IQ/ISO-8859-6 \
+ ar_JO.UTF-8/UTF-8 \
ar_JO/ISO-8859-6 \
+ ar_KW.UTF-8/UTF-8 \
ar_KW/ISO-8859-6 \
+ ar_LB.UTF-8/UTF-8 \
ar_LB/ISO-8859-6 \
+ ar_LY.UTF-8/UTF-8 \
ar_LY/ISO-8859-6 \
+ ar_MA.UTF-8/UTF-8 \
ar_MA/ISO-8859-6 \
+ ar_OM.UTF-8/UTF-8 \
ar_OM/ISO-8859-6 \
+ ar_QA.UTF-8/UTF-8 \
ar_QA/ISO-8859-6 \
+ ar_SA.UTF-8/UTF-8 \
ar_SA/ISO-8859-6 \
+ ar_SD.UTF-8/UTF-8 \
ar_SD/ISO-8859-6 \
+ ar_SY.UTF-8/UTF-8 \
ar_SY/ISO-8859-6 \
+ ar_TN.UTF-8/UTF-8 \
ar_TN/ISO-8859-6 \
+ ar_YE.UTF-8/UTF-8 \
ar_YE/ISO-8859-6 \
+ az_AZ.UTF-8/UTF-8 \
+ be_BY.UTF-8/UTF-8 \
be_BY/CP1251 \
+ bg_BG.UTF-8/UTF-8 \
bg_BG/CP1251 \
+ bn_BD/UTF-8 \
+ bn_IN/UTF-8 \
br_FR/ISO-8859-1 \
+ br_FR@euro/ISO-8859-15 \
bs_BA/ISO-8859-2 \
byn_ER/UTF-8 \
+ ca_ES.UTF-8/UTF-8 \
ca_ES/ISO-8859-1 \
ca_ES@euro/ISO-8859-15 \
+ cs_CZ.UTF-8/UTF-8 \
cs_CZ/ISO-8859-2 \
+ cy_GB.UTF-8/UTF-8 \
cy_GB/ISO-8859-14 \
+ da_DK.UTF-8/UTF-8 \
da_DK/ISO-8859-1 \
+ da_DK@euro/ISO-8859-15 \
+ de_AT.UTF-8/UTF-8 \
de_AT/ISO-8859-1 \
de_AT@euro/ISO-8859-15 \
+ de_BE.UTF-8/UTF-8 \
de_BE/ISO-8859-1 \
de_BE@euro/ISO-8859-15 \
+ de_CH.UTF-8/UTF-8 \
de_CH/ISO-8859-1 \
+ de_DE.UTF-8/UTF-8 \
de_DE/ISO-8859-1 \
de_DE@euro/ISO-8859-15 \
+ de_LU.UTF-8/UTF-8 \
de_LU/ISO-8859-1 \
de_LU@euro/ISO-8859-15 \
+ el_GR.UTF-8/UTF-8 \
el_GR/ISO-8859-7 \
+ en_AU.UTF-8/UTF-8 \
en_AU/ISO-8859-1 \
+ en_BW.UTF-8/UTF-8 \
en_BW/ISO-8859-1 \
+ en_CA.UTF-8/UTF-8 \
en_CA/ISO-8859-1 \
+ en_DK.UTF-8/UTF-8 \
en_DK/ISO-8859-1 \
+ en_GB.UTF-8/UTF-8 \
en_GB/ISO-8859-1 \
+ en_HK.UTF-8/UTF-8 \
en_HK/ISO-8859-1 \
+ en_IE.UTF-8/UTF-8 \
en_IE/ISO-8859-1 \
en_IE@euro/ISO-8859-15 \
en_IN/UTF-8 \
+ en_NZ.UTF-8/UTF-8 \
en_NZ/ISO-8859-1 \
+ en_PH.UTF-8/UTF-8 \
en_PH/ISO-8859-1 \
+ en_SG.UTF-8/UTF-8 \
en_SG/ISO-8859-1 \
+ en_US.UTF-8/UTF-8 \
en_US/ISO-8859-1 \
+ en_ZA.UTF-8/UTF-8 \
en_ZA/ISO-8859-1 \
+ en_ZW.UTF-8/UTF-8 \
en_ZW/ISO-8859-1 \
+ es_AR.UTF-8/UTF-8 \
es_AR/ISO-8859-1 \
+ es_BO.UTF-8/UTF-8 \
es_BO/ISO-8859-1 \
+ es_CL.UTF-8/UTF-8 \
es_CL/ISO-8859-1 \
+ es_CO.UTF-8/UTF-8 \
es_CO/ISO-8859-1 \
+ es_CR.UTF-8/UTF-8 \
es_CR/ISO-8859-1 \
+ es_DO.UTF-8/UTF-8 \
es_DO/ISO-8859-1 \
+ es_EC.UTF-8/UTF-8 \
es_EC/ISO-8859-1 \
+ es_ES.UTF-8/UTF-8 \
es_ES/ISO-8859-1 \
es_ES@euro/ISO-8859-15 \
+ es_GT.UTF-8/UTF-8 \
es_GT/ISO-8859-1 \
+ es_HN.UTF-8/UTF-8 \
es_HN/ISO-8859-1 \
+ es_MX.UTF-8/UTF-8 \
es_MX/ISO-8859-1 \
+ es_NI.UTF-8/UTF-8 \
es_NI/ISO-8859-1 \
+ es_PA.UTF-8/UTF-8 \
es_PA/ISO-8859-1 \
+ es_PE.UTF-8/UTF-8 \
es_PE/ISO-8859-1 \
+ es_PR.UTF-8/UTF-8 \
es_PR/ISO-8859-1 \
+ es_PY.UTF-8/UTF-8 \
es_PY/ISO-8859-1 \
+ es_SV.UTF-8/UTF-8 \
es_SV/ISO-8859-1 \
+ es_US.UTF-8/UTF-8 \
es_US/ISO-8859-1 \
+ es_UY.UTF-8/UTF-8 \
es_UY/ISO-8859-1 \
+ es_VE.UTF-8/UTF-8 \
es_VE/ISO-8859-1 \
+ et_EE.UTF-8/UTF-8 \
et_EE/ISO-8859-1 \
+ et_EE.ISO-8859-15/ISO-8859-15 \
+ eu_ES.UTF-8/UTF-8 \
eu_ES/ISO-8859-1 \
eu_ES@euro/ISO-8859-15 \
fa_IR/UTF-8 \
+ fi_FI.UTF-8/UTF-8 \
fi_FI/ISO-8859-1 \
fi_FI@euro/ISO-8859-15 \
+ fo_FO.UTF-8/UTF-8 \
fo_FO/ISO-8859-1 \
+ fr_BE.UTF-8/UTF-8 \
fr_BE/ISO-8859-1 \
fr_BE@euro/ISO-8859-15 \
+ fr_CA.UTF-8/UTF-8 \
fr_CA/ISO-8859-1 \
+ fr_CH.UTF-8/UTF-8 \
fr_CH/ISO-8859-1 \
+ fr_FR.UTF-8/UTF-8 \
fr_FR/ISO-8859-1 \
fr_FR@euro/ISO-8859-15 \
+ fr_LU.UTF-8/UTF-8 \
fr_LU/ISO-8859-1 \
fr_LU@euro/ISO-8859-15 \
+ ga_IE.UTF-8/UTF-8 \
ga_IE/ISO-8859-1 \
ga_IE@euro/ISO-8859-15 \
gd_GB/ISO-8859-15 \
***************
*** 105,199 ****
gez_ER@abegede/UTF-8 \
gez_ET/UTF-8 \
gez_ET@abegede/UTF-8 \
gl_ES/ISO-8859-1 \
gl_ES@euro/ISO-8859-15 \
gu_IN/UTF-8 \
gv_GB/ISO-8859-1 \
he_IL/ISO-8859-8 \
hi_IN/UTF-8 \
hr_HR/ISO-8859-2 \
hu_HU/ISO-8859-2 \
id_ID/ISO-8859-1 \
is_IS/ISO-8859-1 \
it_CH/ISO-8859-1 \
it_IT/ISO-8859-1 \
it_IT@euro/ISO-8859-15 \
iw_IL/ISO-8859-8 \
ja_JP.EUC-JP/EUC-JP \
ka_GE/GEORGIAN-PS \
kl_GL/ISO-8859-1 \
kn_IN/UTF-8 \
ko_KR.EUC-KR/EUC-KR \
ko_KR.UTF-8/UTF-8 \
kw_GB/ISO-8859-1 \
lo_LA/UTF-8 \
lt_LT/ISO-8859-13 \
! lug_UG/ISO-8859-10 \
lv_LV/ISO-8859-13 \
mi_NZ/ISO-8859-13 \
mk_MK/ISO-8859-5 \
ml_IN/UTF-8 \
mn_MN/UTF-8 \
mr_IN/UTF-8 \
ms_MY/ISO-8859-1 \
mt_MT/ISO-8859-3 \
ne_NP/UTF-8 \
nl_BE/ISO-8859-1 \
nl_BE@euro/ISO-8859-15 \
nl_NL/ISO-8859-1 \
nl_NL@euro/ISO-8859-15 \
! nb_NO/ISO-8859-1 \
nn_NO/ISO-8859-1 \
oc_FR/ISO-8859-1 \
om_ET/UTF-8 \
om_KE/ISO-8859-1 \
pa_IN/UTF-8 \
pl_PL/ISO-8859-2 \
pt_BR/ISO-8859-1 \
pt_PT/ISO-8859-1 \
pt_PT@euro/ISO-8859-15 \
ro_RO/ISO-8859-2 \
- ru_RU/ISO-8859-5 \
ru_RU.KOI8-R/KOI8-R \
ru_UA/KOI8-U \
se_NO/UTF-8 \
sid_ET/UTF-8 \
sk_SK/ISO-8859-2 \
sl_SI/ISO-8859-2 \
so_DJ/ISO-8859-1 \
so_ET/UTF-8 \
so_KE/ISO-8859-1 \
so_SO/ISO-8859-1 \
sq_AL/ISO-8859-1 \
! sr_YU/ISO-8859-2 \
! sr_YU@cyrillic/ISO-8859-5 \
st_ZA/ISO-8859-1 \
sv_FI/ISO-8859-1 \
sv_FI@euro/ISO-8859-15 \
sv_SE/ISO-8859-1 \
ta_IN/UTF-8 \
te_IN/UTF-8 \
tg_TJ/KOI8-T \
th_TH/TIS-620 \
ti_ER/UTF-8 \
ti_ET/UTF-8 \
tig_ER/UTF-8 \
tl_PH/ISO-8859-1 \
tr_TR/ISO-8859-9 \
uk_UA/KOI8-U \
ur_PK/UTF-8 \
uz_UZ/ISO-8859-1 \
uz_UZ@cyrillic/UTF-8 \
- vi_VN/UTF-8 \
vi_VN.TCVN/TCVN5712-1 \
wa_BE/ISO-8859-1 \
wa_BE@euro/ISO-8859-15 \
xh_ZA/ISO-8859-1 \
yi_US/CP1255 \
- zh_CN/GB2312 \
zh_CN.GB18030/GB18030 \
zh_CN.GBK/GBK \
zh_HK/BIG5-HKSCS \
! zh_TW/BIG5 \
zh_TW.EUC-TW/EUC-TW \
zu_ZA/ISO-8859-1 \
--- 183,363 ----
gez_ER@abegede/UTF-8 \
gez_ET/UTF-8 \
gez_ET@abegede/UTF-8 \
+ gl_ES.UTF-8/UTF-8 \
gl_ES/ISO-8859-1 \
gl_ES@euro/ISO-8859-15 \
gu_IN/UTF-8 \
+ gv_GB.UTF-8/UTF-8 \
gv_GB/ISO-8859-1 \
+ he_IL.UTF-8/UTF-8 \
he_IL/ISO-8859-8 \
hi_IN/UTF-8 \
+ hr_HR.UTF-8/UTF-8 \
hr_HR/ISO-8859-2 \
+ hu_HU.UTF-8/UTF-8 \
hu_HU/ISO-8859-2 \
+ id_ID.UTF-8/UTF-8 \
id_ID/ISO-8859-1 \
+ is_IS.UTF-8/UTF-8 \
is_IS/ISO-8859-1 \
+ it_CH.UTF-8/UTF-8 \
it_CH/ISO-8859-1 \
+ it_IT.UTF-8/UTF-8 \
it_IT/ISO-8859-1 \
it_IT@euro/ISO-8859-15 \
+ iw_IL.UTF-8/UTF-8 \
iw_IL/ISO-8859-8 \
ja_JP.EUC-JP/EUC-JP \
+ ja_JP.UTF-8/UTF-8 \
ka_GE/GEORGIAN-PS \
+ kk_KZ/PT154 \
+ kl_GL.UTF-8/UTF-8 \
kl_GL/ISO-8859-1 \
kn_IN/UTF-8 \
ko_KR.EUC-KR/EUC-KR \
ko_KR.UTF-8/UTF-8 \
+ kw_GB.UTF-8/UTF-8 \
kw_GB/ISO-8859-1 \
+ lg_UG/ISO-8859-10 \
lo_LA/UTF-8 \
+ lt_LT.UTF-8/UTF-8 \
lt_LT/ISO-8859-13 \
! lv_LV.UTF-8/UTF-8 \
lv_LV/ISO-8859-13 \
mi_NZ/ISO-8859-13 \
+ mk_MK.UTF-8/UTF-8 \
mk_MK/ISO-8859-5 \
ml_IN/UTF-8 \
mn_MN/UTF-8 \
mr_IN/UTF-8 \
+ ms_MY.UTF-8/UTF-8 \
ms_MY/ISO-8859-1 \
+ mt_MT.UTF-8/UTF-8 \
mt_MT/ISO-8859-3 \
+ nb_NO.UTF-8/UTF-8 \
+ nb_NO/ISO-8859-1 \
ne_NP/UTF-8 \
+ nl_BE.UTF-8/UTF-8 \
nl_BE/ISO-8859-1 \
nl_BE@euro/ISO-8859-15 \
+ nl_NL.UTF-8/UTF-8 \
nl_NL/ISO-8859-1 \
nl_NL@euro/ISO-8859-15 \
! nn_NO.UTF-8/UTF-8 \
nn_NO/ISO-8859-1 \
oc_FR/ISO-8859-1 \
om_ET/UTF-8 \
om_KE/ISO-8859-1 \
pa_IN/UTF-8 \
+ pl_PL.UTF-8/UTF-8 \
pl_PL/ISO-8859-2 \
+ pt_BR.UTF-8/UTF-8 \
pt_BR/ISO-8859-1 \
+ pt_PT.UTF-8/UTF-8 \
pt_PT/ISO-8859-1 \
pt_PT@euro/ISO-8859-15 \
+ ro_RO.UTF-8/UTF-8 \
ro_RO/ISO-8859-2 \
ru_RU.KOI8-R/KOI8-R \
+ ru_RU.UTF-8/UTF-8 \
+ ru_RU/ISO-8859-5 \
+ ru_UA.UTF-8/UTF-8 \
ru_UA/KOI8-U \
se_NO/UTF-8 \
sid_ET/UTF-8 \
+ sk_SK.UTF-8/UTF-8 \
sk_SK/ISO-8859-2 \
+ sl_SI.UTF-8/UTF-8 \
sl_SI/ISO-8859-2 \
so_DJ/ISO-8859-1 \
so_ET/UTF-8 \
so_KE/ISO-8859-1 \
so_SO/ISO-8859-1 \
+ sq_AL.UTF-8/UTF-8 \
sq_AL/ISO-8859-1 \
! st_ZA.UTF-8/UTF-8 \
st_ZA/ISO-8859-1 \
+ sv_FI.UTF-8/UTF-8 \
sv_FI/ISO-8859-1 \
sv_FI@euro/ISO-8859-15 \
+ sv_SE.UTF-8/UTF-8 \
sv_SE/ISO-8859-1 \
ta_IN/UTF-8 \
te_IN/UTF-8 \
tg_TJ/KOI8-T \
+ th_TH.UTF-8/UTF-8 \
th_TH/TIS-620 \
ti_ER/UTF-8 \
ti_ET/UTF-8 \
tig_ER/UTF-8 \
tl_PH/ISO-8859-1 \
+ tr_TR.UTF-8/UTF-8 \
tr_TR/ISO-8859-9 \
+ tt_RU.UTF-8/UTF-8 \
+ uk_UA.UTF-8/UTF-8 \
uk_UA/KOI8-U \
ur_PK/UTF-8 \
uz_UZ/ISO-8859-1 \
uz_UZ@cyrillic/UTF-8 \
vi_VN.TCVN/TCVN5712-1 \
+ vi_VN/UTF-8 \
wa_BE/ISO-8859-1 \
wa_BE@euro/ISO-8859-15 \
+ wa_BE.UTF-8/UTF-8 \
+ xh_ZA.UTF-8/UTF-8 \
xh_ZA/ISO-8859-1 \
yi_US/CP1255 \
zh_CN.GB18030/GB18030 \
zh_CN.GBK/GBK \
+ zh_CN.UTF-8/UTF-8 \
+ zh_CN/GB2312 \
+ zh_HK.UTF-8/UTF-8 \
zh_HK/BIG5-HKSCS \
! zh_SG.GBK/GBK \
! zh_SG/GB2312 \
zh_TW.EUC-TW/EUC-TW \
+ zh_TW.UTF-8/UTF-8 \
+ zh_TW/BIG5 \
+ zu_ZA.UTF-8/UTF-8 \
zu_ZA/ISO-8859-1 \
+ aa_DJ.UTF-8/UTF-8 \
+ aa_ER.UTF-8/UTF-8 \
+ aa_ET.UTF-8/UTF-8 \
+ af_ZA.UTF-8/UTF-8 \
+ am_ET.UTF-8/UTF-8 \
+ an_ES.UTF-8/UTF-8 \
+ ar_IN.UTF-8/UTF-8 \
+ bn_BD.UTF-8/UTF-8 \
+ bn_IN.UTF-8/UTF-8 \
+ br_FR.UTF-8/UTF-8 \
+ bs_BA.UTF-8/UTF-8 \
+ byn_ER.UTF-8/UTF-8 \
+ en_BE.UTF-8/UTF-8 \
+ en_BE/ISO-8859-1 \
+ en_BE@euro/ISO-8859-15 \
+ en_GB.ISO-8859-15/ISO-8859-15 \
+ en_US.ISO-8859-15/ISO-8859-15 \
+ en_IN.UTF-8/UTF-8 \
+ fa_IR.UTF-8/UTF-8 \
+ hi_IN.UTF-8/UTF-8 \
+ ja_JP.SJIS/SHIFT_JIS \
+ ml_IN.UTF-8/UTF-8 \
+ mn_MN.UTF-8/UTF-8 \
+ mr_IN.UTF-8/UTF-8 \
+ ne_NP.UTF-8/UTF-8 \
+ om_ET.UTF-8/UTF-8 \
+ pa_IN.UTF-8/UTF-8 \
+ se_NO.UTF-8/UTF-8 \
+ sh_YU.UTF-8/UTF-8 \
+ sh_YU/ISO-8859-2 \
+ sid_ET.UTF-8/UTF-8 \
+ so_ET.UTF-8/UTF-8 \
+ sv_SE.ISO-8859-15/ISO-8859-15 \
+ ta_IN.UTF-8/UTF-8 \
+ te_IN.UTF-8/UTF-8 \
+ ti_ER.UTF-8/UTF-8 \
+ ti_ET.UTF-8/UTF-8 \
+ tig_ER.UTF-8/UTF-8 \
+ ur_PK.UTF-8/UTF-8 \
+ vi_VN.UTF-8/UTF-8 \
+ zh_SG.UTF-8/UTF-8 \