KDE-4.8.1

* Switch to .tar.xz.
* Update fixed-output derivations hashes.
* Add kde-base-artwork (ksplashx themes)

svn path=/nixpkgs/trunk/; revision=32874

13 files changed, 624 insertions, 577 deletions

diff --git a/pkgs/desktops/kde-4.8/default.nix b/pkgs/desktops/kde-4.8/default.nix
index 30c0505135a3..24485d30e0ca 100644
--- a/pkgs/desktops/kde-4.8/default.nix
+++ b/pkgs/desktops/kde-4.8/default.nix
@@ -1,7 +1,7 @@
 { callPackage, callPackageOrig, stdenv, qt48 }:
 
 let
-  release = "4.8.0";
+  release = "4.8.1";
 
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
diff --git a/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch b/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
new file mode 100644
index 000000000000..a7bdeacf9f5f
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/files/kde-base-artwork-nokde.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04d2142..294b9a8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++if(NOT DATA_INSTALL_DIR)
++  find_package(KDE4 REQUIRED)
++  include(KDE4Defaults)
++endif()
+ 
+ add_subdirectory( ksplashx-themes )
diff --git a/pkgs/desktops/kde-4.8/kde-base-artwork.nix b/pkgs/desktops/kde-4.8/kde-base-artwork.nix
new file mode 100644
index 000000000000..3a582c354892
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kde-base-artwork.nix
@@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+  buildNativeInputs = [ cmake ];
+
+  patches = [ ./files/kde-base-artwork-nokde.patch ];
+
+  cmakeFlags = "-DDATA_INSTALL_DIR=share";
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "2ab8942ba6813c21859077faa2c9fea88ec9a2d7af73bb5911cc4edbe1a04a04";
+
+  meta = {
+    description = "KDE KSplashx themes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix
deleted file mode 100644
index f2affd330958..000000000000
--- a/pkgs/desktops/kde-4.8/kde-package/4.8.0.nix
+++ /dev/null
@@ -1,299 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="analitza";value="080s52jr6qbag4v5z2yw6jps5r8am2vfw6g8lih7ipq2vhf9rzbp";}
-  {name="ark";value="1mvdalg45nn33bgfddqimv06b6l25ja0na2vvcfdmk1jxw7yzcr7";}
-  {name="blinken";value="0ajgh45y8p8db6yx36vrl6a81h7wylx074wv4lii28gqvgdb0qip";}
-  {name="cantor";value="16s03wjm7yz0fck754d1590g5n0nv4nsqf9da32nyjlivlp5vh9x";}
-  {name="filelight";value="1rsb5n3fx90f2ln2bxc7m2d6f7fg45f02ch0dapv2qkrzc2li4jf";}
-  {name="gwenview";value="1131nx5a95mshj55gqgixsh4lslk9rsl78pm98mydqsdqvlns8v0";}
-  {name="jovie";value="1bg64z3yxwi85pl0yimzbb7a7r9hjqpmplcjb6v3qp6mazymavin";}
-  {name="kaccessible";value="1dk9m2mmm553mx9jjmvg8qpvrkjzkbzy4gqk35yz33nkfdpcqdgb";}
-  {name="kactivities";value="1bk8prycvck4ad86d5pj77czrbwfl5s1a3iq7245i30wl0nkdpr6";}
-  {name="kalgebra";value="08azpq13wm8crgmwkvrhz77gzhywy6h079q36wffm1d0nr5r1f6x";}
-  {name="kalzium";value="00q8alp4kry9q21nf29w9mj19m4c108mdn3c8rfz55yyy6mkcr2p";}
-  {name="kamera";value="0lqw2zdc4vpdhgdg430b07gcd73kann4x054gbg3cgvrkjm2kw3x";}
-  {name="kanagram";value="0z37x65m8p01msl5zg3lqfzb09wali0wnl72rqr65rvzn2h52j08";}
-  {name="kate";value="01mqahcp0c7n90m734ky455nlrgciqg5ranp5bvffkw3zj0i6qx1";}
-  {name="kbruch";value="0z1602khvp1h1xc2d4vf6gxvr7slfq79n403gmqxy0a2qdnxdi8b";}
-  {name="kcalc";value="1q1j93ivq2p8dxz2lf9ylp3jh70136iy9l7n1k06y072kjamwcig";}
-  {name="kcharselect";value="0q67cngwyadks66a3imgw4iqkjinb7hdlgah0lx8gb2nn0pdk0n5";}
-  {name="kcolorchooser";value="0h909x9wiwlfk0bk5yjzdpd7x14rqbnz353svkraw54k1p73y4ga";}
-  {name="kdeadmin";value="1c23b54gia9829nblicys0vpb2lz3cya4s9h3637jsv0ksxql8jy";}
-  {name="kdeartwork";value="05bk1m8nz6m1px8fha82iwjs73yakjn5g0kmsplnxk2f8213r9v7";}
-  {name="kde-baseapps";value="1qrl4df3340iqshp54f2f2xqjzc87byvknjdhc9xx0npq8y8mn4w";}
-  {name="kdegames";value="1d0cw0ri9bcrk89ai1bx6cqw6jxa2f13bzf9qx8ychgcpmp7raqa";}
-  {name="kdegraphics-mobipocket";value="0mvqa4ln9gbpisqmdksmg3jizaxwwp3d45c97fg3pspybmj2mi4r";}
-  {name="kdegraphics-strigi-analyzer";value="1d6hf876ssql4zkvkwp34q73rd38c528i2xda35gd56rg9baszz9";}
-  {name="kdegraphics-thumbnailers";value="0arpazfah4v1db1bh1hf1qzv1mjgvgs9czm5bi8k28xsfm99yqzj";}
-  {name="kdelibs";value="17haj04m7af5xh92l5z6a42nscdgsw2cfkp50ikr6crqqr816967";}
-  {name="kdemultimedia";value="14678fbjban7yz89wqsrbyn050myh1py9d6d9811njvv1kjj56kb";}
-  {name="kdenetwork";value="1qyr9lx8hrw4dp27p72zwnhyiammiv69rydr2d9yajrl7b69ipz6";}
-  {name="kdepim";value="0n05hgzazc55s04kglv2bgjx1kri1pjf0rdy2y6lwfwqchzmnnz6";}
-  {name="kdepimlibs";value="0zl3pf7nhg21b999pbhhz3ppdr0n5y3gibws57r483zb9g6c8iq7";}
-  {name="kdepim-runtime";value="19whdvwjf56s2gq4ihvlxd761bvlzv8kagcvzdrhnrdapilf2l57";}
-  {name="kdeplasma-addons";value="0sq5mnzhnrzhlgw79mwr764gahqd1prj9gn41hxmlnmqd8mqfycw";}
-  {name="kde-runtime";value="0lx7qq78y8xlm3wmyms1zzj5z4wy1iw69pv1xknz6dnx5s3znx86";}
-  {name="kdesdk";value="0wy7li6agzbfhwza9zqbpfnmxigjilsf0cg47lnz9cc35k1ddq5r";}
-  {name="kdetoys";value="1rimzsjdj8ikvw97cjzdc7v6xcib7b9v7fvdff2rij6caqlqy9ha";}
-  {name="kde-wallpapers";value="0jf3fb33vlc1srwmyqhd19rjllyp4vjfs8hcp4yp1z6chf817x7m";}
-  {name="kdewebdev";value="0mssi6k2dxb2cszc43ffiw8n879ccyx0znr9lqvgn1xj6lbq0xd9";}
-  {name="kde-workspace";value="1vmv0kzh91lfa4kyvp111hf85fn2480rc4dhld26a7jck1arcsqi";}
-  {name="kdf";value="1ymaiy6mlq44c7cma4ka9214vb44sgd5qijhv8q6cc02i1n7pzij";}
-  {name="kfloppy";value="06jdskyfmcckyvmhh7h689j2pdrn10w3zafasssvibz9vs7ckk6h";}
-  {name="kgamma";value="18ywm3801vpi4lza5n23476irk3m3djf9cbya468kvs23m67604w";}
-  {name="kgeography";value="0dkb7riqbigak5bznfmq0l0pvacskcxjxwgnh2q9pzdsbax6g0y9";}
-  {name="kgpg";value="0b3pdv4xnlh6xg7vvr3vnzlcggrk8a9a8cq9lwwlzgjvhn2ljk7x";}
-  {name="khangman";value="0ykz88q3w527avjqq4zz9dbklkwhv3x52fk7x5bd352n3yvzc39g";}
-  {name="kig";value="0wkw2jngjc04g0ydc6rz6abnlqpi9l57yf9q6ad2xwavf8naawhh";}
-  {name="kimono";value="037l6d5g0zx7x52nd36rz9yylnpinpj7cgdw2laiczyq15r3w9wh";}
-  {name="kiten";value="0jnkw324plbp7h4ah75k98nai4vpw1nmsr4hg5cflzc2nqmvyigh";}
-  {name="klettres";value="0b9p5hlx3pk8h9p8z7y62mvx96k4blv73nmw7c7338apj0xk2xn7";}
-  {name="kmag";value="0hcy8y7y6w746p6ka30npsnmhwcr3s2263s7kspcm8k4xf43z51m";}
-  {name="kmousetool";value="1gqdsfzywj5iz8skn75nwa6gvzfzd4i3vma9c098pa508srachf8";}
-  {name="kmouth";value="1jijjpppr49za141fzq21bn7mgfp9z3vsyrrb8ik7v84zx4f46dk";}
-  {name="kmplot";value="0mzr4pf2z5j2b7af4rfrn5spzcb1nllk7zkn460izhmr5k59hrzl";}
-  {name="kolourpaint";value="1r2lcrfswm9mivmjwj37w9hkhl9zbmn7shrwl0xjgsdpkfqzd130";}
-  {name="konsole";value="1k1r85j72vbkxg0balj95d2b24gycbqlfp4632krkp98p27k9d3r";}
-  {name="korundum";value="1xy0gqms9fa0a48z1bwf0p6293q23fz4hyrm02b4c4bn08c2izp4";}
-  {name="kremotecontrol";value="05rmjq67bxssfyzc82ba1b77zv3nwmjyqf9qh43izj5vlf9cd0d5";}
-  {name="kross-interpreters";value="1dw5n6z29mlgc8x9za914ppd6f7maik9b61pn6m9b53rjcf3xx10";}
-  {name="kruler";value="1cw37khl676l1jqzm74bajdjzky0w43y4kidy7x5ycbm1bw1wqmj";}
-  {name="ksaneplugin";value="0vmamcmy8g9k63dm9vnbqhyjdalh8a0ypw8xc1wyanwnh3plvjxn";}
-  {name="ksecrets";value="0yb4dlg6spzgspg6ax9lhajzp201v5dblrldmbg0yja8w40vz4cb";}
-  {name="ksnapshot";value="0bwm48a22xm57zw0wznm9frslabzlrsl701krf4dggwvjgxjcz7f";}
-  {name="kstars";value="0swqj1pvlb2nmm8bfw00nna2m481545271hnpk5mhrmmxzmmdvs1";}
-  {name="ktimer";value="1isx067ccg5w95wlrs1z6xcc0qkdbr6ngi6i7qh7zb4f4v594gkg";}
-  {name="ktouch";value="1nggn0qw2wf86cgsy1hnk99f5zrfmw5x3gzwm9czpniyvh6w7yyv";}
-  {name="kturtle";value="0sb7pkx75i7dc0qg6kbb7hdjkfkkbbsadrvygk1rq5wmahh1piaw";}
-  {name="kwallet";value="0jizkaxa5y95h8fh07yfij89zw1jidr8ysgf71d8fmaswblqkv7f";}
-  {name="kwordquiz";value="02sdpr9jy738rhlmxllzpri1f6hmc9qb47fki8lb2wqiz5rr57j9";}
-  {name="libkdcraw";value="0xnb5ksydkvdcvagsfk5bksz2k2kwawjxl6v6pr0dld86d621051";}
-  {name="libkdeedu";value="11dnnfnxcc130qrmmr7kjafy2b91z3zh4k4sqsfq5v054kmr5vvc";}
-  {name="libkexiv2";value="1knn3igvpwc9knvb83yq2r05aax7pwv33khcjhhmxh55ms1kiz31";}
-  {name="libkipi";value="1pbrplwy8r58h04b96dil20a31bn14szz71siy1h3whn2qg3hda4";}
-  {name="libksane";value="19r6lnr92yp3v0w9rplggyfrnw19k1x2nwsvv7rhapwxqpqszpks";}
-  {name="marble";value="0bkihnkmzwqgq0fghb0qilhw2j66kkbal0nds0h4zgjml2mvf4kk";}
-  {name="okular";value="0hzj4rn9vdisq2v6lka6986slcb04h7s3svrgk9mh56l062vavsd";}
-  {name="oxygen-icons";value="1jwb95zscvqrj6g7a8kmzzywyq72wwldkkkf0klwczpd6kclzbf0";}
-  {name="parley";value="0ja3fahwc0dpfnabvpa1gsqqwqdb72wbvnl79m1asd7f7hlj9s1v";}
-  {name="perlkde";value="1nsaqp3pyyf8lpnnqw28h3gsg1f0dgbf1cavl1k00w997v6ih1k9";}
-  {name="perlqt";value="082fn1bgj5ws1df8ixnxj7z4n4x5b1mn8wfkszr33wgf9jf9sa7s";}
-  {name="printer-applet";value="0sx0rly7rlnvd6hcrnh8yn35r4vpx8lkvlfgjkqp5bksm3bc3ybd";}
-  {name="pykde4";value="1b00xswl5ixi84dk3c2c4wn4cywpj0bgmg57mhilq23r9dp38dwl";}
-  {name="qtruby";value="00qqhv2l7ad4qm2rwf7iw4f2vgz3slxvlmzsz1wd7j6m1z5n2zqr";}
-  {name="qyoto";value="0nhw0l0gn08h6fp3msfn5iq2q49pkmfi611a11nw1n3057ppiis0";}
-  {name="rocs";value="09a9jgb2088xp1z150zjr36nzsrxgzkqhvy2rxq8qj0ls7m2mcnn";}
-  {name="smokegen";value="1wp7kq7j3vgrnzj4g8fqmmhdg1nkkprnm6g25sn9zw9s0f4228l1";}
-  {name="smokekde";value="17sb2fpb84s15pza92ah3g1cbjyxjjpxb6ni2qjpin45llwdpz06";}
-  {name="smokeqt";value="0zdckhi52hjd5ajlzaas8ykcm5qh5yp48vrdh4cwvj8sv32bhbgd";}
-  {name="step";value="1ai50fc75ahbzac7ssvwhz81wg75w755pxx2w68ibplrw1qihrsh";}
-  {name="superkaramba";value="0gqg2g1h9h16wsfmw7875njdj2p0n51p03d0x10i2zajf9d34hhp";}
-  {name="svgpart";value="09zsdz69n08ifkq8f27av360zky4qpvrn234xnbyq48y0dcvjv2f";}
-  {name="sweeper";value="1wajv5jnx1nbckg6zrqy0imdrb8hb4nfb6xg2fs9rqx942c0bhzz";}
-];
-modules=[
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="gwenview";  }
-    { name="kamera";  }
-    { name="kcolorchooser";  }
-    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
-    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
-    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
-    { name="kgamma";  }
-    { name="kolourpaint";  }
-    { name="kruler";  }
-    { name="ksaneplugin";  }
-    { name="ksnapshot";  }
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="libkipi";  }
-    { name="libksane";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ksecrets";  }
-    { name="ktimer";  }
-    { name="kwallet";  }
-    { name="printer-applet"; sane="printer_applet"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="blinken";  }
-    { name="cantor";  }
-    { name="kalgebra";  }
-    { name="kalzium";  }
-    { name="kanagram";  }
-    { name="kbruch";  }
-    { name="kgeography";  }
-    { name="khangman";  }
-    { name="kig";  }
-    { name="kiten";  }
-    { name="klettres";  }
-    { name="kmplot";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdebindings";
-  split=true;
-  pkgs=[
-    { name="kimono";  }
-    { name="korundum";  }
-    { name="kross-interpreters"; sane="kross_interpreters"; }
-    { name="perlkde";  }
-    { name="perlqt";  }
-    { name="pykde4";  }
-    { name="qtruby";  }
-    { name="qyoto";  }
-    { name="smokegen";  }
-    { name="smokekde";  }
-    { name="smokeqt";  }
-  ];
-}
-{
-  module="kdeaccessibility";
-  split=true;
-  pkgs=[
-    { name="jovie";  }
-    { name="kaccessible";  }
-    { name="kmag";  }
-    { name="kmousetool";  }
-    { name="kmouth";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-    { name="konsole";  }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeadmin";  split=false;
-  pkgs=[
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kuser"; }
-    { name="kcron"; }
-    { name="ksystemlog"; }
-    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
-  ];
-
-}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="sounds"; }
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-    { name="aurorae"; }
-  ];
-
-}
-{ module="kdegames";  split=false;}
-{ module="kdelibs";  split=false;}
-{ module="kdemultimedia";  split=false;}
-{ module="kdenetwork";  split=false;
-  pkgs=[
-    { name="kfile-plugins"; sane="kfile_plugins";}
-    { name="kget"; }
-    { name="kopete"; }
-    { name="krdc"; }
-    { name="kppp"; }
-    { name="krfb"; }
-    { name="kdnssd"; }
-    { name="filesharing"; }
-  ];
-
-}
-{ module="kdepim";  split=false;}
-{ module="kdepimlibs";  split=false;}
-{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
-{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
-{ module="kde-runtime"; sane="kde_runtime"; split=false;}
-{ module="kdesdk";  split=false;
-  pkgs=[
-    { name="cervisia"; }
-    { name="lokalize"; }
-    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
-    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
-    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
-    { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
-    { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
-    { name="kcachegrind"; }
-    { name="kapptemplate"; }
-    { name="kpartloader"; }
-    { name="strigi-analyzer"; sane="strigi_analyzer";}
-    { name="kioslave"; }
-    { name="okteta"; }
-    { name="kmtrace"; }
-    { name="kompare"; }
-    { name="kprofilemethod"; }
-    { name="kstartperf"; }
-    { name="kuiviewer"; }
-    { name="poxml"; }
-    { name="scripts"; }
-    { name="umbrello"; }
-  ];
-
-}
-{ module="kdetoys";  split=false;
-  pkgs=[
-    { name="kteatime"; }
-    { name="ktux"; }
-    { name="amor"; }
-  ];
-
-}
-{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
-{ module="kdewebdev";  split=false;
-  pkgs=[
-    { name="klinkstatus"; }
-    { name="kfilereplace"; }
-    { name="kimagemapeditor"; }
-    { name="kommander"; }
-  ];
-
-}
-{ module="kde-workspace"; sane="kde_workspace"; split=false;}
-{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
-];
-}
diff --git a/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix b/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix
new file mode 100644
index 000000000000..42dadd9e434d
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/kde-package/4.8.1.nix
@@ -0,0 +1,301 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="analitza";value="0hz8bryfxbf0ri0572drf79v582pjbhyag076nr7k80cbsvgcb95";}
+  {name="ark";value="1l5jrhj303fcbn34zpgcczajaknrj3ynqqw1kfsdz2jzan7pi620";}
+  {name="blinken";value="04dk6kdigmbaysi3q5f6qgy1aqigflf465np5waav9ydm6yfx9xr";}
+  {name="cantor";value="0gz338d5vi89i9c6r8lcrkvm3a0fi7kjfp5ql530p70rmyj0h4g5";}
+  {name="filelight";value="0fqxpx7zm6x601ph1n46mamwpgiffbkv5vqyy06z5cb6hbhip3g5";}
+  {name="gwenview";value="0f1knjmg2k5g0nikz4jxhf5d8ipp6qc6aw34yi0zanyg3h3jicql";}
+  {name="jovie";value="116yr8hhc18fl176lv8pqz1qjah7rlzavx7kcxq6ghvmaiv0yfxr";}
+  {name="kaccessible";value="167x5cmzspsriim8162lf361xs3g9ancfy88arwlvp5kwrs61ply";}
+  {name="kactivities";value="04sz2rjs15p2yhi9wchdkiclcc4pgd3bpsi20kcnnn5jwx2rvgim";}
+  {name="kalgebra";value="11fisig1zay8kb2i4sr4sba7889np3qbg46l823a89v7rwm6qc32";}
+  {name="kalzium";value="0n63s85y3ddr93wiyhhrfg3h2nv68f7rzfxdd200y0gjrkfb1yxs";}
+  {name="kamera";value="1fv1zr5zfs68yd09lg2gapha9cjh7lljvyrrcmhyn7yjkz2kn7r0";}
+  {name="kanagram";value="00h9ljx518sp950wc8h40c2qn1xh3499isy8hm1danal1y3m3n2v";}
+  {name="kate";value="0d35mydj6fzzjzk2qm6amlpb6hdg46cf1iqp52fj7d3i7vhwvzz7";}
+  {name="kbruch";value="1d9n2pbimkq56a0sc1khh8zvnaf84c1r9s96qs71nv93ka3248qw";}
+  {name="kcalc";value="11bailcjvlx7ggjj7jahh3l1p85w7s3wp1001cchm36qdmisbhyg";}
+  {name="kcharselect";value="10fzkh142b7k5rvar200zzpds6pgjbz3rapa7l8hcxpcgb9fxqvf";}
+  {name="kcolorchooser";value="04h8g2g47780jcrbnwdjivgkxb6sabqr2hr57dlycw7lsmxfj2v3";}
+  {name="kdeadmin";value="11fndxajknxwsshrmxa4hsbx8ycysbcq8kc4p0zqq508s9z0p4wf";}
+  {name="kdeartwork";value="0g3s1cn9w0mkrcwg8f6qc3v8iy3qxf1mkj8jaqdh98c7k8q906m9";}
+  {name="kde-baseapps";value="0gdfiw6bjhijvp8jf5ny8979km0fabjs6jp8fqdqnb0ybc6yi3sh";}
+  {name="kde-base-artwork";value="0qd1yc1g8wzi01hmrwfbyp80drk42k3h5g46hzk3y81pb3gg5490";}
+  {name="kdegames";value="0jbvr9baspdh7z9gxjhbz316097c99wkvhiniwx8wfbrj3nfsvkx";}
+  {name="kdegraphics-mobipocket";value="03gx1y9xdrc5imbc5hb3r17i693vgfcix4slm8i7xs7fz3f9x6jx";}
+  {name="kdegraphics-strigi-analyzer";value="0g674b0ba0bmgnaq8qspasbw40r7i60s0n27imh3f46isj34w0d2";}
+  {name="kdegraphics-thumbnailers";value="01a79779hjv19q3fxmwr05flcz75fpmivjysv3bj32jz72f4fk79";}
+  {name="kdelibs";value="1v2zkj76bf62fl3ykzx6r24c37amf2a8v1qrvhi2ibq7g7nfnasa";}
+  {name="kdemultimedia";value="0656135yq3d9j9hc974bm6zqszcq3prllhk7dfxd9wxkyf1jbifq";}
+  {name="kdenetwork";value="00f9284y2rb0b0f8j9a17kn8i1k7zdm8nypxf6hg51zphn91hnib";}
+  {name="kdepim";value="0fvvnab971k2a9gaavf17k7hvvz4n6dyrx9q0w9af821pf77asbm";}
+  {name="kdepimlibs";value="1jzw9ad5bzhcpfjgmqfzk8hjj8g6ivm7y31psckhgcasni7lv4hx";}
+  {name="kdepim-runtime";value="1k0hnmg73i02f5pddpva47mnfnnl9ydsdycnb4kaslyv8lzb7p19";}
+  {name="kdeplasma-addons";value="178y3h8j1nn0j421rp49b9q7jphhhrqd37y4jcisx37lky8dgdmb";}
+  {name="kde-runtime";value="06y5g7vfwdfin6xyia0j5flk5bbwa82ki3lnaz9zz4sz0x8swb8z";}
+  {name="kdesdk";value="1q4rcm7zagam44dr07mjr08drmncfk1w50kia159kgsx74n0rsqp";}
+  {name="kdetoys";value="0i49zvq2h2md4xmbzbw9s23yd3y7vmbp6y7b121j1pv9v8jkpa8c";}
+  {name="kde-wallpapers";value="131j2217c50addi02qldyx83y8afxwqaazldmvbfbk5ampkszkwr";}
+  {name="kdewebdev";value="1yjibwk4nihrwzbcz8bmylx0paprklgxkky9iy86pp20a4ndzy2x";}
+  {name="kde-workspace";value="1czlxxnldarp45yl2n5yin298rs8zdwjl9bzm55l5x27xaw5zlfq";}
+  {name="kdf";value="1gs57qnrhnxq8xbypn9dp8rpk9xz1rv29d4l0n23fbnhfw42fzw9";}
+  {name="kfloppy";value="09v7zv0s93qmir3vlkh4vf45v11k92jd6cv6j14hmgx3lpr289yj";}
+  {name="kgamma";value="169d2rjk45zr1a58fnn81myydzj1pjxjfglk3lyd9g21mwka8nng";}
+  {name="kgeography";value="087cz0wm2pfrh803kc8a0hh6nhk82w42fchpll0bv953adqi2dww";}
+  {name="kgpg";value="1mghmnjpy8jzzp43bg6z1nqlyir22wsa2nz7bpzigc1zv7i85pf9";}
+  {name="khangman";value="11m1s9rzlvg5p7wzy1zlgm3f743k4m7jfwv08g82mk3k9dcqnbq7";}
+  {name="kig";value="1kd042d7v56daxjwvvi026kh3bi7p8prxf5a3rpdmnbr2awd8qb6";}
+  {name="kimono";value="00vif9dmlp1lmv3fyjacd4jp8w84kq3fxsmsv72fbvxs66pa3a9y";}
+  {name="kiten";value="0xl1pqb5la2cnpi39npyal65yrqf87nqkxcbxli4ynw37k1x95pm";}
+  {name="klettres";value="0g1wryfhbaphmhkj3nisfgadray1nnrn3m1fd5rq774rhk7rnlfr";}
+  {name="kmag";value="12cfx5mj22lwbqnmd8sbjyfxxmgnql4q2hmgj4hx7izfl91zw4fb";}
+  {name="kmousetool";value="0ynr2zdxmisvs1jancisc0a2djap345b2bhp8dpssx48pxbf72r0";}
+  {name="kmouth";value="06wnsgrirdnk9h2vdxhfkcvf950hhryzg8qmwpm4pg53gsqfm3sb";}
+  {name="kmplot";value="0yr7mgcbr54djk521g5mxj87slps41473rfmf8hv0rbymnv5qfmf";}
+  {name="kolourpaint";value="148sp5bzkrlaq6mnh4996zm52m0jncbrldd93qkpbms1b0qpx0fk";}
+  {name="konsole";value="1lcj9bbfmyw2bv9cvhfsv9fk3szgvd2kmmrxsf3r1hcb6a1x3ab5";}
+  {name="korundum";value="0dfkl5wya041yrq9zhbrfklzlc41kp19icn34bjsgin4gfw2bds1";}
+  {name="kremotecontrol";value="05pzq3n5a75ccdznrw93ic0gadh24r9bjl9cdz8caj1skhyyzqcg";}
+  {name="kross-interpreters";value="1ix67rcyxqyaacfkmx3nccy2pyirsx0ykc4lycjhv5d7zlc2682c";}
+  {name="kruler";value="1k73wm2lca3p9x504il73sk5k21fm8f57m5a8d46cp5xh3hcyz54";}
+  {name="ksaneplugin";value="1zwmzl4bqmjnvbapcdy60avydgbidrhr87q4cb79wbqbif8g3941";}
+  {name="ksecrets";value="1b4ld8snnw42yg54sndlrv9j1rjryxlsbx6pdjwsrg35x4cf3l8x";}
+  {name="ksnapshot";value="1c64igffxz9lgl6izqxi9j5ahpcl34gm06i5bz42mwgwffsyqdkk";}
+  {name="kstars";value="0ids1mpscvrcdjjns6pvishr16ack160q6bp628sw53gx6f0cf3i";}
+  {name="ktimer";value="0zqwnjpql6qan6z2dlb9y3irs3785cnav6zcpnxrgi0i5n0v4kyx";}
+  {name="ktouch";value="0r050awybjz5cjcjy8ivj0h8f95m1mqqcrvpg0gk07fphs68i2na";}
+  {name="kturtle";value="0bdyyf0dfwmqc42d7xx82bkaygj2znzxbidwfza1w9lzizsmmkqv";}
+  {name="kwallet";value="1jpxalr8k2mydias4xgifacswy8f6ma4dcf2kpx49sq7hlnx4rdi";}
+  {name="kwordquiz";value="1zi6pkn55cf62f8bmhfdxpykxk2hcl5bc9zqcp2gcapg5ap58gj8";}
+  {name="libkdcraw";value="0imyxfppk75zf97p8y7mnzx40vg7wbdqf6qlp1m9yraz4ply9bf1";}
+  {name="libkdeedu";value="19x0hajs82kimm8i80vxdzz5xkdhhv2vjnv1anx1nkb9fpgmz22y";}
+  {name="libkexiv2";value="020k8lbh4ad67ybfj5hvbpb0qp6kcwq4yb63as2hgvpvajny0rzr";}
+  {name="libkipi";value="040wsm35sbbfkdp9yak496w6h2wc3mswab17240c3xl7mbfx405h";}
+  {name="libksane";value="15cf360jxd27098g7rx7g2rnd3ffpbrj8flkn1913ibccbc44kvn";}
+  {name="marble";value="0kpln6nhyv6vvy2x64lr4dmf7scvq4k8i6f60flyrc0vll51w0xv";}
+  {name="okular";value="0jgg6ar1b9zahh1cgkz0yksxq55vjyflp8xc6m9fy0diw4cjhi2i";}
+  {name="oxygen-icons";value="045fh2609fyn8q22r0w14xa3b0ji9k1xkhh2yb25nnjyh3b10a8w";}
+  {name="parley";value="00ab2xvmlxzn4rdbnp56yf3jsx02rjxf9f6m4516sb5dgf0gmsvq";}
+  {name="perlkde";value="138hq7njf9394564addslwy1zibmy7pnsj3ckzwhacab4497pyj4";}
+  {name="perlqt";value="0lrdf2gl8kw3rkyhy1a1fwnazpziai57w3k1nr0bv1g7s49ri84r";}
+  {name="printer-applet";value="00c5nh6rm3ixfqn1ahb2hcdijnkdrj2381m1m9l4vxikdchb6whl";}
+  {name="pykde4";value="087srnqva1kqmgqvsyc54yr8i19xaxl1ax7w6acdk00bz0pyw76i";}
+  {name="qtruby";value="0imy1afh0w5rx97cxcp4bg2h95wn687sj7dlm09nd6hrpr31ivqd";}
+  {name="qyoto";value="1gndimc95s6b6m2bgh3z7pwb9p9jlj8z7sypz72py9aza5hkxiyn";}
+  {name="rocs";value="13gj83a4j202f0980v3ihlw3w5w4f5xh610plc5fnnba5csrpil4";}
+  {name="smokegen";value="08jz7v86lr6n743cr1ig9lb05wq9f0fyrrgwnn9wzmnfyrlqny0z";}
+  {name="smokekde";value="1z6hwkv6c5kx12gzi2kld2596az8gyc1aw83091bkkcj7885sai3";}
+  {name="smokeqt";value="0s3dz9vyhkazd68j9185rgjk3rkwgdfg53pxq10fqldv7pavw230";}
+  {name="step";value="0xgv7cbs540sk18915v3m4hq09j8j844briic5wy7mgn46gwlycc";}
+  {name="superkaramba";value="0gck0v9nrg4040w011yhwpj282kkhk2mwdwd0vkgl4760qqfgr2j";}
+  {name="svgpart";value="1yzrniz0h36v9xw0nglylv043gzlzcm7zzcv7j4p9faicl154vb8";}
+  {name="sweeper";value="1xyg2qwmwi5jajijamavgq7qqb52iphg6xad3y5r7i52172j7am1";}
+];
+modules=[
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ksecrets";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="printer-applet"; sane="printer_applet"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+    { name="konsole";  }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeadmin";  split=false;
+  pkgs=[
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kuser"; }
+    { name="kcron"; }
+    { name="ksystemlog"; }
+    { name="system-config-printer-kde"; sane="system_config_printer_kde";}
+  ];
+
+}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="sounds"; }
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+    { name="aurorae"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdegames";  split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdemultimedia";  split=false;}
+{ module="kdenetwork";  split=false;
+  pkgs=[
+    { name="kfile-plugins"; sane="kfile_plugins";}
+    { name="kget"; }
+    { name="kopete"; }
+    { name="krdc"; }
+    { name="kppp"; }
+    { name="krfb"; }
+    { name="kdnssd"; }
+    { name="filesharing"; }
+  ];
+
+}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kdesdk";  split=false;
+  pkgs=[
+    { name="cervisia"; }
+    { name="lokalize"; }
+    { name="kdeaccounts-plugin"; sane="kdeaccounts_plugin";}
+    { name="dolphin-plugins-svn"; sane="dolphin_plugins_svn";subdir="dolphin-plugins/svn"; }
+    { name="dolphin-plugins-git"; sane="dolphin_plugins_git";subdir="dolphin-plugins/git"; }
+    { name="dolphin-plugins-hg"; sane="dolphin_plugins_hg";subdir="dolphin-plugins/hg"; }
+    { name="dolphin-plugins-bazaar"; sane="dolphin_plugins_bazaar";subdir="dolphin-plugins/bazaar"; }
+    { name="kcachegrind"; }
+    { name="kapptemplate"; }
+    { name="kpartloader"; }
+    { name="strigi-analyzer"; sane="strigi_analyzer";}
+    { name="kioslave"; }
+    { name="okteta"; }
+    { name="kmtrace"; }
+    { name="kompare"; }
+    { name="kprofilemethod"; }
+    { name="kstartperf"; }
+    { name="kuiviewer"; }
+    { name="poxml"; }
+    { name="scripts"; }
+    { name="umbrello"; }
+  ];
+
+}
+{ module="kdetoys";  split=false;
+  pkgs=[
+    { name="kteatime"; }
+    { name="ktux"; }
+    { name="amor"; }
+  ];
+
+}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
diff --git a/pkgs/desktops/kde-4.8/kde-package/default.nix b/pkgs/desktops/kde-4.8/kde-package/default.nix
index 38713de5820a..da6440b58faf 100644
--- a/pkgs/desktops/kde-4.8/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.8/kde-package/default.nix
@@ -12,7 +12,7 @@ rec {
   # src attribute for $name tarball
   kdesrc = name: fetchurl {
     url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${release}.tar.bz2";
+      + "stable/${release}/src/${name}-${release}.tar.xz";
     sha256 = getAttr name manifest.hashes;
   };
 
@@ -37,7 +37,7 @@ rec {
   # API.
   kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
 
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.bz2
+  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
   kdeSubdirPkg = module:
     {name, subdir ? name, sane ? name}:
     let name_ = name; in
diff --git a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
index ef8189cb7c53..e964ce3ddc11 100755
--- a/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.8/kde-package/kde-manifest.sh
@@ -11,8 +11,8 @@ if [[ ! -d "${dir}" ]]; then
   exit 1
 fi
 
-release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
+release=$(ls "${dir}"/kdelibs-*.tar.xz | \
+  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
 
 if [[ ${release##*.} -gt 50 ]]; then
   stable="false"
@@ -45,8 +45,8 @@ print_sane() {
   fi
 }
 
-for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do
-  package=${i%-${release}.tar.bz2}
+for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
+  package=${i%-${release}.tar.xz}
   packages+=( "$package" )
   echo -n "${package}.. " >&2
   hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
@@ -99,7 +99,7 @@ print_mono_module(){
   echo -n "$1 ... " >&2
   echo -n " split=false;"
   cml="$1-$release/CMakeLists.txt"
-  tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
+  tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
   if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
     if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
       echo " is monolithic (has unconditionally added subdirs)" >&2
diff --git a/pkgs/desktops/kde-4.8/kde-wallpapers.nix b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
index 5de0caf4ba9e..1cec814b81e1 100644
--- a/pkgs/desktops/kde-4.8/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.8/kde-wallpapers.nix
@@ -9,7 +9,7 @@ kde {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "208ebe74f3ffc83fc51cd1197ceb2c5b8b8de8f33fab86b760bfc41d31c2aab6";
+  outputHash = "326b19180e1a03c9fbf5e99f1a3ee6d4dfd0bd6fde5c0ef4b7a5608b20e75a5f";
 
   meta = {
     description = "Wallpapers for KDE";
diff --git a/pkgs/desktops/kde-4.8/l10n/default.nix b/pkgs/desktops/kde-4.8/l10n/default.nix
index 69cfdcf8ab22..57d41fb35bf4 100644
--- a/pkgs/desktops/kde-4.8/l10n/default.nix
+++ b/pkgs/desktops/kde-4.8/l10n/default.nix
@@ -11,8 +11,8 @@ let
       name = "kde-l10n-${saneName}-${release}";
 
       src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.bz2";
-        name = "${name}.tar.bz2";
+        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
+        name = "${name}.tar.xz";
         inherit sha256;
       };
 
diff --git a/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
index cc0eec20aaaf..ec159a1e2047 100755
--- a/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
+++ b/pkgs/desktops/kde-4.8/l10n/l10n-manifest.sh
@@ -10,15 +10,15 @@ if [[ ! -d "${dir}" ]]; then
   exit 1
 fi
 
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.bz2 | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.bz2//')
+release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
+	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
 
 echo "Detected release ${release}" >&2
 
 exec > "manifest-${release}.nix"
 echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.bz2`; do
-  lang=${i%-${release}.tar.bz2}
+for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
+  lang=${i%-${release}.tar.xz}
   lang=${lang#kde-l10n-}
   echo -n "${lang}.. " >&2
   hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
deleted file mode 100644
index 8fc2bf8be941..000000000000
--- a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.0.nix
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1payn79mk0xw6laj3l9zymh3a72yhssid4wxw2sg8wqq1557cd1f";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "01k26c2shw2xxhfgllljqcvrgib6935dbrimrbix7snwdxdip23b";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "05vfkzqqm6sz0021rh8qhn3345fmcswlilnkdk23kjsb722v0m47";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "1ac7y69877yisfcz863w5l4ypiwp3dxip08myfwq631a2qhplwir";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0qj5r4gs1bm2hzds8gq3dzai7h7fw6dw8mssw14g2yb2w833ag6h";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0rh0pivdiybp6n20dyhdrcwc6q3xmmv4i83x64qnxsxdh3yxcysv";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "04ylcybr3vpk4vja33iq9ysnljdndvk62vvs35rmvb48sqc02gbr";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1rz1qvy7n3p78idpw8kah991r5rs1hgdlr4kh4pfdk31qng6mdhi";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "19hhw9csh59hh7ax1g9yi2bqqv712xyirklaxq8j5225xxva6xhx";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "08rwnn4bbp3hhj6fw1n1jdm8b3k72wk14qib2jdmwra2n514i9y2";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "098nsrsc7s77kkjh6cai7nkw6h0cz10gd5aa6hfqnafc42zjj7jv";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1avv6xvpqcc1q9k3xcszpknbshkcd1gbmx9nrx2a242jkkgbqcm5";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "14wqf7bfrhmkknrzdn8725rhlphp2czzf65rc7wfsqj3nk0s8iys";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "1w3zlf70a9hcwkyv8jc2jr7ddlq1bjbbswrw6qaincpk5qpr9lqc";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1gwjbx31z3g7p3am003bll763d1jjvz8k3w7k318x18nbsj5nl2h";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "0a4yfz5c6pnscq5810jirfl0r0asid1fb4bsyh356rbhfqvx3cf8";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "1214wmwccg6k97c3q5rnazggjv77mq640wwv23xv3lzyiqxq7h45";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "0s1wjymdprn56pd311cb6g14kfngnqnbcar8yqn93mgcdxrl6s61";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1bw997jypbc2rz2wnlvcw9lk6l6kybiivkq6sk4h7kil9xklam2j";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "086sx9dak8npi5nmiyq0npqc9kj5gaijc98bml42q1p0fg92b1wv";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "10x59w6ac2bnz7jgypjk98q80bwnwlix18pz9v0xnhw6z5c71bmg";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "0znwyagr8xarw3kjybgpzgxgk7dzc1sqvv128g3l5vdf5cn6ab3p";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "0w6nwpq0wxglzspswhiv0y6rjvmcg9c3wsiagjqr0ys2ln1kifp5";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "0d6fhgnzpapb1axnan7jlsyln0ajv9c08zy56mvcgvnprj92ixjh";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1f9ys9slbf6n56g29pxi4a2kl8fp8bgfg9r4n4ygxy6mnl2wggn6";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "033jyrjfywwg1mibcwbflhblbv17kc9mi6wbyajgnhrypaxdplmn";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "1w3dxprfdrp4b2ar61jvbgngjm85nwy5jprjmqjzqb74pj9wvnnf";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1vmx35g9w6zf6pp6s7k10bmil6hppms4h54647dz27mlqq6kfi8a";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0mmhmw4fsaxx44bs1g903cfcn854gqm509j2fiman8mz58nsd8jn";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "06gmdcxm0cl4yv39xyhz8nkrj2hbiryx2zb5b7zmyq6l94vmbp83";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0yagn8bragyqp38186mla31farrd26q77vm4zmhqfrvzbaiaal0c";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "073cgksqp8gxvscg6v7gkf4rd4va3cqslwssbzdzark3lrm7flkw";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "0dwvr0779dg380dv2a4613074gk1pqbiv6q8drawgj8asaa54yg2";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "1z10wi3grj7y2a1lyjc9xvadrfm6b3ydgy827183mp3qfd6r0jd1";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0mzbfizgykq20vqq7b1wna3jhvl73qgr2n11f9mjysj5g592mqnm";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "1bg0p2czkmx2rwznbwqq3w16xdp09k0jajpw2jwpdz84z1y4c4pz";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "12zzxsdzb80gs671k8dfw84yb7c1pli2jwh1hncr6ajwbckd4q6c";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "1rzm8y722jp5z8xlms5gv1qsybix0vyfvn5fv18zxkiaidiyzlfh";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1bbz8ixlhywnfm50dm91ykn13mf0gr1c46rj8pmzxqlg2klidm5n";
-}
-{
-  lang = "si";
-  saneName = "si";
-  sha256 = "06763cbbw4bh3y6lx01s6gl4yr4jlgrw73qdxjw30r45hqybblx6";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1wgzkjq3pmmrs8d7q2b4wkxkyaylypk25i6h6pi7ly5im1fj0zf3";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "17zmirf67am4730yf1x1kidaylsl89frziiw8jzf42z88qc63x8x";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0yg8x6syad3g2j0nlgcb3ypp26l9m1n7wpxgyhnbhb07w3gmvwf1";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "0a9qil6m5fmbi5x8h2nwj6al0awclk77zgpiz0njv9vdsiylbwzf";
-}
-{
-  lang = "tg";
-  saneName = "tg";
-  sha256 = "0h62wnhc4m6j33r0w6wx5fkwdacd3y1mz6s047jinzzzvyk6zy4p";
-}
-{
-  lang = "th";
-  saneName = "th";
-  sha256 = "0c23p15rbpg8lmcas61d67cpvsx0rcb9s5nccy0jr9gs2bh7i02i";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "1wddr9zr0fz4g3d80xdk1y7s60yrb700gkw4689m6cn07drixhcr";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "1k1fg6ymsyb86jzq9pdy77v568pvr9kykdmvjy159qripyr5gyjq";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "02zqwgjksb7cxsqxwd7fgagza1skjikipknwxaylhb9qc5s5dd2r";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "084nak660wcqnvfg3zw2pgglpzwkc1mryd575y3xq11a6aqyrwqi";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "0c18dhjfp72br8ayrn095201ajnk8zbr1cqyni0qmis387w746b7";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "04n6zljl3yb8fb5lyz4v30ki8h7k7iic0wz05cmfnc8w5x5zdfxy";
-}
-]
diff --git a/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix
new file mode 100644
index 000000000000..a9b64d215617
--- /dev/null
+++ b/pkgs/desktops/kde-4.8/l10n/manifest-4.8.1.nix
@@ -0,0 +1,277 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "0yzirmv6275479xifhipajdrmnf85xlb7nr00b9r73ghz5y9i8la";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "14fkmr0ixnrn4v2xs3hffiipk4dfdw2c2nyldlljlls3wim9kg5k";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "11f2n5rb5vq64lj2w913xkfvbw0rn31nnf1bpaywd86jh4sr4h6v";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "1c2j18gjlj778f97k44xk1pnxx696gsmlqjjsmanw9r0jnbkvp6z";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1zhpbk2bdw40hss80zfnhq3ml9s9hlyayg6gsqg1jqwkfjxy0fdi";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "04jpi5lhx5lj15vxlh22g08zjqwzp7fjj2hy84axjm2q57vmgxfh";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "14qivzzhzv5z7yc3l8xvhwvspn1834r6zvf7pfiqmb4anhf3k26q";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1l2s1yzi58f6nixw86k0rg0irpj786hcb07q3b1n7p991a0x34ij";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "044r8c0w3avcfb7wl7v8zaw05hyvif9cdp482fwrggg6v61fz0h6";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "15z1w8vkfq19z6wyi0zlbbh4ysv66jf74y68qz544d6riqzj61ii";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "1154wmjcgasvh48cli8zdbf1bqk9w3jvrq12g03jdr66mqgs2fry";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0yww5pa7bm0fdcai1w1jrfvcwjcrzw0yp2r5vxggwlwjlslahzsp";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1xrd91d0k14mk826a6277sghbaji2lr7yjlggbjshh59qrwnmm5f";
+}
+{
+  lang = "fa";
+  saneName = "fa";
+  sha256 = "0zy0slm6zn3b3zhvygfac0cnsgnc3bfx4wzd0rdiy2270idkvk9s";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "1nazarjvf7w1pvwca9igsp0w1fa2qgk2h45rrm4vpq05r2j9pd16";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1b17lbjqaflz21ciijs4d2dr8r2jc781yf62gk6pgw3r91wd9gla";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "1wq67fi3r09ymz95pxc5nrjs01kdf7xlb2z11snzvjfbpyxg0fpp";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "046kvzqgxs2phgrdx736ydv4q9jc594hb32lj2qaysm378w67hz3";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1ywfd2fv806v4ilin3b99rcajwsczbmghl8y152nkyza8vak33rv";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "0r77sh2s5kvh7pb1v7fvl8cxckx7jh8i46lrrli6hyvfi8gwdzl0";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "0jjm1kl2lc2pdyhyxz6jljsbdc8b6msyp01bwyldgd9pannrixfi";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "0sl28a39v9gb7fj7rfyrn2wqn41l7q1zzfkhgjac273wb9cwisfq";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "0whbnl3rglv9bwp4x2f6p8v6w0ns87l6fkz74qgwqq9xf5h7cq8w";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "0951lcd6if6ylwx2gpq0kg08134g02wfnwpvi9w7jsxia6c3byv9";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "0radqz2nicji3sm2nhr9sy250s015vccx7g1k6zz30qfs6v7d081";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0n5hhq0h7xvxnxmd3k2wv6p5n5raqyq667f1x1vvfx3gjgl8l6za";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "12fd76wcr141pqd9lcpwzi0fvd8r66551vcd3rz1p5gkl41wnzih";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "0y7gaa19ycbp4v97rwf7h2ijam68fjzpx62iab4q8p925d5bf5gz";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "1bvlw16wvj9k82c00p6vbwvc1f6y4lgq7yfwi3d62wjmq34ry9y3";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "10zjs4a8chsf6i8v9xbzqikz7j1kqwaxv6hbzphz5qlabxx1vfhh";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0bzh4j9m8jmandrx6y7pl2dm8xlp0m4vw5lnz0mhbzrpbf9y91f5";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1imkd6540npybpg34vz00z7x3c2vgzigkjz0ha8xhsnsrbsyph1c";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1jqpmqma7pwgpfhlz5rf9jbda3y6psd9ikbpl0r18kwbjxmmydbf";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "0rv81v06m27kk922d7cy58jm7rxx3lwhy7hnwc3iym0kzlb1kn8k";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "1z9wysi99sb7whrqbjsywvzr99bbph8ajlrpgjx2sc6r0pq9kiz2";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1cj65wnkzrkd9bpjaihgzqhcjmjrjlfzvcc5w66wy976lj3bmhbj";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "17ilmmdjzlk16avr6v37fwx50gn70ds0s66i1pr6bgfjwzirhbwr";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0c3ibrnhfhgpn51bzkx9skqzhbc3y3b9z8x9mqfj8qb88y8daxr6";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "07aazd6326jnl98xsw60d2a23cgqz9hlhr3359ing0f85y0h4553";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "18d8xmvppp8y01g9kbfchd4ppbgc0xzd0s2xhicglsjq0mxgsl1d";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0mxrikinff8a94pjag1dw6d4ywx1f8niy6160cfy9yhzww7kxdid";
+}
+{
+  lang = "si";
+  saneName = "si";
+  sha256 = "1a8wqihfxqvwxpz1x46kq88jwh3gbilqiba6sk9bq2mszp4p67rm";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "0x07css69r5ji9k3xz6b86945zawhnx3cxx8mjc21yhb88ns9abg";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "157b1qbv68455gxjfw0a16pn754cwsslr7rjj98m3wxb0x2l6jm6";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "1hj0z12g6srhhl3rim8ch2a51jxmzgbrd3wz9x1dcbb280qvx7dh";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "0caji21v1lb6kqb12rrd0ff4pi4kr5533x686c8aqmj82dldc0i1";
+}
+{
+  lang = "tg";
+  saneName = "tg";
+  sha256 = "0v4kggr5k0nl0kj2y2diw37mdi51p76wmwxjldlhvkxind40sab9";
+}
+{
+  lang = "th";
+  saneName = "th";
+  sha256 = "13vvfl1nkm8a3vd1h95rs73cvh4q84vdgnvy1144v2lfg62qz2wr";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0nc8c68y6ykplkhh0pij2lwwq5pa0sgwdiarwmjlwiy2rzyjm49c";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "1rw2jq6899xkn39ij6w6k7qgnv94w6rivx56czwpldxslzw5aikf";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "0w42f4fg4pk4ny1sldhv4nsganid5jayc0n5m1slsvd70f89l4cq";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "093d4fsf38kxlpr99yf7nnr4amvlwsj92h9ix3hh2mql1vcrjzxh";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "048awkb3a07bxd2kbfv05ig49r2hix6glag5wdjsmn3dmjlf7lam";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "0hkrj9j6rzxnprvdsf6b0xy2i6mngrq5sgsg6k9dqxwjfnnfd1g5";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "096mwkla69sj4236f05grhv7wrvfxfq7m7gyq3r58nar37b5nrkz";
+}
+]
diff --git a/pkgs/desktops/kde-4.8/oxygen-icons.nix b/pkgs/desktops/kde-4.8/oxygen-icons.nix
index 7896e804aa9d..7f02e1e90779 100644
--- a/pkgs/desktops/kde-4.8/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.8/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "dec510cb1dd47d4254e97021964dcbdcfe4541368a0694ee986666ff745b6860";
+  outputHash = "78f35ceba58bd34059ca4b2107bb55d4de56733e8932ba2ea22dcac18ee995ce";
 
   buildNativeInputs = [ cmake ];