Skip to content

Commit

Permalink
kdeApplications: 17.04.0 -> 17.04.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ttuegel
ttuegel committed May 18, 2017
1 parent 32033f5 commit d7e9248
Show file tree
Hide file tree
Showing 3 changed files with 1,144 additions and 1,203 deletions.
2 changes: 1 addition & 1 deletion pkgs/applications/kde/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( http://download.kde.org/stable/applications/17.04.0/ -A '*.tar.xz' )
WGET_ARGS=( http://download.kde.org/stable/applications/17.04.1/ -A '*.tar.xz' )
59 changes: 0 additions & 59 deletions pkgs/applications/kde/l10n.nix
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,187 +10,141 @@ in
lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
ar = {
qt4 = callPackage (kdeLocale4 "ar" {}) {};
qt5 = callPackage (kdeLocale5 "ar" {}) {};
};
bg = {
qt4 = callPackage (kdeLocale4 "bg" {}) {};
qt5 = callPackage (kdeLocale5 "bg" {}) {};
};
bs = {
qt4 = callPackage (kdeLocale4 "bs" {}) {};
qt5 = callPackage (kdeLocale5 "bs" {}) {};
};
ca = {
qt4 = callPackage (kdeLocale4 "ca" {}) {};
qt5 = callPackage (kdeLocale5 "ca" {}) {};
};
ca_valencia = {
qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
};
cs = {
qt4 = callPackage (kdeLocale4 "cs" {}) {};
qt5 = callPackage (kdeLocale5 "cs" {}) {};
};
da = {
qt4 = callPackage (kdeLocale4 "da" {}) {};
qt5 = callPackage (kdeLocale5 "da" {}) {};
};
de = {
qt4 = callPackage (kdeLocale4 "de" {}) {};
qt5 = callPackage (kdeLocale5 "de" {}) {};
};
el = {
qt4 = callPackage (kdeLocale4 "el" {}) {};
qt5 = callPackage (kdeLocale5 "el" {}) {};
};
en_GB = {
qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
};
eo = {
qt4 = callPackage (kdeLocale4 "eo" {}) {};
qt5 = callPackage (kdeLocale5 "eo" {}) {};
};
es = {
qt4 = callPackage (kdeLocale4 "es" {}) {};
qt5 = callPackage (kdeLocale5 "es" {}) {};
};
et = {
qt4 = callPackage (kdeLocale4 "et" {}) {};
qt5 = callPackage (kdeLocale5 "et" {}) {};
};
eu = {
qt4 = callPackage (kdeLocale4 "eu" {}) {};
qt5 = callPackage (kdeLocale5 "eu" {}) {};
};
fa = {
qt4 = callPackage (kdeLocale4 "fa" {}) {};
qt5 = callPackage (kdeLocale5 "fa" {}) {};
};
fi = {
qt4 = callPackage (kdeLocale4 "fi" {}) {};
qt5 = callPackage (kdeLocale5 "fi" {}) {};
};
fr = {
qt4 = callPackage (kdeLocale4 "fr" {}) {};
qt5 = callPackage (kdeLocale5 "fr" {}) {};
};
ga = {
qt4 = callPackage (kdeLocale4 "ga" {}) {};
qt5 = callPackage (kdeLocale5 "ga" {}) {};
};
gl = {
qt4 = callPackage (kdeLocale4 "gl" {}) {};
qt5 = callPackage (kdeLocale5 "gl" {}) {};
};
he = {
qt4 = callPackage (kdeLocale4 "he" {}) {};
qt5 = callPackage (kdeLocale5 "he" {}) {};
};
hi = {
qt4 = callPackage (kdeLocale4 "hi" {}) {};
qt5 = callPackage (kdeLocale5 "hi" {}) {};
};
hr = {
qt4 = callPackage (kdeLocale4 "hr" {}) {};
qt5 = callPackage (kdeLocale5 "hr" {}) {};
};
hu = {
qt4 = callPackage (kdeLocale4 "hu" {}) {};
qt5 = callPackage (kdeLocale5 "hu" {}) {};
};
ia = {
qt4 = callPackage (kdeLocale4 "ia" {}) {};
qt5 = callPackage (kdeLocale5 "ia" {}) {};
};
id = {
qt4 = callPackage (kdeLocale4 "id" {}) {};
qt5 = callPackage (kdeLocale5 "id" {}) {};
};
is = {
qt4 = callPackage (kdeLocale4 "is" {}) {};
qt5 = callPackage (kdeLocale5 "is" {}) {};
};
it = {
qt4 = callPackage (kdeLocale4 "it" {}) {};
qt5 = callPackage (kdeLocale5 "it" {}) {};
};
ja = {
qt4 = callPackage (kdeLocale4 "ja" {}) {};
qt5 = callPackage (kdeLocale5 "ja" {}) {};
};
kk = {
qt4 = callPackage (kdeLocale4 "kk" {}) {};
qt5 = callPackage (kdeLocale5 "kk" {}) {};
};
km = {
qt4 = callPackage (kdeLocale4 "km" {}) {};
qt5 = callPackage (kdeLocale5 "km" {}) {};
};
ko = {
qt4 = callPackage (kdeLocale4 "ko" {}) {};
qt5 = callPackage (kdeLocale5 "ko" {}) {};
};
lt = {
qt4 = callPackage (kdeLocale4 "lt" {}) {};
qt5 = callPackage (kdeLocale5 "lt" {}) {};
};
lv = {
qt4 = callPackage (kdeLocale4 "lv" {}) {};
qt5 = callPackage (kdeLocale5 "lv" {}) {};
};
mr = {
qt4 = callPackage (kdeLocale4 "mr" {}) {};
qt5 = callPackage (kdeLocale5 "mr" {}) {};
};
nb = {
qt4 = callPackage (kdeLocale4 "nb" {}) {};
qt5 = callPackage (kdeLocale5 "nb" {}) {};
};
nds = {
qt4 = callPackage (kdeLocale4 "nds" {}) {};
qt5 = callPackage (kdeLocale5 "nds" {}) {};
};
nl = {
qt4 = callPackage (kdeLocale4 "nl" {}) {};
qt5 = callPackage (kdeLocale5 "nl" {}) {};
};
nn = {
qt4 = callPackage (kdeLocale4 "nn" {}) {};
qt5 = callPackage (kdeLocale5 "nn" {}) {};
};
pa = {
qt4 = callPackage (kdeLocale4 "pa" {}) {};
qt5 = callPackage (kdeLocale5 "pa" {}) {};
};
pl = {
qt4 = callPackage (kdeLocale4 "pl" {}) {};
qt5 = callPackage (kdeLocale5 "pl" {}) {};
};
pt = {
qt4 = callPackage (kdeLocale4 "pt" {}) {};
qt5 = callPackage (kdeLocale5 "pt" {}) {};
};
pt_BR = {
qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
};
ro = {
qt4 = callPackage (kdeLocale4 "ro" {}) {};
qt5 = callPackage (kdeLocale5 "ro" {}) {};
};
ru = {
qt4 = callPackage (kdeLocale4 "ru" {}) {};
qt5 = callPackage (kdeLocale5 "ru" {}) {};
};
sk = {
qt4 = callPackage (kdeLocale4 "sk" {}) {};
qt5 = callPackage (kdeLocale5 "sk" {}) {};
};
sl = {
qt4 = callPackage (kdeLocale4 "sl" {}) {};
qt5 = callPackage (kdeLocale5 "sl" {}) {};
};
sr = {
qt4 = callPackage (kdeLocale4 "sr" {
Expand All @@ -203,39 +157,26 @@ lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
'';
}) {};
qt5 = callPackage (kdeLocale5 "sr" {
preConfigure = ''
patchShebangs 5/sr/cmake_modules/resolve-sr-hybrid
sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
'';
}) {};
};
sv = {
qt4 = callPackage (kdeLocale4 "sv" {}) {};
qt5 = callPackage (kdeLocale5 "sv" {}) {};
};
tr = {
qt4 = callPackage (kdeLocale4 "tr" {}) {};
qt5 = callPackage (kdeLocale5 "tr" {}) {};
};
ug = {
qt4 = callPackage (kdeLocale4 "ug" {}) {};
qt5 = callPackage (kdeLocale5 "ug" {}) {};
};
uk = {
qt4 = callPackage (kdeLocale4 "uk" {}) {};
qt5 = callPackage (kdeLocale5 "uk" {}) {};
};
wa = {
qt4 = callPackage (kdeLocale4 "wa" {}) {};
qt5 = callPackage (kdeLocale5 "wa" {}) {};
};
zh_CN = {
qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
};
zh_TW = {
qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
};
}

4 comments on commit d7e9248

@4z3
Copy link
Contributor

@4z3 4z3 commented on d7e9248 Oct 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

@orivej orivej commented on d7e9248 Oct 4, 2017 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@ttuegel
Copy link
Member Author

@ttuegel ttuegel commented on d7e9248 Oct 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor

@4z3 4z3 commented on d7e9248 Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Please sign in to comment.