8 files changed, 224 insertions, 150 deletions
diff --git a/pkgs/desktops/kde-4.5/default.nix b/pkgs/desktops/kde-4.5/default.nix
index 8ff7e9701990..23be3c981298 100644
--- a/pkgs/desktops/kde-4.5/default.nix
+++ b/pkgs/desktops/kde-4.5/default.nix
@@ -152,10 +152,6 @@ recurseIntoAttrs rec {
   kdepim_runtime = callPackage ./pim-runtime { };
   kdepim = callPackage ./pim { };
 
-  # Experimental 4.5 versions
-  kdepim_runtime45 = callPackage ./pim-runtime45 { };
-  kdepim45 = callPackage ./pim45 { };
-  
 ### DEVELOPMENT
 
   kdebindings = callPackage ./bindings { };
diff --git a/pkgs/desktops/kde-4.5/kde-package/manifest.nix b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
index 5274035ea564..230533aaeb7c 100644
--- a/pkgs/desktops/kde-4.5/kde-package/manifest.nix
+++ b/pkgs/desktops/kde-4.5/kde-package/manifest.nix
@@ -5,102 +5,6 @@ builtins.listToAttrs
   value = "1ng5bi1gmr5lg49c5kyqyjzbjhs4w90c2zlnfcyviv9p3wzfgzbr";
 }
 {
-  name = "oxygen-icons-4.5.1.tar.bz2";
-  value = "1gnz8jrdccw91p2n52my0609h7g9ws55gal3jan2jylz6b0zq6dm";
-}
-{
-  name = "kdelibs-4.5.1.tar.bz2";
-  value = "1xqvrrbwz5i4m6lipg1j97l2yq3kmxsl5j62jkhvp56q7dh85i0d";
-}
-{
-  name = "kdeaccessibility-4.5.1.tar.bz2";
-  value = "0jdd3n61lhabzs2dv6rfv6ksp7cqn5wpj6f2d8z33c354y9lqw24";
-}
-{
-  name = "kdepimlibs-4.5.1.tar.bz2";
-  value = "1dlxnxxay6wbwgcfbkq0xak9z0h1bkh6rvysjx3djmawmwi5aw6b";
-}
-{
-  name = "kdepim-4.4.93.tar.bz2";
-  value = "1xrqmsgbgqpa8qzqadp1hikhn8c1snh5k323kc6a5yqdpnsf2qa0";
-}
-{
-  name = "kdepim-runtime-4.4.93.tar.bz2";
-  value = "18g8dz57pflmri7v013lsn2g4552c35lawcr7jxgig2x05zrwgf7";
-}
-{
-  name = "kdebase-4.5.1.tar.bz2";
-  value = "06g8s3r153hdmxh24s2x98a0fb4lr6d00d4307ibgp7r29w6dklb";
-}
-{
-  name = "kdebase-runtime-4.5.1.tar.bz2";
-  value = "1fjpyxzffl0ravyicgb56sqaw5zkwky98lj9ad6z4rdiysq5v5rz";
-}
-{
-  name = "kdebase-workspace-4.5.1.tar.bz2";
-  value = "0mrx03bsb9qj78k0l04q28gc8l7ky0y0rqdshv4spbmrjfsa03fd";
-}
-{
-  name = "kdebindings-4.5.1.tar.bz2";
-  value = "1j8bf7lwb70jc0m8d2hh6c1z6vgpxbqf47w5pkq58kgan8y3zcsw";
-}
-{
-  name = "kdeartwork-4.5.1.tar.bz2";
-  value = "0fjcx6wwgzxl64s62wv2sf15plx49fck86nwzfbgbmdha1ra2gmi";
-}
-{
-  name = "kdenetwork-4.5.1.tar.bz2";
-  value = "0wzbrhj4bzd4d432qqf5jwfagvxsv3flzdq7jzc449w6ybdgqw6n";
-}
-{
-  name = "kdeedu-4.5.1.tar.bz2";
-  value = "026gdb6q06l9d8v3a0dcynxkdnv9cal1gnnxwdawvc5rky2vp07j";
-}
-{
-  name = "kdesdk-4.5.1.tar.bz2";
-  value = "0kwgd3hxc6jwk7qk67z1jaks9jg04hgh5aywyfs2dc8w2ns1xyhp";
-}
-{
-  name = "kdetoys-4.5.1.tar.bz2";
-  value = "194a6ylxi5jrfh3w3cy6jhdissshswdrv9pnir72z67ca13dvd9s";
-}
-{
-  name = "kdewebdev-4.5.1.tar.bz2";
-  value = "0kgk3wwskvxw0hmzpify5by3mbnyprmy1c0nx44iw85xrk6riss0";
-}
-{
-  name = "kdeutils-4.5.1.tar.bz2";
-  value = "13i13pga3dlhg6bwz6p3wrr8qa0vzhwqg809a0r5yn0kz4icaasq";
-}
-{
-  name = "kdegraphics-4.5.1.tar.bz2";
-  value = "0z0fqqb868ywvdxvd94vp15drkizh59m4arblsx9cj19d157nbwd";
-}
-{
-  name = "kdemultimedia-4.5.1.tar.bz2";
-  value = "1a5rgvznvykislif7igsb3b6xwps2g8s5ifkfj8dbkdvsmavlmjf";
-}
-{
-  name = "kdegames-4.5.1.tar.bz2";
-  value = "1d158z2hqc7i7mh43ajhmsqixdazhjm7pxs6rjala0fcgmqk1lj1";
-}
-{
-  name = "kdeplasma-addons-4.5.1.tar.bz2";
-  value = "17mjk2qdfgcz2l9f00q08dzxkqib8li5bjxawsb7fwzj93jc7lp5";
-}
-{
-  name = "kdeadmin-4.5.1.tar.bz2";
-  value = "011ajsma8s9ay0dsjx383jn8yynkyshlzx6gjw68caxzjhpc0ib2";
-}
-{
-  name = "kdepim-4.4.6.tar.bz2";
-  value = "0pymjjxg8qjiarcbs6saxkkb4n51qlfk4l0pwblhglsvgc4q3wjm";
-}
-{
-  name = "kdepim-runtime-4.4.6.tar.bz2";
-  value = "1y0xxwsq9wlwbkd661i4f1iqvpzg3sbi3lq9dir45fjx406chgmd";
-}
-{
   name = "kdeaccessibility-4.5.2.tar.bz2";
   value = "1iv94vvngxs94vl3ssjq1y2sd50wcc7s7gvngwqj534qjd1fj3a2";
 }
diff --git a/pkgs/desktops/kde-4.5/l10n/default.nix b/pkgs/desktops/kde-4.5/l10n/default.nix
index 18b234b28bc3..6e561726c08c 100644
--- a/pkgs/desktops/kde-4.5/l10n/default.nix
+++ b/pkgs/desktops/kde-4.5/l10n/default.nix
@@ -3,8 +3,8 @@
 let
   overrides = { };
 
-  defaultRelease = "4.5.2";
-  releases = [ "4.5.1" "4.5.2" ];
+  defaultRelease = "4.5.3";
+  releases = [ "4.5.1" "4.5.2" "4.5.3" ];
 
   sanitizeString = replaceChars [ "@" "." ] [ "_" "_" ];
   getOverride = name: attrByPath [name] {} overrides;
diff --git a/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh
index aa41ccd4278b..baa235e0f75f 100755
--- a/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh
+++ b/pkgs/desktops/kde-4.5/l10n/l10n-manifest.sh
@@ -24,9 +24,6 @@ for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
   hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
   echo "{"
   echo "  lang = \"${lang}\";"
-  if [[ "${lang}" =~ "@" ]]; then
-    echo "  langStripped = \"${lang/@/_}\";"
-  fi
   echo "  sha256 = \"${hash}\";"
   echo "}"
   echo $hash >&2
diff --git a/pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix b/pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix
new file mode 100644
index 000000000000..b9b69d76a159
--- /dev/null
+++ b/pkgs/desktops/kde-4.5/l10n/manifest-4.5.3.nix
@@ -0,0 +1,222 @@
+[
+{
+  lang = "ar";
+  sha256 = "0i22kwm737ry3l3q9pwmbnv2ln317fz3r1z8x8i6l0czdkj5qxw6";
+}
+{
+  lang = "bg";
+  sha256 = "0qa2x3zz5aaxlm88zvrkglsisc85la6asfh5yiijc9hga27ykp16";
+}
+{
+  lang = "ca";
+  sha256 = "1ip55x72chxs9v1hr8rzi519xhfvkkbv7b4k4pc5nygpdqzj1whh";
+}
+{
+  lang = "ca@valencia";
+  sha256 = "0g8x685a2ndvm9qh2wp6kxdlhbidgsjacw80p488hizgqczakbn7";
+}
+{
+  lang = "cs";
+  sha256 = "19zx1zhd6wrkqmc6qnyj4rsll14difps0dzwnwa56l3h5ir1828v";
+}
+{
+  lang = "da";
+  sha256 = "1q50w3dmxbpczgxgl6n49lc5qqym42r1kz4h7ijqfazb5mwk9zqc";
+}
+{
+  lang = "de";
+  sha256 = "0ff4174szrxm4wn3jmkkzfr3jl0yqxkkqi3g3xj71mazsrsa1ghs";
+}
+{
+  lang = "el";
+  sha256 = "1r5m3d7cc3mi748ckmkky53j3cmw20pibczvkwcs2c65q6l0vcjc";
+}
+{
+  lang = "en_GB";
+  sha256 = "194jdjpqcpi861sxpvqagm8nammwksxyi55i75bw53p8x87i27pv";
+}
+{
+  lang = "eo";
+  sha256 = "1gbmqm9mgmps37pwr7lb140pvrmm24m6aw989qaig27gjjqpmvnx";
+}
+{
+  lang = "es";
+  sha256 = "1hnnk2zvlbppdqqbf1vi2d2c8mpw693bwb6dixba4p542ir7bi8i";
+}
+{
+  lang = "et";
+  sha256 = "0qgv7v93n4mnpcdvjxkdbvyaji1nhgj0nxby5hxrznnvgwbvfzbf";
+}
+{
+  lang = "eu";
+  sha256 = "1rmdak9pgkswrnwdpmgck2lq2cw5v3bjc8vv79mb3kyki901423g";
+}
+{
+  lang = "fi";
+  sha256 = "17s9yqadgjq2dmp28syxzzprya80j0b2l60r293k0bdkdfrgz07p";
+}
+{
+  lang = "fr";
+  sha256 = "15hh7k9dhi2mb27rihjc9dfii1ab8c1i2jbhihmjmb8hd5dm30bx";
+}
+{
+  lang = "fy";
+  sha256 = "0q5vcnimnvl3gmrqj2fr6i7fvw2bd3lrg77s03hf25crkfsd7lr8";
+}
+{
+  lang = "ga";
+  sha256 = "0cy8a0jvb0w35i3482a86rdnbbyswww9dlb57rjhw6mqwa3qp6j6";
+}
+{
+  lang = "gl";
+  sha256 = "1xdzhf6kwkz2r77i86grcdbrwxm37shaif2vjhhwgimplsh7z5s3";
+}
+{
+  lang = "gu";
+  sha256 = "1sky7kc5prg1bnkh2nhriqs33qa7rlfds9k31sf24x4jhfn75lji";
+}
+{
+  lang = "he";
+  sha256 = "0bkfwilsvvaiklgnfnyf6p1dyamwj310b9xkrdga7szrsfgrviip";
+}
+{
+  lang = "hi";
+  sha256 = "0fxz77pfv9ayx43pf037bpllhjwxdhsggl7yq5qg28d233602sxc";
+}
+{
+  lang = "hr";
+  sha256 = "16nkrdh1y9mk5rkdyl70i9dh8xam2fr23lz7p0qmjf66npjnvcz1";
+}
+{
+  lang = "hu";
+  sha256 = "141xhsxv2bk81sx3lzzd78a9qzp0qzrcp32i9d4bkmyppwiia9h2";
+}
+{
+  lang = "ia";
+  sha256 = "1hgzk2yfwjqils8zd1rv1djdjsj932mqxcl4bnfv3az4vl0ly405";
+}
+{
+  lang = "id";
+  sha256 = "12hqichrl7i3fjkqyhc2c3dp34bhjl0ps4g3vpc0m59w2vwyv4sw";
+}
+{
+  lang = "is";
+  sha256 = "1ydx8sx7dwdzava4y3aj0vfd23nfqiwq5m9aw3ayaliipacrq1dg";
+}
+{
+  lang = "it";
+  sha256 = "0z7zig48ixqs18dyi6q28k8dwn2a2giwsndignd5ck7xbi5h7rn8";
+}
+{
+  lang = "ja";
+  sha256 = "0mpch19nk8pqizq2zcs8jpxrsj2nq9lx82m58dwgmxdn3qlpklm3";
+}
+{
+  lang = "kk";
+  sha256 = "099hqac4a5z0aq3nw0znwjlxgxgpmmjb385nm2z74s3d8d4dw8bb";
+}
+{
+  lang = "km";
+  sha256 = "09lmpxv3ljm7bhhnmj94dia7ldz4sdnf9v0cs7ia83iiaw008hc9";
+}
+{
+  lang = "kn";
+  sha256 = "0bzwbncgzf3mhp7f24r9wrf8ip6d5slmvvycmyicvpwfj61dcwsx";
+}
+{
+  lang = "ko";
+  sha256 = "0saxxrzvcsjjw4jascqk8vpr8lm7xq737vabhmsfqga0262h8wzl";
+}
+{
+  lang = "lt";
+  sha256 = "1fn6dbncqdgnwgrd58jcdbc9c474kyb397djxk5lcf9gmdq7634q";
+}
+{
+  lang = "lv";
+  sha256 = "0vml848hxynic4cg3w8zadmfxs7l0qqd7xb3c7kxznrqgkra7rqs";
+}
+{
+  lang = "ml";
+  sha256 = "1d77wb1d7lsmpv2vh8jzfi4y30bd5nn8ljlfx42yfdyw9drkbm38";
+}
+{
+  lang = "nb";
+  sha256 = "1mprsawqaqb6i2nhgbvq8hp1nmfwlxvd9chfx49xas7wk209jd25";
+}
+{
+  lang = "nds";
+  sha256 = "005i6vvq6s8c9spjx0is29jj9d0x4lm766njvsgsa0mrzgfps6w7";
+}
+{
+  lang = "nl";
+  sha256 = "0f0z2ql08pgdbqig67jjxk8p1bf6fk70br9nhmsk72k2lv7abb0y";
+}
+{
+  lang = "nn";
+  sha256 = "08ajabbzrng3gn56bl0wk15rd43pwlrd0crj7c4n8aq61qgz1c1p";
+}
+{
+  lang = "pa";
+  sha256 = "099d7fhk48c3vra7bcam89ffs86iw495vxycr3679ah1bfwf8k68";
+}
+{
+  lang = "pl";
+  sha256 = "1qf6bycvzz6p0lvvkpq2lwvjiln42xrq0qhjzcb7m8zs1zan47hi";
+}
+{
+  lang = "pt";
+  sha256 = "16726ggm87y3bvyhdpvvwcw6n5s8dw5bjw5kxpz7160iljabn71a";
+}
+{
+  lang = "pt_BR";
+  sha256 = "12fp3gf0iicwv426ni7n45rbxywrv4ni73c1ljw1lahfdhmhkxsv";
+}
+{
+  lang = "ro";
+  sha256 = "0bi25kmg7jcmz8c6xlqadzv5jr6kxx8z0pbbhgbh2nl6yfjw7fm9";
+}
+{
+  lang = "ru";
+  sha256 = "0g7ibrv5x9dlhawjcmd302yg4vql31675w7cnzjcpkc9sga3i764";
+}
+{
+  lang = "sk";
+  sha256 = "0jmndf6kxqhqgfiilzfzaf9hgq6c66ndcw1lc306kcw0qv90fm1s";
+}
+{
+  lang = "sl";
+  sha256 = "1lic93q78kq831pzgzmydy6x9fgzkyrwpl5958sjpvbf2dra1xmp";
+}
+{
+  lang = "sr";
+  sha256 = "0g9cdkq7lcm2gbgsk001ywpwjwbsi8xxv90cklifgxfvqnd351gw";
+}
+{
+  lang = "sv";
+  sha256 = "0l7xqyya76np43acq3hjgvcipz0acc2iwqmwjs2hgnhbs12fny2c";
+}
+{
+  lang = "th";
+  sha256 = "1pbjxng4p35zd2aw78x3z5ycil1diah39bknmdgpily5cd3g3bg8";
+}
+{
+  lang = "tr";
+  sha256 = "1spsr67k9wmcaypk0yzqg60qq6ynw4xfi3xcsdm2vkhgcc9rk8cl";
+}
+{
+  lang = "uk";
+  sha256 = "1jii27q1m0sj3vk7ly45m9zi49l4rkr2v05z8zzfbxi2gzg02kc1";
+}
+{
+  lang = "wa";
+  sha256 = "0mqpqpwj1qnzrqyd4lc0fkhj1r42p228kg2yyy6xn2xa4na8sg2w";
+}
+{
+  lang = "zh_CN";
+  sha256 = "0hx69djrd7nvm889b5ig2hjy73m0vhzxxj7njrh21y551pcj7s0q";
+}
+{
+  lang = "zh_TW";
+  sha256 = "1axpangs004scmhq35m22axg3v6rdpidndvr1i49cxf3bhgpqpqs";
+}
+]
diff --git a/pkgs/desktops/kde-4.5/pim-runtime45/default.nix b/pkgs/desktops/kde-4.5/pim-runtime45/default.nix
deleted file mode 100644
index c59521206283..000000000000
--- a/pkgs/desktops/kde-4.5/pim-runtime45/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake, kdelibs, qt4, kdepimlibs, akonadi, pkgconfig, boost, shared_mime_info, libxml2, shared_desktop_ontologies, soprano, strigi, automoc4, libxslt }:
-
-kde.package rec {
-	buildInputs = [ automoc4 cmake kdelibs qt4 kdepimlibs akonadi pkgconfig boost shared_mime_info shared_desktop_ontologies libxml2 soprano strigi libxslt ];
-
-  meta = {
-    description = "Runtime files for KDE PIM: akonadi agents etc.";
-    kde = rec {
-      name = "kdepim-runtime";
-      version = "4.4.93";
-      subdir = "kdepim/${version}/src/src";
-      stable = false;
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff b/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff
deleted file mode 100644
index 7c5ab9ef31b1..000000000000
--- a/pkgs/desktops/kde-4.5/pim45/boost-1.44.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/kleopatra/crypto/gui/newresultpage.cpp b/kleopatra/crypto/gui/newresultpage.cpp
-index 96d1cb2..5c7281a 100644
---- a/kleopatra/crypto/gui/newresultpage.cpp
-+++ b/kleopatra/crypto/gui/newresultpage.cpp
-@@ -40,6 +40,7 @@
- #include <crypto/taskcollection.h>
- 
- #include <utils/stl_util.h>
-+#include <boost/mem_fn.hpp>
- 
- #include <KLocalizedString>
- 
diff --git a/pkgs/desktops/kde-4.5/pim45/default.nix b/pkgs/desktops/kde-4.5/pim45/default.nix
deleted file mode 100644
index 1c390e4c8207..000000000000
--- a/pkgs/desktops/kde-4.5/pim45/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kde, automoc4, cmake, kdelibs, akonadi, kdepimlibs, boost, zlib, strigi,
-  shared_mime_info, soprano, grantlee, libassuan, perl, libxslt }:
-
-kde.package {
-  buildInputs = [ automoc4 cmake kdelibs akonadi kdepimlibs boost zlib strigi
-    shared_mime_info soprano grantlee libassuan perl libxslt ];
-
-  patches = [ ./boost-1.44.diff ];
-
-  meta = {
-    kde = rec {
-      name = "kdepim";
-      version = "4.4.93";
-      subdir = "kdepim/${version}/src/src";
-      stable = false;
-    };
-  };
-}