Skip to content

Commit d7e9248

Browse files
ttuegelttuegel
committedMay 18, 2017
kdeApplications: 17.04.0 -> 17.04.1
1 parent 32033f5 commit d7e9248

File tree

3 files changed

+1144
-1203
lines changed

3 files changed

+1144
-1203
lines changed
 

‎pkgs/applications/kde/fetch.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )
1+
WGET_ARGS=( http://download.kde.org/stable/applications/17.04.1/ -A '*.tar.xz' )

‎pkgs/applications/kde/l10n.nix

-59
Original file line numberDiff line numberDiff line change
@@ -10,187 +10,141 @@ in
1010
lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
1111
ar = {
1212
qt4 = callPackage (kdeLocale4 "ar" {}) {};
13-
qt5 = callPackage (kdeLocale5 "ar" {}) {};
1413
};
1514
bg = {
1615
qt4 = callPackage (kdeLocale4 "bg" {}) {};
17-
qt5 = callPackage (kdeLocale5 "bg" {}) {};
1816
};
1917
bs = {
2018
qt4 = callPackage (kdeLocale4 "bs" {}) {};
21-
qt5 = callPackage (kdeLocale5 "bs" {}) {};
2219
};
2320
ca = {
2421
qt4 = callPackage (kdeLocale4 "ca" {}) {};
25-
qt5 = callPackage (kdeLocale5 "ca" {}) {};
2622
};
2723
ca_valencia = {
2824
qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
29-
qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
3025
};
3126
cs = {
3227
qt4 = callPackage (kdeLocale4 "cs" {}) {};
33-
qt5 = callPackage (kdeLocale5 "cs" {}) {};
3428
};
3529
da = {
3630
qt4 = callPackage (kdeLocale4 "da" {}) {};
37-
qt5 = callPackage (kdeLocale5 "da" {}) {};
3831
};
3932
de = {
4033
qt4 = callPackage (kdeLocale4 "de" {}) {};
41-
qt5 = callPackage (kdeLocale5 "de" {}) {};
4234
};
4335
el = {
4436
qt4 = callPackage (kdeLocale4 "el" {}) {};
45-
qt5 = callPackage (kdeLocale5 "el" {}) {};
4637
};
4738
en_GB = {
4839
qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
49-
qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
5040
};
5141
eo = {
5242
qt4 = callPackage (kdeLocale4 "eo" {}) {};
53-
qt5 = callPackage (kdeLocale5 "eo" {}) {};
5443
};
5544
es = {
5645
qt4 = callPackage (kdeLocale4 "es" {}) {};
57-
qt5 = callPackage (kdeLocale5 "es" {}) {};
5846
};
5947
et = {
6048
qt4 = callPackage (kdeLocale4 "et" {}) {};
61-
qt5 = callPackage (kdeLocale5 "et" {}) {};
6249
};
6350
eu = {
6451
qt4 = callPackage (kdeLocale4 "eu" {}) {};
65-
qt5 = callPackage (kdeLocale5 "eu" {}) {};
6652
};
6753
fa = {
6854
qt4 = callPackage (kdeLocale4 "fa" {}) {};
69-
qt5 = callPackage (kdeLocale5 "fa" {}) {};
7055
};
7156
fi = {
7257
qt4 = callPackage (kdeLocale4 "fi" {}) {};
73-
qt5 = callPackage (kdeLocale5 "fi" {}) {};
7458
};
7559
fr = {
7660
qt4 = callPackage (kdeLocale4 "fr" {}) {};
77-
qt5 = callPackage (kdeLocale5 "fr" {}) {};
7861
};
7962
ga = {
8063
qt4 = callPackage (kdeLocale4 "ga" {}) {};
81-
qt5 = callPackage (kdeLocale5 "ga" {}) {};
8264
};
8365
gl = {
8466
qt4 = callPackage (kdeLocale4 "gl" {}) {};
85-
qt5 = callPackage (kdeLocale5 "gl" {}) {};
8667
};
8768
he = {
8869
qt4 = callPackage (kdeLocale4 "he" {}) {};
89-
qt5 = callPackage (kdeLocale5 "he" {}) {};
9070
};
9171
hi = {
9272
qt4 = callPackage (kdeLocale4 "hi" {}) {};
93-
qt5 = callPackage (kdeLocale5 "hi" {}) {};
9473
};
9574
hr = {
9675
qt4 = callPackage (kdeLocale4 "hr" {}) {};
97-
qt5 = callPackage (kdeLocale5 "hr" {}) {};
9876
};
9977
hu = {
10078
qt4 = callPackage (kdeLocale4 "hu" {}) {};
101-
qt5 = callPackage (kdeLocale5 "hu" {}) {};
10279
};
10380
ia = {
10481
qt4 = callPackage (kdeLocale4 "ia" {}) {};
105-
qt5 = callPackage (kdeLocale5 "ia" {}) {};
10682
};
10783
id = {
10884
qt4 = callPackage (kdeLocale4 "id" {}) {};
109-
qt5 = callPackage (kdeLocale5 "id" {}) {};
11085
};
11186
is = {
11287
qt4 = callPackage (kdeLocale4 "is" {}) {};
113-
qt5 = callPackage (kdeLocale5 "is" {}) {};
11488
};
11589
it = {
11690
qt4 = callPackage (kdeLocale4 "it" {}) {};
117-
qt5 = callPackage (kdeLocale5 "it" {}) {};
11891
};
11992
ja = {
12093
qt4 = callPackage (kdeLocale4 "ja" {}) {};
121-
qt5 = callPackage (kdeLocale5 "ja" {}) {};
12294
};
12395
kk = {
12496
qt4 = callPackage (kdeLocale4 "kk" {}) {};
125-
qt5 = callPackage (kdeLocale5 "kk" {}) {};
12697
};
12798
km = {
12899
qt4 = callPackage (kdeLocale4 "km" {}) {};
129-
qt5 = callPackage (kdeLocale5 "km" {}) {};
130100
};
131101
ko = {
132102
qt4 = callPackage (kdeLocale4 "ko" {}) {};
133-
qt5 = callPackage (kdeLocale5 "ko" {}) {};
134103
};
135104
lt = {
136105
qt4 = callPackage (kdeLocale4 "lt" {}) {};
137-
qt5 = callPackage (kdeLocale5 "lt" {}) {};
138106
};
139107
lv = {
140108
qt4 = callPackage (kdeLocale4 "lv" {}) {};
141-
qt5 = callPackage (kdeLocale5 "lv" {}) {};
142109
};
143110
mr = {
144111
qt4 = callPackage (kdeLocale4 "mr" {}) {};
145-
qt5 = callPackage (kdeLocale5 "mr" {}) {};
146112
};
147113
nb = {
148114
qt4 = callPackage (kdeLocale4 "nb" {}) {};
149-
qt5 = callPackage (kdeLocale5 "nb" {}) {};
150115
};
151116
nds = {
152117
qt4 = callPackage (kdeLocale4 "nds" {}) {};
153-
qt5 = callPackage (kdeLocale5 "nds" {}) {};
154118
};
155119
nl = {
156120
qt4 = callPackage (kdeLocale4 "nl" {}) {};
157-
qt5 = callPackage (kdeLocale5 "nl" {}) {};
158121
};
159122
nn = {
160123
qt4 = callPackage (kdeLocale4 "nn" {}) {};
161-
qt5 = callPackage (kdeLocale5 "nn" {}) {};
162124
};
163125
pa = {
164126
qt4 = callPackage (kdeLocale4 "pa" {}) {};
165-
qt5 = callPackage (kdeLocale5 "pa" {}) {};
166127
};
167128
pl = {
168129
qt4 = callPackage (kdeLocale4 "pl" {}) {};
169-
qt5 = callPackage (kdeLocale5 "pl" {}) {};
170130
};
171131
pt = {
172132
qt4 = callPackage (kdeLocale4 "pt" {}) {};
173-
qt5 = callPackage (kdeLocale5 "pt" {}) {};
174133
};
175134
pt_BR = {
176135
qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
177-
qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
178136
};
179137
ro = {
180138
qt4 = callPackage (kdeLocale4 "ro" {}) {};
181-
qt5 = callPackage (kdeLocale5 "ro" {}) {};
182139
};
183140
ru = {
184141
qt4 = callPackage (kdeLocale4 "ru" {}) {};
185-
qt5 = callPackage (kdeLocale5 "ru" {}) {};
186142
};
187143
sk = {
188144
qt4 = callPackage (kdeLocale4 "sk" {}) {};
189-
qt5 = callPackage (kdeLocale5 "sk" {}) {};
190145
};
191146
sl = {
192147
qt4 = callPackage (kdeLocale4 "sl" {}) {};
193-
qt5 = callPackage (kdeLocale5 "sl" {}) {};
194148
};
195149
sr = {
196150
qt4 = callPackage (kdeLocale4 "sr" {
@@ -203,39 +157,26 @@ lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
203157
4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
204158
'';
205159
}) {};
206-
qt5 = callPackage (kdeLocale5 "sr" {
207-
preConfigure = ''
208-
patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid
209-
sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
210-
'';
211-
}) {};
212160
};
213161
sv = {
214162
qt4 = callPackage (kdeLocale4 "sv" {}) {};
215-
qt5 = callPackage (kdeLocale5 "sv" {}) {};
216163
};
217164
tr = {
218165
qt4 = callPackage (kdeLocale4 "tr" {}) {};
219-
qt5 = callPackage (kdeLocale5 "tr" {}) {};
220166
};
221167
ug = {
222168
qt4 = callPackage (kdeLocale4 "ug" {}) {};
223-
qt5 = callPackage (kdeLocale5 "ug" {}) {};
224169
};
225170
uk = {
226171
qt4 = callPackage (kdeLocale4 "uk" {}) {};
227-
qt5 = callPackage (kdeLocale5 "uk" {}) {};
228172
};
229173
wa = {
230174
qt4 = callPackage (kdeLocale4 "wa" {}) {};
231-
qt5 = callPackage (kdeLocale5 "wa" {}) {};
232175
};
233176
zh_CN = {
234177
qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
235-
qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
236178
};
237179
zh_TW = {
238180
qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
239-
qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
240181
};
241182
}

‎pkgs/applications/kde/srcs.nix

+1,143-1,143
Large diffs are not rendered by default.

4 commit comments

Comments
 (4)

4z3 commented on Oct 3, 2017

@4z3
4z3
on Oct 3, 2017
Contributor

This commit turns kdeLocale5 (and hence kde-locale-5.nix) into dead code. Is my assumption correct that users have to use something like follows to use a locale with kde5 when switching from 17.03 to 17.09?

{
    environment.systemPackages = [
      (pkgs.kdeApplications.callPackage
        (import <nixpkgs/pkgs/applications/kde/kde-locale-5.nix> "de" {})
        {})
    ];
}

orivej commented on Oct 4, 2017

@orivej
orivej
on Oct 4, 2017edited by orivej
Contributor

I haven't checked why but I appear to have all KDE locales installed with no configuration.

ttuegel commented on Oct 4, 2017

@ttuegel
ttuegel
on Oct 4, 2017
MemberAuthor

This commit turns kdeLocale5 (and hence kde-locale-5.nix) into dead code. Is my assumption correct that users have to use something like follows to use a locale with kde5 when switching from 17.03 to 17.09?

As of KDE Applications 17.04, Qt 5 localizations are distributed with each application instead of separately. When you install a KDE/Qt 5 application, all the locales for that application are automatically installed.

4z3 commented on Oct 5, 2017

@4z3
4z3
on Oct 5, 2017
Contributor

Thanks for clarifying it! I've opened a PR to remove the now unused file kde-locale-5.nix.

Please sign in to comment.