From 6de9700cccbd9900c509a5b5132de7af6270e127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 15 Jun 2014 19:08:49 +0200
Subject: [PATCH 01/61] libpng: minor update 1.6.10 -> .12

---
 pkgs/development/libraries/libpng/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 52aaeaf93a4..1f04ae8fca5 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,11 +3,11 @@
 assert zlib != null;
 
 let
-  version = "1.6.10";
-  sha256 = "0mjsfxc18478y1jxrs3snmx7mvckmghvki9gfhmhl49n1vyz00s0";
+  version = "1.6.12";
+  sha256 = "0pkcirbfzhqqsm3hr2alxprw5n22a836qk4df1jnns6jk79gcby3";
   patch_src = fetchurl {
     url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz";
-    sha256 = "0512q27c26ajzqm2qzmmc7q1frj7cjylls2hxy3y3wg2r6ryizw8";
+    sha256 = "0r2vmsc4cvxisjr7jqw2vjf66isb2fhs4nnssz3l3jgdangj8wz0";
   };
   whenPatched = stdenv.lib.optionalString apngSupport;
 

From fa1eaf84f4c43b716286c352a84836502780ab94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 15 Jun 2014 19:38:59 +0200
Subject: [PATCH 02/61] wayland, weston: update 1.4.0 -> 1.5.0

---
 pkgs/applications/window-managers/weston/default.nix | 5 +++--
 pkgs/development/libraries/wayland/default.nix       | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 4880029119e..73a6412afab 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -2,16 +2,17 @@
 , cairo, libxcb, libXcursor, x11, udev, libdrm, mtdev
 , libjpeg, pam, autoconf, automake, libtool, dbus }:
 
-let version = "1.4.0"; in
+let version = "1.5.0"; in
 
 stdenv.mkDerivation rec {
   name = "weston-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0r7dz72ys9p3f697ajgmihkar2da36bnjna6yanb3kg9k2fk38kl";
+    sha256 = "113nig2dmbgrjhi79k0zw77vicnx8vkaihawd0nsg6n79ah8nf06";
   };
 
+  #ToDo: libinput can be split away
   buildInputs = [
     pkgconfig wayland mesa libxkbcommon
     cairo libxcb libXcursor x11 udev libdrm mtdev libjpeg pam dbus.libs
diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 58631e83217..14397c609b8 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libffi, expat, pkgconfig, libxslt, docbook_xsl, doxygen }:
 
-let version = "1.4.0"; in
+let version = "1.5.0"; in
 
 stdenv.mkDerivation rec {
   name = "wayland-${version}";
 
   src = fetchurl {
     url = "http://wayland.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0n2sbh4xg8xkcjhyi3f4vwcv89krdriyfs0rzdibdj5l2ngkpwqq";
+    sha256 = "1da179livkkmfsds32yhh4zflxn9qs6av023702kx2w8mzly2s80";
   };
 
   buildInputs = [ pkgconfig libffi expat libxslt docbook_xsl doxygen ];

From 336e06813e6d0181882fd6cfef2a12d5e5145c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 15 Jun 2014 19:45:23 +0200
Subject: [PATCH 03/61] harfbuzz: minor update 0.9.28 -> .29

---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 2e596b17af3..fba483cc78a 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.28";
+  name = "harfbuzz-0.9.29";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "0j70ppl2qrfx8yzdl8ki63wcxgrlhkyl31p1a6bhmbqqh32zfrx5";
+    sha256 = "14739pvc6bvddnj4rplhjdgiqwfvyincchlhvmig637sqqwfl730";
   };
 
   configureFlags = [

From 055aeb6ef798d36ec3edacb48f634a2184c1fd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 15 Jun 2014 19:45:45 +0200
Subject: [PATCH 04/61] gdk_pixbuf: minor update 2.30.6 -> .8

---
 pkgs/development/libraries/gdk-pixbuf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 39be4720eb1..27e2cad062b 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -3,14 +3,14 @@
 
 let
   ver_maj = "2.30";
-  ver_min = "6";
+  ver_min = "8";
 in
 stdenv.mkDerivation rec {
   name = "gdk-pixbuf-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gdk-pixbuf/${ver_maj}/${name}.tar.xz";
-    sha256 = "0nkz19xlh60bf9bqylh98n8rynpjyx1nzp1gcr6zljgvmnj4yfa3";
+    sha256 = "1gpqpskp4zzf7h35bp247jcvnk6rxc52r69pb11v8g8i2q386ls8";
   };
 
   setupHook = ./setup-hook.sh;

From ff327554e97acfe27d0817b81da65e27aacbe1f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 15 Jun 2014 21:18:21 +0200
Subject: [PATCH 05/61] xorg: maintenance updates of several modules

---
 pkgs/servers/x11/xorg/default.nix             | 36 +++++++++----------
 pkgs/servers/x11/xorg/extra.list              |  2 +-
 pkgs/servers/x11/xorg/tarballs-7.7.list       | 10 +++---
 .../x11/xorg/xf86-video-intel-testing.nix     |  6 ++--
 4 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 7fca58f5446..124d01df7d4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -530,11 +530,11 @@ let
   })) // {inherit xproto ;};
 
   inputproto = (stdenv.mkDerivation ((if overrides ? inputproto then overrides.inputproto else x: x) {
-    name = "inputproto-2.3";
+    name = "inputproto-2.3.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/proto/inputproto-2.3.tar.bz2;
-      sha256 = "0by3aa8i1gki6i904i34vlrymv5p8il05gr83sf8x7v9ys9v29kx";
+      url = mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2;
+      sha256 = "1lf1jlxp0fc8h6fjdffhd084dqab94966l1zm3rwwsis0mifwiss";
     };
     buildInputs = [pkgconfig ];
   })) // {inherit ;};
@@ -570,11 +570,11 @@ let
   })) // {inherit fontsproto xproto xtrans ;};
 
   libICE = (stdenv.mkDerivation ((if overrides ? libICE then overrides.libICE else x: x) {
-    name = "libICE-1.0.8";
+    name = "libICE-1.0.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2;
-      sha256 = "07mp13pb3s73kj7y490gnx619znzwk91mlf8kdw0rzq29ll93a94";
+      url = mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2;
+      sha256 = "00p2b6bsg6kcdbb39bv46339qcywxfl4hsrz8asm4hy6q7r34w4g";
     };
     buildInputs = [pkgconfig xproto xtrans ];
   })) // {inherit xproto xtrans ;};
@@ -710,11 +710,11 @@ let
   })) // {inherit libfontenc fontsproto freetype xproto xtrans zlib ;};
 
   libXft = (stdenv.mkDerivation ((if overrides ? libXft then overrides.libXft else x: x) {
-    name = "libXft-2.3.1";
+    name = "libXft-2.3.2";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2;
-      sha256 = "1gdv6559cdz1lfw73x7wsvax1fkvphmayrymprljhyyb5nwk5kkz";
+      url = mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2;
+      sha256 = "0k6wzi5rzs0d0n338ms8n8lfyhq914hw4yl2j7553wqxfqjci8zm";
     };
     buildInputs = [pkgconfig fontconfig freetype libX11 xproto libXrender ];
   })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
@@ -1210,11 +1210,11 @@ let
   })) // {inherit gperf m4 libxcb xproto ;};
 
   xcbutilrenderutil = (stdenv.mkDerivation ((if overrides ? xcbutilrenderutil then overrides.xcbutilrenderutil else x: x) {
-    name = "xcb-util-renderutil-0.3.8";
+    name = "xcb-util-renderutil-0.3.9";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2;
-      sha256 = "0lkl9ij9b447c0br2qc5qsynjn09c4fdz7sd6yp7pyi8az2sb2cp";
+      url = http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2;
+      sha256 = "0nza1csdvvxbmk8vgv8vpmq7q8h05xrw3cfx9lwxd1hjzd47xsf6";
     };
     buildInputs = [pkgconfig gperf m4 libxcb xproto ];
   })) // {inherit gperf m4 libxcb xproto ;};
@@ -1260,11 +1260,11 @@ let
   })) // {inherit libX11 ;};
 
   xcursorgen = (stdenv.mkDerivation ((if overrides ? xcursorgen then overrides.xcursorgen else x: x) {
-    name = "xcursorgen-1.0.5";
+    name = "xcursorgen-1.0.6";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2;
-      sha256 = "10f5wk1326mm45gvgpf4m2p0j80fcd0i4c52zikahb91zah72wdw";
+      url = mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2;
+      sha256 = "0v7nncj3kaa8c0524j7ricdf4rvld5i7c3m6fj55l5zbah7r3j1i";
     };
     buildInputs = [pkgconfig libpng libX11 libXcursor ];
   })) // {inherit libpng libX11 libXcursor ;};
@@ -1960,11 +1960,11 @@ let
   })) // {inherit ;};
 
   xorgserver = (stdenv.mkDerivation ((if overrides ? xorgserver then overrides.xorgserver else x: x) {
-    name = "xorg-server-1.14.6";
+    name = "xorg-server-1.14.7";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2;
-      sha256 = "0c57vp1z0p38dj5gfipkmlw6bvbz1mrr0sb3sbghdxxdyq4kzcz8";
+      url = mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2;
+      sha256 = "07s54g9q1bry1050dsa7x6hy55yjvq9sxs6ks89pc8l6mnk6zxpw";
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
   })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 3abfed675f8..2d105241c2d 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -4,5 +4,5 @@ http://xcb.freedesktop.org/dist/xcb-proto-1.10.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-image-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-keysyms-0.3.9.tar.bz2
-http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.8.tar.bz2
+http://xcb.freedesktop.org/dist/xcb-util-renderutil-0.3.9.tar.bz2
 http://xcb.freedesktop.org/dist/xcb-util-wm-0.4.1.tar.bz2
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 512bbbb9eff..a4a349843de 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -48,14 +48,14 @@ mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/font-xfree86-type1-1.0.4.tar.bz2
 mirror://xorg/individual/proto/glproto-1.4.17.tar.bz2
 mirror://xorg/individual/app/iceauth-1.0.6.tar.bz2
-mirror://xorg/individual/proto/inputproto-2.3.tar.bz2
+mirror://xorg/individual/proto/inputproto-2.3.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/kbproto-1.0.6.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libAppleWM-1.4.1.tar.bz2
 mirror://xorg/individual/lib/libdmx-1.1.3.tar.bz2
 mirror://xorg/individual/lib/libxshmfence-1.1.tar.bz2
 mirror://xorg/individual/lib/libfontenc-1.1.2.tar.bz2
 mirror://xorg/individual/lib/libFS-1.0.6.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libICE-1.0.8.tar.bz2
+mirror://xorg/individual/lib/libICE-1.0.9.tar.bz2
 mirror://xorg/individual/lib/libpciaccess-0.13.2.tar.bz2
 mirror://xorg/individual/lib/libSM-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libWindowsWM-1.0.1.tar.bz2
@@ -69,7 +69,7 @@ mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
 mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
-mirror://xorg/X11R7.7/src/everything/libXft-2.3.1.tar.bz2
+mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
 mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
@@ -106,7 +106,7 @@ mirror://xorg/individual/app/xbacklight-1.2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xbitmaps-1.1.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmiscproto-1.2.2.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xcmsdb-1.0.4.tar.bz2
-mirror://xorg/X11R7.7/src/everything/xcursorgen-1.0.5.tar.bz2
+mirror://xorg/individual/app/xcursorgen-1.0.6.tar.bz2
 mirror://xorg/individual/data/xcursor-themes-1.0.4.tar.bz2
 mirror://xorg/individual/app/xdpyinfo-1.3.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xdriinfo-1.0.4.tar.bz2
@@ -170,7 +170,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2
 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2
 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2
-mirror://xorg/individual/xserver/xorg-server-1.14.6.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.14.7.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2
 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2
diff --git a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix
index 5877643fb1b..bee394e9963 100644
--- a/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix
+++ b/pkgs/servers/x11/xorg/xf86-video-intel-testing.nix
@@ -3,11 +3,11 @@
 with xorg;
 
 (stdenv.mkDerivation ({
-  name = "xf86-video-intel-2.99.911";
+  name = "xf86-video-intel-2.99.912";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://xorg/individual/driver/xf86-video-intel-2.99.911.tar.bz2;
-    sha256 = "1mkhfa10304xvs763dz1kj93zkmdidlfxhsy5j8ljkfc3d4nhyjf";
+    url = mirror://xorg/individual/driver/xf86-video-intel-2.99.912.tar.bz2;
+    sha256 = "00cmvs5jxaqnl1pwqvj1rwir4kbvf5qfng89cjn4rwsr5m4zr3vw";
   };
   buildInputs = [pkgconfig dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ];
 })) // {inherit dri2proto fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes libXinerama xorgserver xproto libXrandr libXrender libXtst libXvMC ;}

From c50f0e47e14d2dec088ce4b9bed6228232607869 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 9 Jun 2014 19:47:31 +0200
Subject: [PATCH 06/61] freetype: major update, including some CVE security

- There's no fontconfig update yet, as I failed to debug it yet.
- Infinality patches are now taken from a different (maintained) source.
---
 .../display-managers/slim/default.nix         |  2 +
 .../libraries/fontconfig/default.nix          | 20 ++++--
 .../libraries/freetype/default.nix            | 67 +++++++++----------
 pkgs/servers/x11/xorg/overrides.nix           |  8 +++
 4 files changed, 53 insertions(+), 44 deletions(-)

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 26500939db8..42d2c777aea 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -24,6 +24,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DUSE_PAM=1" ];
 
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype";
+
   enableParallelBuilding = true;
 
   buildInputs =
diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 89feb3df8d5..73461b077de 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -8,18 +8,22 @@ stdenv.mkDerivation rec {
     sha256 = "0llraqw86jmw4vzv7inskp3xxm2gc64my08iwq5mzncgfdbfza4f";
   };
 
-  infinality_patch = with freetype.infinality; if useInfinality
-    then let subvers = "1";
+  infinality_patch =
+    let subvers = "1";
       in fetchurl {
         url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2;
         sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7";
       }
-    else null;
+    ;
 
   propagatedBuildInputs = [ freetype ];
   buildInputs = [ pkgconfig expat ];
 
-  configureFlags = "--sysconfdir=/etc --with-cache-dir=/var/cache/fontconfig --disable-docs --with-default-fonts=";
+  configureFlags = [
+    "--with-cache-dir=/var/cache/fontconfig"
+    "--disable-docs"
+    "--with-default-fonts="
+  ];
 
   # We should find a better way to access the arch reliably.
   crossArch = stdenv.cross.arch or null;
@@ -32,10 +36,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # Don't try to write to /etc/fonts or /var/cache/fontconfig at install time.
-  installFlags = "sysconfdir=$(out)/etc RUN_FC_CACHE_TEST=false fc_cachedir=$(TMPDIR)/dummy";
+  doCheck = true;
 
-  postInstall = stdenv.lib.optionalString freetype.infinality.useInfinality ''
+  # Don't try to write to /var/cache/fontconfig at install time.
+  installFlags = "fc_cachedir=$(TMPDIR)/dummy";
+
+  postInstall = ''
     cd "$out/etc/fonts" && tar xvf ${infinality_patch}
   '';
 
diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 235d7e72374..510e816f88c 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,57 +1,52 @@
-{ stdenv, fetchurl, gnumake
+{ stdenv, fetchurl, fetchpatch, pkgconfig, which, zlib, bzip2, libpng, gnumake
   # FreeType supports sub-pixel rendering.  This is patented by
   # Microsoft, so it is disabled by default.  This option allows it to
   # be enabled.  See http://www.freetype.org/patents.html.
-, useEncumberedCode ? false
-, useInfinality ? true
+, useEncumberedCode ? true
 }:
 
-assert !(useEncumberedCode && useInfinality); # probably wouldn't make sense
-
 let
+  version = "2.5.3";
 
-  version = "2.4.12";
-
+  fetch_bohoomil = name: sha256: fetchpatch {
+    url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/8a155db28f264520596cc3e76eb44824bdb30f8e/01_freetype2-iu/ + name;
+    inherit sha256;
+  };
 in
-
+with { inherit (stdenv.lib) optional optionalString; };
 stdenv.mkDerivation rec {
   name = "freetype-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/freetype/${name}.tar.bz2";
-    sha256 = "10akr2c37iv9y7fkgwp2szgwjyl2g6qmk9z1m596iaw9cr41g2m7";
+    sha256 = "0pppcn73b5pwd7zdi9yfx16f5i93y18q7q4jmlkwmwrfsllqp160";
   };
 
-  infinality_patch =
-    if useInfinality then fetchurl {
-      url = http://www.infinality.net/fedora/linux/zips/freetype-infinality-2.4.12-20130514_01-x86_64.tar.bz2;
-      sha256 = "1lg2nzvxmwzwdfhxranw8iyflhr72cw9p11rkpgq1scxbp37668m";
-    } else null;
-
-  configureFlags = "--disable-static";
-
-  NIX_CFLAGS_COMPILE = with stdenv.lib;
-    " -fno-strict-aliasing" # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840
-    + optionalString useEncumberedCode " -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING=1"
-    + optionalString useInfinality " -DTT_CONFIG_OPTION_SUBPIXEL_HINTING=1";
-
   patches = [ ./enable-validation.patch ] # from Gentoo
-    ++ stdenv.lib.optional useInfinality [ infinality_patch ];
+    ++ [
+      (fetch_bohoomil "freetype-2.5.3-pkgconfig.patch" "1dpfdh8kmka3gzv14glz7l79i545zizah6wma937574v5z2iy3nn")
+      (fetch_bohoomil "fix_segfault_with_harfbuzz.diff" "1nx36inqrw717b86cla2miprdb3hii4vndw95k0jbbhfmax9k6fy")
+    ]
+    ++ optional useEncumberedCode
+      (fetch_bohoomil "infinality-2.5.3.patch" "0mxiybcb4wwbicrjiinh1b95rv543bh05sdqk1v0ipr3fxfrb47q")
+    ;
 
+  propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
+  # dependence on harfbuzz is looser than the reverse dependence
+  buildInputs = [ pkgconfig which ]
+    # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
+    ++ optional (!stdenv.isLinux) gnumake;
+
+  # from Gentoo, see https://bugzilla.redhat.com/show_bug.cgi?id=506840
+  NIX_CFLAGS_COMPILE = "-fno-strict-aliasing";
   # The asm for armel is written with the 'asm' keyword.
-  CFLAGS = stdenv.lib.optionalString stdenv.isArm "-std=gnu99";
-
-  # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) gnumake;
+  CFLAGS = optionalString stdenv.isArm "-std=gnu99";
 
   enableParallelBuilding = true;
 
   doCheck = true;
 
-  postInstall =
-    ''
-      ln -s freetype2/freetype $out/include/freetype
-    '';
+  postInstall = ''ln -s freetype2 "$out"/include/freetype''; # compat hack
 
   crossAttrs = {
     # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
@@ -60,13 +55,11 @@ stdenv.mkDerivation rec {
     configureFlags = "--disable-static CC_BUILD=gcc";
   };
 
-  passthru.infinality.useInfinality = useInfinality; # for fontconfig
-
-  meta = {
+  meta = with stdenv.lib; {
     description = "A font rendering engine";
     homepage = http://www.freetype.org/;
-    license = if useEncumberedCode then "unfree"
-      else "GPLv2+"; # or the FreeType License (BSD + advertising clause)
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.gpl2Plus; # or the FreeType License (BSD + advertising clause)
+    #ToDo: encumbered = useEncumberedCode;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index bb97eadef46..e5aad4aea40 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -73,6 +73,10 @@ in
       '';
   };
 
+  libXfont = attrs: attrs // {
+    propagatedBuildInputs = [ args.freetype ]; # propagate link reqs. like bzip2
+  };
+
   libXxf86vm = attrs: attrs // {
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
   };
@@ -111,6 +115,10 @@ in
   libXft = attrs: attrs // {
     propagatedBuildInputs = [ xorg.libXrender args.freetype args.fontconfig ];
     preConfigure = setMalloc0ReturnsNullCrossCompiling;
+    # the include files need ft2build.h, and Requires.private isn't enough for us
+    postInstall = ''
+      sed "/^Requires:/s/$/, freetype2/" -i "$out/lib/pkgconfig/xft.pc"
+    '';
   };
 
   libXext = attrs: attrs // {

From 2027dcc4f9444bf52e92556531e550c08b094918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Jun 2014 15:41:17 +0200
Subject: [PATCH 07/61] xfce4-power-manager: update to 1.3.0, supporting
 upower-0.99

---
 .../core/xfce4-power-manager-brightness.patch | 307 ------------------
 .../xfce/core/xfce4-power-manager.nix         |  10 +-
 2 files changed, 4 insertions(+), 313 deletions(-)
 delete mode 100644 pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch

diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch b/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch
deleted file mode 100644
index 6b6f14fdae7..00000000000
--- a/pkgs/desktops/xfce/core/xfce4-power-manager-brightness.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-From 05d12e12596512f7a31d3cdb4845a69dc2d4c611 Mon Sep 17 00:00:00 2001
-From: Martin Matuska <martin@matuska.org>
-Date: Tue, 23 Jul 2013 11:27:41 +0200
-Subject: Change brightness level from glong to gint32
-
-The "Backlight" RandR property is a 32-bit integer. This means that the int32 (gint32) type should be used to represent brightness levels. The attached patch does nothing else than changing the brightness level representation from glong to gint32. This fixes the screen auto-dimming issue and brightness panel plugin issue.
-
-diff --git a/common/xfpm-brightness.c b/common/xfpm-brightness.c
-index aa1ef33..f1524cb 100644
---- a/common/xfpm-brightness.c
-+++ b/common/xfpm-brightness.c
-@@ -92,11 +92,11 @@ out:
- }
- 
- static gboolean
--xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, long *current)
-+xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, gint32 *current)
- {
-     unsigned long nitems;
-     unsigned long bytes_after;
--    long *prop;
-+    gint32 *prop;
-     Atom actual_type;
-     int actual_format;
-     gboolean ret = FALSE;
-@@ -124,7 +124,7 @@ xfpm_brightness_xrandr_get_level (XfpmBrightness *brightness, RROutput output, l
- }
- 
- static gboolean
--xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, long level)
-+xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, gint32 level)
- {
-     gboolean ret = TRUE;
- 
-@@ -137,7 +137,7 @@ xfpm_brightness_xrandr_set_level (XfpmBrightness *brightness, RROutput output, l
-     
-     if ( gdk_error_trap_pop () ) 
-     {
--	    g_warning ("failed to XRRChangeOutputProperty for brightness %li", level);
-+	    g_warning ("failed to XRRChangeOutputProperty for brightness %d", level);
- 	    ret = FALSE;
-     }
-     
-@@ -225,11 +225,11 @@ xfpm_brightness_setup_xrandr (XfpmBrightness *brightness)
- }
- 
- static gboolean
--xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_xrand_up (XfpmBrightness *brightness, gint32 *new_level)
- {
--    long hw_level;
-+    gint32 hw_level;
-     gboolean ret = FALSE;
--    long set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-     
-@@ -250,14 +250,14 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
-     
-     if ( !ret )
-     {
--	g_warning ("xfpm_brightness_xrand_up failed for %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_up failed for %d", set_level);
- 	return FALSE;
-     }
- 	
-     /* Nothing changed in the hardware*/
-     if ( *new_level == hw_level )
-     {
--	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_up did not change the hw level to %d", set_level);
- 	return FALSE;
-     }
-     
-@@ -265,11 +265,11 @@ xfpm_brightness_xrand_up (XfpmBrightness *brightness, glong *new_level)
- }
- 
- static gboolean
--xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-+xfpm_brightness_xrand_down (XfpmBrightness *brightness, gint32 *new_level)
- {
--    long hw_level;
-+    gint32 hw_level;
-     gboolean ret;
--    long set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_xrandr_get_level (brightness, brightness->priv->output, &hw_level);
-     
-@@ -290,14 +290,14 @@ xfpm_brightness_xrand_down (XfpmBrightness *brightness, long *new_level)
-     
-     if ( !ret )
-     {
--	g_warning ("xfpm_brightness_xrand_down failed for %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_down failed for %d", set_level);
- 	return FALSE;
-     }
-     
-     /* Nothing changed in the hardware*/
-     if ( *new_level == hw_level )
-     {
--	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %li", set_level);
-+	g_warning ("xfpm_brightness_xrand_down did not change the hw level to %d", set_level);
- 	return FALSE;
-     }
-     
-@@ -361,7 +361,7 @@ xfpm_brightness_setup_helper (XfpmBrightness *brightness)
- }
- 
- static gboolean
--xfpm_brightness_helper_get_level (XfpmBrightness *brg, glong *level)
-+xfpm_brightness_helper_get_level (XfpmBrightness *brg, gint32 *level)
- {
-     int ret;
- 
-@@ -406,11 +406,11 @@ out:
- }
- 
- static gboolean
--xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_up (XfpmBrightness *brightness, gint32 *new_level)
- {
--    glong hw_level;
-+    gint32 hw_level;
-     gboolean ret = FALSE;
--    gint set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-     
-@@ -446,11 +446,11 @@ xfpm_brightness_helper_up (XfpmBrightness *brightness, glong *new_level)
- }
- 
- static gboolean
--xfpm_brightness_helper_down (XfpmBrightness *brightness, glong *new_level)
-+xfpm_brightness_helper_down (XfpmBrightness *brightness, gint32 *new_level)
- {
--    glong hw_level;
-+    gint32 hw_level;
-     gboolean ret;
--    gint set_level;
-+    gint32 set_level;
-     
-     ret = xfpm_brightness_helper_get_level (brightness, &hw_level);
-     
-@@ -572,7 +572,7 @@ xfpm_brightness_setup (XfpmBrightness *brightness)
-     return FALSE;
- }
- 
--gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_up (XfpmBrightness *brightness, gint32 *new_level)
- {
-     gboolean ret = FALSE;
-     
-@@ -589,7 +589,7 @@ gboolean xfpm_brightness_up (XfpmBrightness *brightness, glong *new_level)
-     return ret;
- }
- 
--gboolean xfpm_brightness_down (XfpmBrightness *brightness, glong *new_level)
-+gboolean xfpm_brightness_down (XfpmBrightness *brightness, gint32 *new_level)
- {
-     gboolean ret = FALSE;
-     
-@@ -618,7 +618,7 @@ gint xfpm_brightness_get_max_level (XfpmBrightness *brightness)
-     return brightness->priv->max_level;
- }
- 
--gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
-+gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, gint32 *level)
- {
-     gboolean ret = FALSE;
-     
-@@ -632,7 +632,7 @@ gboolean xfpm_brightness_get_level	(XfpmBrightness *brightness, glong *level)
-     return ret;
- }
- 
--gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, glong level)
-+gboolean xfpm_brightness_set_level (XfpmBrightness *brightness, gint32 level)
- {
-     gboolean ret = FALSE;
-     
-diff --git a/common/xfpm-brightness.h b/common/xfpm-brightness.h
-index 0c4e3ed..26b3dbe 100644
---- a/common/xfpm-brightness.h
-+++ b/common/xfpm-brightness.h
-@@ -51,20 +51,20 @@ XfpmBrightness       	       *xfpm_brightness_new             (void);
- gboolean			xfpm_brightness_setup 		(XfpmBrightness *brightness);
- 
- gboolean			xfpm_brightness_up		(XfpmBrightness *brightness,
--								 glong *new_level);
-+								 gint32 *new_level);
- 
- gboolean			xfpm_brightness_down		(XfpmBrightness *brightness,
--								 glong *new_level);
-+								 gint32 *new_level);
- 
- gboolean			xfpm_brightness_has_hw 		(XfpmBrightness *brightness);
- 
- gint 				xfpm_brightness_get_max_level   (XfpmBrightness *brightness);
- 
- gboolean			xfpm_brightness_get_level	(XfpmBrightness *brightness,
--								 glong *level);
-+								 gint32 *level);
- 
- gboolean			xfpm_brightness_set_level	(XfpmBrightness *brightness,
--								 glong level);
-+								 gint32 level);
- 
- gboolean			xfpm_brightness_dim_down	(XfpmBrightness *brightness);
- 
-diff --git a/panel-plugins/brightness/brightness-button.c b/panel-plugins/brightness/brightness-button.c
-index 6e60c29..bd466c9 100644
---- a/panel-plugins/brightness/brightness-button.c
-+++ b/panel-plugins/brightness/brightness-button.c
-@@ -186,7 +186,7 @@ static gboolean
- brightness_button_popup_win (GtkWidget *widget, GdkEvent *ev, guint32 ev_time)
- {
-     gint x, y;
--    glong current_level = 0;
-+    gint32 current_level = 0;
-     GdkDisplay *display;
-     GdkScreen *screen;
-     BrightnessButton *button;
-@@ -342,7 +342,7 @@ plus_clicked (GtkWidget *widget, BrightnessButton *button)
- static void
- range_value_changed (GtkWidget *widget, BrightnessButton *button)
- {
--    glong range_level, hw_level;
-+    gint32 range_level, hw_level;
-     
-     range_level = (gint) gtk_range_get_value (GTK_RANGE (button->priv->range));
-     
-@@ -428,8 +428,8 @@ brightness_button_create_popup (BrightnessButton *button)
- static void
- brightness_button_up (BrightnessButton *button)
- {
--    glong level;
--    glong max_level;
-+    gint32 level;
-+    gint32 max_level;
-     
-     xfpm_brightness_get_level (button->priv->brightness, &level);
-     max_level = xfpm_brightness_get_max_level (button->priv->brightness);
-@@ -443,7 +443,7 @@ brightness_button_up (BrightnessButton *button)
- static void
- brightness_button_down (BrightnessButton *button)
- {
--    glong level;
-+    gint32 level;
-     xfpm_brightness_get_level (button->priv->brightness, &level);
-     
-     if ( level != 0 )
-diff --git a/src/xfpm-backlight.c b/src/xfpm-backlight.c
-index baeeb43..45c990f 100644
---- a/src/xfpm-backlight.c
-+++ b/src/xfpm-backlight.c
-@@ -63,8 +63,8 @@ struct XfpmBacklightPrivate
-     gboolean	    has_hw;
-     gboolean	    on_battery;
-     
--    glong            last_level;
--    glong 	    max_level;
-+    gint32          last_level;
-+    gint32 	    max_level;
-     
-     gboolean        dimmed;
-     gboolean	    block;
-@@ -79,7 +79,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
-     
-     if (xfpm_power_get_mode (backlight->priv->power) == XFPM_POWER_MODE_NORMAL )
-     {
--	glong dim_level;
-+	gint32 dim_level;
- 	
- 	g_object_get (G_OBJECT (backlight->priv->conf),
- 		      backlight->priv->on_battery ? BRIGHTNESS_LEVEL_ON_BATTERY : BRIGHTNESS_LEVEL_ON_AC, &dim_level,
-@@ -101,7 +101,7 @@ xfpm_backlight_dim_brightness (XfpmBacklight *backlight)
- 	 **/
- 	if (backlight->priv->last_level > dim_level)
- 	{
--	    XFPM_DEBUG ("Current brightness level before dimming : %li, new %li", backlight->priv->last_level, dim_level);
-+	    XFPM_DEBUG ("Current brightness level before dimming : %d, new %d", backlight->priv->last_level, dim_level);
- 	    backlight->priv->dimmed = xfpm_brightness_set_level (backlight->priv->brightness, dim_level);
- 	}
-     }
-@@ -182,7 +182,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
-     {
- 	if ( !backlight->priv->block)
- 	{
--	    XFPM_DEBUG ("Alarm reset, setting level to %li", backlight->priv->last_level);
-+	    XFPM_DEBUG ("Alarm reset, setting level to %d", backlight->priv->last_level);
- 	    xfpm_brightness_set_level (backlight->priv->brightness, backlight->priv->last_level);
- 	}
- 	backlight->priv->dimmed = FALSE;
-@@ -192,7 +192,7 @@ xfpm_backlight_reset_cb (EggIdletime *idle, XfpmBacklight *backlight)
- static void
- xfpm_backlight_button_pressed_cb (XfpmButton *button, XfpmButtonKey type, XfpmBacklight *backlight)
- {
--    glong level;
-+    gint32 level;
-     gboolean ret = TRUE;
-     
-     gboolean enable_brightness, show_popup;
--- 
-cgit v0.10.1
-
diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
index 7740af438d9..3f9be6bc878 100644
--- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix
+++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix
@@ -1,26 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, xfconf
+{ stdenv, fetchurl, pkgconfig, intltool, gtk, dbus_glib, upower, xfconf
 , libxfce4ui, libxfce4util, libnotify, xfce4panel }:
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-power-manager";
-  ver_maj = "1.2";
+  ver_maj = "1.3";
   ver_min = "0";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "1sc4f4wci5yl3l9lk7vcsbwj6hdjshbxw9qm43s64jr882jriyyp";
+    sha256 = "1q0mnj9hjqw4zpk7wqnfayy6zzbjbhzd1mcplfjik2h753gaxgh5";
   };
 
   name = "${p_name}-${ver_maj}.${ver_min}";
 
   buildInputs =
-    [ pkgconfig intltool gtk dbus_glib xfconf libxfce4ui libxfce4util
+    [ pkgconfig intltool gtk dbus_glib upower xfconf libxfce4ui libxfce4util
       libnotify xfce4panel
     ];
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
-  patches = ./xfce4-power-manager-brightness.patch;
-
   meta = {
     homepage = http://goodies.xfce.org/projects/applications/xfce4-power-manager;
     description = "A power manager for the Xfce Desktop Environment";

From 5c72dac5487df7c230eea7a4559db54ce32106ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Jun 2014 15:53:24 +0200
Subject: [PATCH 08/61] libxfce4util: minor update 4.10.0 -> 4.10.1

---
 pkgs/desktops/xfce/core/libxfce4util.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/libxfce4util.nix b/pkgs/desktops/xfce/core/libxfce4util.nix
index 88874722b7d..8483aec7a46 100644
--- a/pkgs/desktops/xfce/core/libxfce4util.nix
+++ b/pkgs/desktops/xfce/core/libxfce4util.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   p_name  = "libxfce4util";
   ver_maj = "4.10";
-  ver_min = "0";
+  ver_min = "1";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "13k0wwbbqvdmbj4xmk4nxdlgvrdgr5y6r3dk380mzfw053hzwy89";
+    sha256 = "1fygyq9dywa989z1vb3d8hj4fg5ai75lcrngnf2s60jwf6nx2b78";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 

From 8aa892489e5b1dfa0fce3a64ea16c6286cd02232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 Jun 2014 16:00:41 +0200
Subject: [PATCH 09/61] xfce4-appfinder: update 4.9.4 -> 4.10.1

---
 pkgs/desktops/xfce/core/xfce4-appfinder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/core/xfce4-appfinder.nix b/pkgs/desktops/xfce/core/xfce4-appfinder.nix
index b4c9c790ac1..94a3686bced 100644
--- a/pkgs/desktops/xfce/core/xfce4-appfinder.nix
+++ b/pkgs/desktops/xfce/core/xfce4-appfinder.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-appfinder";
-  ver_maj = "4.9"; # no 4.10 (stable) release yet
-  ver_min = "4";
+  ver_maj = "4.10";
+  ver_min = "1";
 
   src = fetchurl {
     url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2";
-    sha256 = "12lgrbd1n50w9n8xkpai98s2aw8vmjasrgypc57sp0x0qafsqaxq";
+    sha256 = "0xzbi1vvy724s7vljf4153h7s7zqqwg51bn9wirx4d33lzzp9vk5";
   };
   name = "${p_name}-${ver_maj}.${ver_min}";
 

From 8fe3bd5aa4b86133a7dff2eb4b41b718d420160f Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Thu, 19 Jun 2014 15:27:00 +0200
Subject: [PATCH 10/61] kde: Copy 4.12 to 4.13 as a base

---
 pkgs/desktops/kde-4.13/applications/kate.nix  |  11 +
 .../kde-4.13/applications/konsole.nix         |  11 +
 pkgs/desktops/kde-4.13/default.nix            |  44 ++
 .../files/kde-wallpapers-buildsystem.patch    |  17 +
 .../kde-4.13/files/polkit-install.patch       |  12 +
 pkgs/desktops/kde-4.13/kactivities.nix        |   9 +
 pkgs/desktops/kde-4.13/kde-base-artwork.nix   |  14 +
 .../kde-4.13/kde-baseapps/kde-baseapps.nix    |  11 +
 pkgs/desktops/kde-4.13/kde-package/4.12.4.nix | 444 ++++++++++++++++++
 .../desktops/kde-4.13/kde-package/default.nix | 129 +++++
 .../kde-4.13/kde-package/kde-manifest.sh      | 146 ++++++
 .../kde-4.13/kde-package/kde-submodules.xslt  |  22 +
 pkgs/desktops/kde-4.13/kde-runtime.nix        |  24 +
 pkgs/desktops/kde-4.13/kde-wallpapers.nix     |  17 +
 pkgs/desktops/kde-4.13/kde-workspace.nix      |  46 ++
 .../kde-4.13/kdeaccessibility/jovie.nix       |   9 +
 .../kde-4.13/kdeaccessibility/kaccessible.nix |   9 +
 .../kde-4.13/kdeaccessibility/kmag.nix        |  10 +
 .../kde-4.13/kdeaccessibility/kmousetool.nix  |   9 +
 .../kde-4.13/kdeaccessibility/kmouth.nix      |   9 +
 pkgs/desktops/kde-4.13/kdeadmin/kcron.nix     |   9 +
 .../desktops/kde-4.13/kdeadmin/ksystemlog.nix |   9 +
 pkgs/desktops/kde-4.13/kdeadmin/kuser.nix     |   9 +
 .../kde-4.13/kdeartwork/ColorSchemes.nix      |  11 +
 .../kdeartwork/FindXscreensaver.cmake         |  73 +++
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 +
 .../kde-4.13/kdeartwork/IconThemes.nix        |  13 +
 .../kde-4.13/kdeartwork/WeatherWallpapers.nix |  11 +
 .../kde-4.13/kdeartwork/desktopthemes.nix     |  11 +
 .../kde-4.13/kdeartwork/emoticons.nix         |  11 +
 .../kde-4.13/kdeartwork/kscreensaver.nix      |  15 +
 .../kde-4.13/kdeartwork/kwin-styles.nix       |   9 +
 pkgs/desktops/kde-4.13/kdeartwork/styles.nix  |  11 +
 .../kde-4.13/kdeartwork/wallpapers.nix        |  11 +
 pkgs/desktops/kde-4.13/kdebindings/perlqt.nix |  14 +
 pkgs/desktops/kde-4.13/kdebindings/pykde4.nix |  32 ++
 .../kdebindings/qtruby-install-prefix.patch   |  15 +
 pkgs/desktops/kde-4.13/kdebindings/qtruby.nix |  20 +
 .../smokegen-CMakeLists.txt-nix.patch         |  13 +
 .../kde-4.13/kdebindings/smokegen-nix.patch   |  13 +
 .../kde-4.13/kdebindings/smokegen.nix         |  13 +
 .../kde-4.13/kdebindings/smokekde.nix         |  19 +
 .../desktops/kde-4.13/kdebindings/smokeqt.nix |  15 +
 pkgs/desktops/kde-4.13/kdeedu/analitza.nix    |   8 +
 pkgs/desktops/kde-4.13/kdeedu/blinken.nix     |   8 +
 pkgs/desktops/kde-4.13/kdeedu/cantor.nix      |  13 +
 pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix    |   8 +
 pkgs/desktops/kde-4.13/kdeedu/kalzium.nix     |  13 +
 pkgs/desktops/kde-4.13/kdeedu/kanagram.nix    |   8 +
 pkgs/desktops/kde-4.13/kdeedu/kbruch.nix      |   8 +
 pkgs/desktops/kde-4.13/kdeedu/kgeography.nix  |   8 +
 pkgs/desktops/kde-4.13/kdeedu/khangman.nix    |   8 +
 pkgs/desktops/kde-4.13/kdeedu/kig.nix         |   9 +
 pkgs/desktops/kde-4.13/kdeedu/kiten.nix       |   9 +
 pkgs/desktops/kde-4.13/kdeedu/klettres.nix    |   9 +
 pkgs/desktops/kde-4.13/kdeedu/kmplot.nix      |   9 +
 pkgs/desktops/kde-4.13/kdeedu/kstars.nix      |  14 +
 pkgs/desktops/kde-4.13/kdeedu/ktouch.nix      |   9 +
 pkgs/desktops/kde-4.13/kdeedu/kturtle.nix     |   9 +
 pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix   |   9 +
 pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix   |   8 +
 pkgs/desktops/kde-4.13/kdeedu/marble.nix      |  12 +
 pkgs/desktops/kde-4.13/kdeedu/pairs.nix       |   9 +
 pkgs/desktops/kde-4.13/kdeedu/parley.nix      |   9 +
 pkgs/desktops/kde-4.13/kdeedu/rocs.nix        |  14 +
 pkgs/desktops/kde-4.13/kdeedu/step.nix        |  12 +
 pkgs/desktops/kde-4.13/kdegames/bomber.nix    |   7 +
 pkgs/desktops/kde-4.13/kdegames/bovo.nix      |   8 +
 pkgs/desktops/kde-4.13/kdegames/granatier.nix |   7 +
 pkgs/desktops/kde-4.13/kdegames/kajongg.nix   |  13 +
 pkgs/desktops/kde-4.13/kdegames/kapman.nix    |   7 +
 pkgs/desktops/kde-4.13/kdegames/katomic.nix   |   7 +
 pkgs/desktops/kde-4.13/kdegames/kblackbox.nix |   7 +
 pkgs/desktops/kde-4.13/kdegames/kblocks.nix   |   7 +
 pkgs/desktops/kde-4.13/kdegames/kbounce.nix   |   7 +
 pkgs/desktops/kde-4.13/kdegames/kbreakout.nix |   7 +
 pkgs/desktops/kde-4.13/kdegames/kdiamond.nix  |   7 +
 .../kde-4.13/kdegames/kfourinline.nix         |   7 +
 .../kde-4.13/kdegames/kgoldrunner.nix         |   7 +
 pkgs/desktops/kde-4.13/kdegames/kigo.nix      |   7 +
 pkgs/desktops/kde-4.13/kdegames/killbots.nix  |   7 +
 pkgs/desktops/kde-4.13/kdegames/kiriki.nix    |   7 +
 .../kde-4.13/kdegames/kjumpingcube.nix        |   7 +
 pkgs/desktops/kde-4.13/kdegames/klickety.nix  |   7 +
 pkgs/desktops/kde-4.13/kdegames/klines.nix    |   7 +
 pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix |   7 +
 pkgs/desktops/kde-4.13/kdegames/kmines.nix    |   7 +
 .../kde-4.13/kdegames/knavalbattle.nix        |   7 +
 pkgs/desktops/kde-4.13/kdegames/knetwalk.nix  |   7 +
 pkgs/desktops/kde-4.13/kdegames/kolf.nix      |   7 +
 pkgs/desktops/kde-4.13/kdegames/kollision.nix |   7 +
 pkgs/desktops/kde-4.13/kdegames/konquest.nix  |   7 +
 pkgs/desktops/kde-4.13/kdegames/kpat.nix      |   7 +
 pkgs/desktops/kde-4.13/kdegames/kreversi.nix  |   7 +
 pkgs/desktops/kde-4.13/kdegames/kshisen.nix   |   7 +
 pkgs/desktops/kde-4.13/kdegames/ksirk.nix     |   7 +
 .../desktops/kde-4.13/kdegames/ksnakeduel.nix |   7 +
 .../desktops/kde-4.13/kdegames/kspaceduel.nix |   7 +
 pkgs/desktops/kde-4.13/kdegames/ksquares.nix  |   7 +
 pkgs/desktops/kde-4.13/kdegames/ksudoku.nix   |   7 +
 .../desktops/kde-4.13/kdegames/ktuberling.nix |   7 +
 pkgs/desktops/kde-4.13/kdegames/kubrick.nix   |   7 +
 .../kde-4.13/kdegames/libkdegames.nix         |   7 +
 .../kde-4.13/kdegames/libkmahjongg.nix        |   7 +
 pkgs/desktops/kde-4.13/kdegames/lskat.nix     |   7 +
 pkgs/desktops/kde-4.13/kdegames/palapeli.nix  |  11 +
 pkgs/desktops/kde-4.13/kdegames/picmi.nix     |   7 +
 .../kde-4.13/kdegraphics/gwenview.nix         |  15 +
 pkgs/desktops/kde-4.13/kdegraphics/kamera.nix |  10 +
 .../kde-4.13/kdegraphics/kcolorchooser.nix    |  10 +
 .../kdegraphics/kdegraphics-mobipocket.nix    |  10 +
 .../kdegraphics-strigi-analyzer.nix           |  10 +
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  13 +
 pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix |  10 +
 .../kde-4.13/kdegraphics/kolourpaint.nix      |  10 +
 pkgs/desktops/kde-4.13/kdegraphics/kruler.nix |  10 +
 .../kde-4.13/kdegraphics/ksaneplugin.nix      |  10 +
 .../kde-4.13/kdegraphics/ksnapshot.nix        |  10 +
 .../kde-4.13/kdegraphics/libkdcraw.nix        |  13 +
 .../kde-4.13/kdegraphics/libkexiv2.nix        |  10 +
 .../desktops/kde-4.13/kdegraphics/libkipi.nix |  10 +
 .../kde-4.13/kdegraphics/libksane.nix         |  10 +
 pkgs/desktops/kde-4.13/kdegraphics/okular.nix |  17 +
 .../desktops/kde-4.13/kdegraphics/svgpart.nix |  10 +
 pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix    |  46 ++
 .../kde-4.13/kdelibs/nepomuk-core.nix         |  20 +
 .../kde-4.13/kdelibs/nepomuk-widgets.nix      |  11 +
 .../kde-4.13/kdemultimedia/audiocd-kio.nix    |   7 +
 .../kde-4.13/kdemultimedia/dragon.nix         |   7 +
 .../kde-4.13/kdemultimedia/ffmpegthumbs.nix   |   7 +
 pkgs/desktops/kde-4.13/kdemultimedia/juk.nix  |  10 +
 pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix |   7 +
 pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix |   7 +
 .../kde-4.13/kdemultimedia/libkcddb.nix       |   8 +
 .../kdemultimedia/libkcompactdisc.nix         |   7 +
 .../kde-4.13/kdemultimedia/mplayerthumbs.nix  |   7 +
 .../kdenetwork/kdenetwork-filesharing.nix     |   9 +
 .../kdenetwork-strigi-analyzers.nix           |   9 +
 pkgs/desktops/kde-4.13/kdenetwork/kget.nix    |  20 +
 pkgs/desktops/kde-4.13/kdenetwork/kopete.nix  |  26 +
 pkgs/desktops/kde-4.13/kdenetwork/kppp.nix    |   9 +
 pkgs/desktops/kde-4.13/kdenetwork/krdc.nix    |   9 +
 pkgs/desktops/kde-4.13/kdenetwork/krfb.nix    |   9 +
 .../kde-4.13/kdenetwork/zeroconf-ioslave.nix  |   9 +
 pkgs/desktops/kde-4.13/kdepim-runtime.nix     |  16 +
 pkgs/desktops/kde-4.13/kdepim.nix             |  28 ++
 pkgs/desktops/kde-4.13/kdepimlibs.nix         |  19 +
 pkgs/desktops/kde-4.13/kdeplasma-addons.nix   |  23 +
 pkgs/desktops/kde-4.13/kdesdk/cervisia.nix    |   9 +
 .../kde-4.13/kdesdk/dolphin-plugins.nix       |  11 +
 .../desktops/kde-4.13/kdesdk/kapptemplate.nix |   9 +
 pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix |   9 +
 .../kde-4.13/kdesdk/kde-dev-scripts.nix       |   9 +
 .../kde-4.13/kdesdk/kde-dev-utils.nix         |  11 +
 .../kde-4.13/kdesdk/kdesdk-kioslaves.nix      |  12 +
 .../kdesdk/kdesdk-strigi-analyzers.nix        |   9 +
 .../kde-4.13/kdesdk/kdesdk-thumbnailers.nix   |  10 +
 pkgs/desktops/kde-4.13/kdesdk/kompare.nix     |   9 +
 .../kde-4.13/kdesdk/libkomparediff2.nix       |   9 +
 pkgs/desktops/kde-4.13/kdesdk/lokalize.nix    |  13 +
 pkgs/desktops/kde-4.13/kdesdk/okteta.nix      |  13 +
 pkgs/desktops/kde-4.13/kdesdk/poxml.nix       |   9 +
 pkgs/desktops/kde-4.13/kdesdk/umbrello.nix    |   9 +
 pkgs/desktops/kde-4.13/kdetoys/amor.nix       |   9 +
 pkgs/desktops/kde-4.13/kdetoys/kteatime.nix   |   9 +
 pkgs/desktops/kde-4.13/kdetoys/ktux.nix       |   9 +
 pkgs/desktops/kde-4.13/kdeutils/ark.nix       |  17 +
 pkgs/desktops/kde-4.13/kdeutils/filelight.nix |   9 +
 pkgs/desktops/kde-4.13/kdeutils/kcalc.nix     |   9 +
 .../kde-4.13/kdeutils/kcharselect.nix         |   9 +
 pkgs/desktops/kde-4.13/kdeutils/kdf.nix       |   9 +
 pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix   |   9 +
 pkgs/desktops/kde-4.13/kdeutils/kgpg.nix      |  10 +
 .../kde-4.13/kdeutils/kremotecontrol.nix      |   9 +
 pkgs/desktops/kde-4.13/kdeutils/ktimer.nix    |   9 +
 .../kde-4.13/kdeutils/kwalletmanager.nix      |   9 +
 .../kde-4.13/kdeutils/print-manager.nix       |  27 ++
 .../kde-4.13/kdeutils/superkaramba.nix        |  11 +
 pkgs/desktops/kde-4.13/kdeutils/sweeper.nix   |   9 +
 .../kde-4.13/kdewebdev/kfilereplace.nix       |  10 +
 .../kde-4.13/kdewebdev/kimagemapeditor.nix    |  10 +
 .../kde-4.13/kdewebdev/klinkstatus.nix        |  13 +
 .../desktops/kde-4.13/kdewebdev/kommander.nix |   9 +
 pkgs/desktops/kde-4.13/l10n/default.nix       |  46 ++
 pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh  |  32 ++
 .../kde-4.13/l10n/manifest-4.12.4.nix         | 262 +++++++++++
 pkgs/desktops/kde-4.13/oxygen-icons.nix       |  15 +
 .../kde-4.13/support/akonadi/default.nix      |  24 +
 pkgs/top-level/all-packages.nix               |  11 +-
 189 files changed, 3164 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/desktops/kde-4.13/applications/kate.nix
 create mode 100644 pkgs/desktops/kde-4.13/applications/konsole.nix
 create mode 100644 pkgs/desktops/kde-4.13/default.nix
 create mode 100644 pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch
 create mode 100644 pkgs/desktops/kde-4.13/files/polkit-install.patch
 create mode 100644 pkgs/desktops/kde-4.13/kactivities.nix
 create mode 100644 pkgs/desktops/kde-4.13/kde-base-artwork.nix
 create mode 100644 pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix
 create mode 100644 pkgs/desktops/kde-4.13/kde-package/4.12.4.nix
 create mode 100644 pkgs/desktops/kde-4.13/kde-package/default.nix
 create mode 100755 pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
 create mode 100644 pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt
 create mode 100644 pkgs/desktops/kde-4.13/kde-runtime.nix
 create mode 100644 pkgs/desktops/kde-4.13/kde-wallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kde-workspace.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeadmin/kcron.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeadmin/kuser.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/styles.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/perlqt.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/pykde4.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/qtruby.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokegen.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokekde.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/analitza.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/blinken.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/cantor.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kanagram.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kbruch.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kgeography.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/khangman.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kig.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kiten.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/klettres.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kmplot.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kstars.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/ktouch.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kturtle.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/marble.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/pairs.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/parley.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/rocs.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/step.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/bomber.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/bovo.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/granatier.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kajongg.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kapman.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/katomic.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kblackbox.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kblocks.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kbounce.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kbreakout.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kdiamond.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kfourinline.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kigo.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/killbots.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kiriki.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/klickety.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/klines.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kmines.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/knetwalk.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kolf.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kollision.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/konquest.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kpat.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kreversi.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kshisen.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/ksirk.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/ksquares.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/ksudoku.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/ktuberling.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/kubrick.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/libkdegames.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/lskat.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/palapeli.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegames/picmi.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kamera.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kruler.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libksane.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/okular.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/juk.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kget.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kopete.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kppp.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/krdc.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/krfb.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdepim-runtime.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdepim.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdepimlibs.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeplasma-addons.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/cervisia.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/kompare.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/lokalize.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/okteta.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/poxml.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdesdk/umbrello.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdetoys/amor.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdetoys/kteatime.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdetoys/ktux.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/ark.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/filelight.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/kcalc.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/kdf.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/kgpg.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/ktimer.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/print-manager.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeutils/sweeper.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdewebdev/kommander.nix
 create mode 100644 pkgs/desktops/kde-4.13/l10n/default.nix
 create mode 100755 pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
 create mode 100644 pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix
 create mode 100644 pkgs/desktops/kde-4.13/oxygen-icons.nix
 create mode 100644 pkgs/desktops/kde-4.13/support/akonadi/default.nix

diff --git a/pkgs/desktops/kde-4.13/applications/kate.nix b/pkgs/desktops/kde-4.13/applications/kate.nix
new file mode 100644
index 00000000000..63bfa12c4bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/applications/kate.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}:
+
+kde {
+
+  buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ];
+
+  meta = {
+    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/applications/konsole.nix b/pkgs/desktops/kde-4.13/applications/konsole.nix
new file mode 100644
index 00000000000..0db47fb2d7c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/applications/konsole.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+  buildInputs = [ kdelibs kde_baseapps ];
+
+  meta = {
+    description = "Konsole, the KDE terminal emulator";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/default.nix b/pkgs/desktops/kde-4.13/default.nix
new file mode 100644
index 00000000000..ffcd3115de7
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/default.nix
@@ -0,0 +1,44 @@
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.4" }:
+
+let
+  branch = "4.12";
+
+  # Need callPackageOrig to avoid infinite cycle
+  kde = callPackageOrig ./kde-package {
+    inherit release branch ignoreList extraSubpkgs callPackage;
+  };
+
+  # The list of igored individual modules
+  ignoreList = {
+    # Doesn't work yet
+    kdeutils = [ "ksecrets" ];
+    # kdeadmin/strigi-analyzer has no real code
+    kdeadmin = [ "strigi-analyzer" ];
+    # Most of kdebindings do not compile due to a bug in the buildsystem
+    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
+  };
+
+  # Extra subpackages in the manifest format
+  extraSubpkgs = {};
+
+in
+
+kde.modules // kde.individual //
+{
+  inherit (kde) manifest modules individual splittedModuleList;
+
+  akonadi = callPackage ./support/akonadi { };
+
+  qt4 = qt48;
+
+  kdebase_workspace = kde.modules.kde_workspace;
+
+  inherit release;
+
+  full = stdenv.lib.attrValues kde.modules;
+
+  l10n = callPackage ./l10n {
+    inherit release branch;
+    inherit (kde.manifest) stable;
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch
new file mode 100644
index 00000000000..378cdb64694
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d3e247..f78db67 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,10 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
++project(kde-wallpapers NONE)
++if( WALLPAPER_INSTALL_DIR )
++  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
++else()
++  find_package(KDE4 REQUIRED)
++  include(KDE4Defaults)
++endif()
+ 
+ install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
+ 
diff --git a/pkgs/desktops/kde-4.13/files/polkit-install.patch b/pkgs/desktops/kde-4.13/files/polkit-install.patch
new file mode 100644
index 00000000000..d2ecac663ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/files/polkit-install.patch
@@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
++++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+ 
+-    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
++    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
+         "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.13/kactivities.nix b/pkgs/desktops/kde-4.13/kactivities.nix
new file mode 100644
index 00000000000..06381bb13d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kactivities.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "KDE activities library and daemon";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kde-base-artwork.nix b/pkgs/desktops/kde-4.13/kde-base-artwork.nix
new file mode 100644
index 00000000000..3f416cebddc
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-base-artwork.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs }:
+
+kde {
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Base artwork";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix
new file mode 100644
index 00000000000..c2a25664678
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, htmlTidy, kactivities
+, nepomuk_core, nepomuk_widgets, libXt }:
+
+kde {
+  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
+
+  meta = {
+    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kde-package/4.12.4.nix b/pkgs/desktops/kde-4.13/kde-package/4.12.4.nix
new file mode 100644
index 00000000000..9b5a53cee48
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-package/4.12.4.nix
@@ -0,0 +1,444 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="amor";value="0c8298z7c3a71yj6nik7h8h7rngqzrz6rc95kl990p37jp2ng0d9";}
+  {name="analitza";value="0l122nh81nf7r4bm73gc6dp9k4jh2dxc7majrzjq37hb8pi77njh";}
+  {name="ark";value="155bhqqyw3afm99c47b3pxqf9fiqcz6gqg1pavsx9q4rmk7rp8m6";}
+  {name="audiocd-kio";value="1c5234s1hdh6jc8szyb4nwqr1h8hhwlmin0iyxabsl0c45pss9pa";}
+  {name="blinken";value="0q0y3xfv3pjrw0h8mnbigpywwrqk8wb2lqbjcgk755j6syinhphh";}
+  {name="bomber";value="1f12qmg58n9sj6vjqdj57ch50pq5f0h6anx06x9bhhs502w6aqwy";}
+  {name="bovo";value="10x4qy4vdp76iv3n60iy24lk1wbsjdfr88l1m9xifj4k942wk2ir";}
+  {name="cantor";value="1x5rxshdbgl40cqx6h5r0hx49rrc6gwnabsl8b7kzimh0kbv2ma9";}
+  {name="cervisia";value="0ia78cjkq606232jy14ps7cpm77pq4xdmcfimv4l6p0xjpq8jzsg";}
+  {name="dolphin-plugins";value="08h278jpbll7wc1mhz58cklj1bkrk61dfwjlflag6fnlm6i4xx8k";}
+  {name="dragon";value="16gyr0dl50nl9r3yc2fkwmqlrfgzzyim6bdlb9a76winzbz8mgxr";}
+  {name="ffmpegthumbs";value="01cmwm6w1z2gsllwdmrzsl9882fw5k59lr1k7z114kkrh1l0b2j4";}
+  {name="filelight";value="01rs1r80ixm1dj5d73a22893rdz2srxqp4dv5pysw1fhn02zdkkf";}
+  {name="granatier";value="1ia85yxfbbi8qxdyn0vwgmdjrxwssb6nadbia1yqsjdncfsnhbvs";}
+  {name="gwenview";value="01p5b1z05v3c7f192fxrrfp6x3ss7gx8pxv29czkp641hpmcg3jl";}
+  {name="jovie";value="1hfkj3vlvm63sgb4gx3xl7nksb5cfqnh7shs7wqm3gl6yj2rwhjj";}
+  {name="juk";value="1vxnrxz6gbyk7fd15akhiyczpgq03cym3nldi61m958cx4khd4y7";}
+  {name="kaccessible";value="0a9r2bk8a5h7mpl37li3bqbsz5dfgn8rsxnri93msvc6555pnyzv";}
+  {name="kactivities";value="1fl638cyj3abxfmbqcfqsd3idmdmys1xim4flf1jpbqa29psl75j";}
+  {name="kajongg";value="19awqjqn9hqhprzi7mjb6nkrgvb3mzhignkgalfjd4j5rga7vzz0";}
+  {name="kalgebra";value="1bj88nh7znk86i6a4d3jcjyqp46kzipfc99xvhxvqdsy8drbrwjp";}
+  {name="kalzium";value="00pjpdbd11jgzs443kgh8y6pxf3ff0ypgl5j3zfa6gbj18cnkkq0";}
+  {name="kamera";value="12mcjw8l0nh2jbi04myx1y1irbf92x9bx93gdymw939lawaalqic";}
+  {name="kanagram";value="1yd5agh61nv4ajlrijxg5g3hvw0xjxdvnc6h3lbz5mgvc8smvazk";}
+  {name="kapman";value="1aa78q6y2s9dig2603b9nry5rx5jbbxz2pb3jxr323hmqxp6jy1z";}
+  {name="kapptemplate";value="08j8xh9spk6ymlichl74n1v2zn342d94m6f4jragnx2jvif2163k";}
+  {name="kate";value="1cxc9bgzvfpns7dhmmafzxhnyjqxyq0adr0l1mbwsahxpkblc30r";}
+  {name="katomic";value="01lk7ajlj98rjbs76xd9r3hnd98dy49xv809m2zchm5ria7hdh48";}
+  {name="kblackbox";value="1sgbs0flllmy6d3518wwnzmdr14kqkxsi76h2p4xyk3bq2g9q2xg";}
+  {name="kblocks";value="1zinpxbvri52r26qiiiv4j4r02a22947hcrchf1z3n6lf817vqwv";}
+  {name="kbounce";value="0f9ssdpicvkiv7dxnj75h1cmz24mz2sy2zyp7rw7mvr9ynnl8w21";}
+  {name="kbreakout";value="02ix39kfkagmsqs8icqrqy9cz90lbl2wqajyjzrshw1vi29iahc7";}
+  {name="kbruch";value="0mfqdgwd5d8sy3bdiicpd5927dgg6zhm521f2q853qd2sqjbspgl";}
+  {name="kcachegrind";value="0dydarm1a2i64nazcl59s0a8b8z7znnm20wdmx2gfm5377j98y8x";}
+  {name="kcalc";value="1znrv4fqwaf56djf9qg6fxcp7nfi7fzza2whjlkayvc9kxv3ah9y";}
+  {name="kcharselect";value="0mbl9zvb9hp0xdi58v0vb8z0by71xkz22pr9flnkar5b1klnjpdb";}
+  {name="kcolorchooser";value="1d1cyaqi0rhwfnmjbxpjjavgwjhr3pd2rywlxxb9g4q3rv8k7wg5";}
+  {name="kcron";value="033f0s14crqpsirhgysi309b9pj02vwsd7fr28n6n2sh5imj30a0";}
+  {name="kdeartwork";value="08snjhaqiddiaj5jfd0vx1fjijsyqwngy7p1mkpdfhj7575sbx7c";}
+  {name="kde-baseapps";value="0k0mfbpvmv0n2brrb8hc0rd1wz04m3cyr1byb0z34a7x7kk1h1i4";}
+  {name="kde-base-artwork";value="0vmkbmir7hviqkv7nqrbqd6skj2srp9w4nrs8rkcvq7c8n76rk5w";}
+  {name="kde-dev-scripts";value="0l5frvb1akhy86j3yic3n1jirclj8r1jwjn760fi89vl1xysrarq";}
+  {name="kde-dev-utils";value="0807c8mq8rqqk8vf9r1idqmqrlfv9bsc8rjn8mfv2ch49mzzdrdj";}
+  {name="kdegraphics-mobipocket";value="1m6lnkr460261iq634lz887dbhvmj56p97k4llch3h80ra10mlh8";}
+  {name="kdegraphics-strigi-analyzer";value="1rqb1lzqb39p95xpf8c26pm9rxhcmycd518hxzp8arz6k2chazj8";}
+  {name="kdegraphics-thumbnailers";value="04aaxjznb176ym89f06gp4bycg67zndwc451mkdr33mal58jh0zs";}
+  {name="kdelibs";value="0dn0z1fs4vym7cp2749viw171dhay9ql2dp65a4hphmsdmk9bzv4";}
+  {name="kdenetwork-filesharing";value="1r3a5y9nmcf06nqsdh8k4jny7dmrhya8xi3jwz0d1mfzlfjksyf7";}
+  {name="kdenetwork-strigi-analyzers";value="0gqj5b91q3l5hna6zbgm17wi54g7g058n605adc1mch97yshqyrd";}
+  {name="kdepim";value="00lsyg6762kd2qvhhqq6vrrrl1fbk07yd3ha8w1yyjwiy9cnsy7z";}
+  {name="kdepimlibs";value="1h7k5ravilwz9r5lh7dqjnzh9h8hz43plbdaicjwk2sg4mqwzzhh";}
+  {name="kdepim-runtime";value="1z631kag1gpmk2ljk64vhscr3lad3mj3599phh0i8jqlxvr4007c";}
+  {name="kdeplasma-addons";value="0lfza3454hzbicqpz0ipjys9brjkblmpsngqg5njxd6ph9mzg34a";}
+  {name="kde-runtime";value="05n5cllsjyf03bgisykrbc74i7a3nm5f0k6hnq9sphf8xnxl318x";}
+  {name="kdesdk-kioslaves";value="045kf44s2gg3i2xl6087zn3cz80y7li26fzxdvvv89ywcq0npg59";}
+  {name="kdesdk-strigi-analyzers";value="15xxpgiy5bp6m78crw448mzv3yijjzipsrybadrbwqz6p7dpysbv";}
+  {name="kdesdk-thumbnailers";value="039rgq5p4mkdrilcvkf6k1d9d45swk74hdg3qnsbz3m47vqqf92h";}
+  {name="kde-wallpapers";value="0z7ffz2i410k2xxl1cr8m74mm90c5sizpbhmhyqxwjlsbz1gwfya";}
+  {name="kdewebdev";value="0ljwbzdcshjaz2dv7yp4ckj0c0jxa60ka6vjbhdmc4x7nvwnx737";}
+  {name="kdf";value="0s8ms5h5gdfa3697xg1yzz0h2hijlv68gi2g7n7g3xwpawbqrzv1";}
+  {name="kdiamond";value="10v7zrj4d96ppawjib1jgdz00455h8334w4vb619g448pj5h66sn";}
+  {name="kfloppy";value="1fd7wwbxngaiy0fbxvqp027rp61jg8fwajz70lx7acs20kcs0301";}
+  {name="kfourinline";value="1s2gc7zk932ks89c24pyimcsspnmabbmsdjh520xkzzxrp41gz0b";}
+  {name="kgamma";value="0n19zrarda9fvhimgnm84mdcaqgcqn4qfr0yw6i76la24pjbl46y";}
+  {name="kgeography";value="0w32841fligd3gyjl34q2f31jldw2vl47bi6cljwp7nlkdlp0lkn";}
+  {name="kget";value="1kls245b5s2dlxcrpa4d969zlr2lw797p7p2ilyhb4rbv871c0wd";}
+  {name="kgoldrunner";value="10xq9827gwib6w9h4hhys1v896rxqd50mz66k3frnrqals04zbbk";}
+  {name="kgpg";value="1wa5ymibiqnjxl5ck94y1xh3qk0bx3v7k7n2y3jcvprmhglffx6j";}
+  {name="khangman";value="1jfi30cb17gkn7v3i42wj0pqgaq3mr4fjbwh60ikvhxxd0nf5nny";}
+  {name="kig";value="1z0f50m1hgr5jj79v5v610bdggy4knlqnbxpnwf6ihj60v3cn0x0";}
+  {name="kigo";value="1klcgh3bpl3gqyh5zvij7ah754wjjf409a9l1xqxjigz4samnism";}
+  {name="killbots";value="04vy4zybgqls4whymqnzgkfbmzb17cc1m2xf2hp32bq5fq0r8103";}
+  {name="kimono";value="1bqbgch1z2nm143sp4lwnh3swvmvavhkj4scgx6d17m24jgd69hn";}
+  {name="kiriki";value="04r7p5f9a2iwv7c40pcnbga5ldcfjjig31fx81ww0b6p62dv2vrl";}
+  {name="kiten";value="1fxyy805b1q2sxdkd0hq2fr6plbnawzyascsbwychsqsasw2rmng";}
+  {name="kjumpingcube";value="0q2hn6lvz5grwz10nqq5jkcg3j1lgqsmmmhmx0glr4c732hg1z1d";}
+  {name="klettres";value="1w4340gaaip8imwy5d0058600v6fi7wnifppay2l7kvlp09iwmws";}
+  {name="klickety";value="088xvrb1jn8f3cfh39387pzw9simrjan63c24hn76290fkqjadgq";}
+  {name="klines";value="0n3bsvf5skr4816mjrd7zqjnh8vp5klvgx3h0025hwcbqyfa64bs";}
+  {name="kmag";value="0x91b1fwvwppiwzsnvc0647429ffhn56gndykmmyzr27i45znk3r";}
+  {name="kmahjongg";value="19qz7q5sr5xphzwxjf84h5vg0fll45fvs3pi5q9a5x5g4dy14wsv";}
+  {name="kmines";value="1nm7di7xs727jvfvv2039hpgkxzddgfv6vvrw3jwls975akl1wmb";}
+  {name="kmix";value="19s9z6m1v3wk5prngmm612r34013z7dkira83ap6kn3v32cfciry";}
+  {name="kmousetool";value="1zf7d3k1jf5ydaiw7v7a34hd5w4fmgkd4g9427546x64n27vx0a2";}
+  {name="kmouth";value="12n1x1imy7w3rn8g8zawmfivic0avzgrpmwm71hy7kxw9ya24yjg";}
+  {name="kmplot";value="1zji3lkq332zgvccnlisdavwxh0d1x81131xcy25r36q9c42syj3";}
+  {name="knavalbattle";value="0ibbahwck80z1dhycvm52k4nnj0pifzf9vi7j64kczc54z20b6d2";}
+  {name="knetwalk";value="0j8lyv60rvs5w214vhpmkf0807vi8b2vc8lglmmvz66cpw42c45z";}
+  {name="kolf";value="060dmnpr84g1512l0c0myxf1h1qp4jdsfgnxg5vwpciqk0dc9qhy";}
+  {name="kollision";value="033x8dg57f5amsnignri6ln8adavbaw1l3sydlf0jrw7ww3qvw1h";}
+  {name="kolourpaint";value="0c7i95cplwvxxm6aqgsk70q8ny8yfarcah9113vk6b81llbwn5sc";}
+  {name="kompare";value="0mq2v9nissb5s41lwvjbpba6fznkzwah9a7yisjq1nq47rp4ymqb";}
+  {name="konquest";value="0bsqxr12x9qgk4al21s2hrm48hv15ir98792z8jna3d5w6j0a2zy";}
+  {name="konsole";value="13kv6pmziqfis4qxkfxbmm3yiy2w3fy2l2qi68l0s6yiaqkd9y37";}
+  {name="kopete";value="012zjq0zmqkgahnzzj02xaqhsh800bn1x7sj8vmv1mxqyi66srvy";}
+  {name="korundum";value="1qyk8gvzcjwi5pi7s0a74glyvi1mi7k5z5ilza16y0z5k6ffgvck";}
+  {name="kpat";value="0lmhygv4l1vkmbf7vmrbns6fl1anbcxsnldn0hccdpp73x1py88g";}
+  {name="kppp";value="0nnz137c384xlnrvy625zdjfzzrp6yrcfnn9gw6fs81cq4zwrr64";}
+  {name="krdc";value="0g7p94q0h3i3j9wwcmmiylz0604v4z9f0b2dppfiaq5bnz9m5pdl";}
+  {name="kremotecontrol";value="1hg4fq6ypws4zb07glsrflmr7vq35h7qqmjf5r5b5j53xqmgr6hp";}
+  {name="kreversi";value="059xsi9x6jhsdsgrxrk08haz1v4p4i46l7zkg8id64s9kvywgn5j";}
+  {name="krfb";value="01l8jv5ad3gc5kxjbr7k4ggcipc5903z82pq9616mk0qpd96j6jb";}
+  {name="kross-interpreters";value="0cdb9kaq9fdjaxks83z3gvjwwhz94g4kgjq1rp6wmzwydk28ip6i";}
+  {name="kruler";value="0i9n2znhm6llriipvrrjh8yymj76a17895w7kbcyd41srk0akk5i";}
+  {name="ksaneplugin";value="1fqkbf47ajw7ckzipphdjpnpv4gk426k1rpq3z1qlbag9f9wvxsd";}
+  {name="kscd";value="1f8099bhylrr5m3a5lrmjxz2rz59k3qi1abfjs63hk2z523p99n3";}
+  {name="kshisen";value="1nhq2rxiylzr7klpqqbhl35v7s4prv15wrckgx84mdm5hmyh4nsw";}
+  {name="ksirk";value="0s577h7sswqr44mzmm2a5gi62w8lpzivy9xy5jpib3iw768a9gxy";}
+  {name="ksnakeduel";value="09jp1cd138cqv131h7m3c994zwxbn97yw77fq1yrcfgyspmdx0x9";}
+  {name="ksnapshot";value="1fiqracij106c22b0ws6n047wn4fww5fzli8rqjas5m25931azl4";}
+  {name="kspaceduel";value="1a2n9kyn6y62yps5apclgpmzbchdrfn3lck9fl68alk0bpqdnz1n";}
+  {name="ksquares";value="1bg9na03ph1lignnl6fdxkvcbsq77dskbgn8d7hyq1p800n7jx7q";}
+  {name="kstars";value="1wf13434sxxwikrp29jl5klggmv0ln73a57rs0m4gr4zrjvbrs2s";}
+  {name="ksudoku";value="1nq4nj1q723s7gv1d0l3wafs2d6wz67xhir2sa1wsw12dzh856vf";}
+  {name="ksystemlog";value="0khb92vxr0hfny2yxwnww33ahgm9gmmrf5h7qaj0lqnyrh5fcl6c";}
+  {name="kteatime";value="13jzf4mcq8glkhg5szpawj2k0ss4qfzrjhpmjn3m3grz1zf167sw";}
+  {name="ktimer";value="0y6q9khxlmb7pgds4f9a83aqnbn0gwbi3r15s8vf72qr3qj3f5xc";}
+  {name="ktouch";value="1swdkzvm9q4r8ily7n4cs91y186zlzys7kjs3lf2q46d63l9nfdz";}
+  {name="ktuberling";value="0fzd17hvb2zaqwd0fw6f3rq0mlq8xrmz155dyg916jg2alslicxh";}
+  {name="kturtle";value="1hlfv77g0v48qfqwpqqnw5qf8fcl4v38612v3jy5z038g4sacxkx";}
+  {name="ktux";value="0shib3f2gcdgf88zh2w67kizbmj7gz0vqy8ff5vmr75fp44111b4";}
+  {name="kubrick";value="1dkd7rzkxyk71hd4r9l6nlvcl3zj8vf6i9v1gqi8zjrqwpxvf188";}
+  {name="kuser";value="1qc4wk5q9y7mmkfjqndcby7782z2aaj7x1cc4dcmds01glm2bw6j";}
+  {name="kwalletmanager";value="1f0ncnx3d6z3v373095nhydj844hiva64qh80cc7rmb624vlcsa4";}
+  {name="kwordquiz";value="1m0zi0gldw7shjy4nhiw2azgrfvhcmm5h423gckjczpqd9f17ihd";}
+  {name="libkcddb";value="0k1xr8z3dmfq08qh7fkjhi2v523lhy1inmggnk3gaxzarlvhqxxa";}
+  {name="libkcompactdisc";value="03ch51firb2xcqwy3p6q5j5zr9570nvqa5cgd5yj7pjnzdwcjxv8";}
+  {name="libkdcraw";value="1ypamhdk8y7vb9y250vilmv5dgxf1svvsw329yxc146ii0pb4nwr";}
+  {name="libkdeedu";value="0m20vxa9x2ww7xmq1a7j4pmqsdj5pp05hsg4q64slz69m5npi30r";}
+  {name="libkdegames";value="1hz02x2k7iiw0i78ifa4ji60l87by855v5f6pm3ksw3rdw0ipz9v";}
+  {name="libkexiv2";value="0mz88j3kszqxf518h7n0fjnql2iqwx780hv4jhvrkraclf4czng9";}
+  {name="libkipi";value="0x4d356c20fdjaqadzaqhsf43v9c9bgbwbyy304q2w329m8ab058";}
+  {name="libkmahjongg";value="0911knwvhwa77hr0ncqwjqzfcyvgi806ckyldglrhvm0gw0mgy60";}
+  {name="libkomparediff2";value="0rn5xhbnywjjbk9qx3xw3gss57l105a4a4v05gh9vvl82hc5sfzx";}
+  {name="libksane";value="19zibd1y96sxwnpdxkd752jiky83b8is85qi7six60g5kkzi948m";}
+  {name="lokalize";value="0sl9i146rx0ls3rii6893alkvsjv8ln0d5yabd72f8kagsaw42h7";}
+  {name="lskat";value="1flx7l8svf51fkr3lw0z85d0gkrabjzi73w4qn2wnsaz9wr6kahi";}
+  {name="marble";value="1gvlq0si76bk4yd8dfbixzwxj618ifd2jlr7fq6f9mx498cvifpi";}
+  {name="mplayerthumbs";value="1nw01216mghwxz7zhkf7px5kkb2d4dqdk7par20agvw2raan9axi";}
+  {name="nepomuk-core";value="0gavipa1hn5aw77q3xrdv9464l8qpabq6kawlvjvv90hjvs8clis";}
+  {name="nepomuk-widgets";value="1cr4v4s567vcx1046gj066xfmhrqx4g6lipffr6d3wdq9cgy5y5i";}
+  {name="okteta";value="0maadxyngj8an0hl3kidvmgj538n6vzpz964yilzj6qrry9f46wc";}
+  {name="okular";value="0cmcaqpaxx8910qmsvag6spjbchdbv6j9hgbizw6qq09kz4d9a7k";}
+  {name="oxygen-icons";value="00l7qy95za3c323hkjiihavmq2vjm2yi81yn4cgwpnc5l336pynb";}
+  {name="pairs";value="15kafhp54dsrv2466j9gnn0c8iqbfx4frrql0r6v5qza015vybr9";}
+  {name="palapeli";value="0bx7qqidywxwkj9vdbzpqsy2fvkjgf9vj8nqk5ypx7jm7da87y94";}
+  {name="parley";value="163xnfd9h8r6dp3riqs3s32qaramyf225bhy6y9laknbrr9lxnsm";}
+  {name="perlkde";value="05ybh43ckfq5qh03pklkgiajc2s6b6cmvp5alx0dvq605h5z881f";}
+  {name="perlqt";value="1fn3gxb8b4kx7g24pnrbg42dv17hn2wv70g53yfr6z277ljinxzl";}
+  {name="picmi";value="19gli6mii15qya9hi6qyb52rsk2n2dk6r4kzla99ps3cs8n4h9x8";}
+  {name="poxml";value="11cwhjil8vdwwpmp1l61335b5j9714hbxiyqw0wyxcr6yccasbdf";}
+  {name="print-manager";value="0v940bsksw04ymxq56lgm6sprkdlyzjm5fgsm24yb564nay3x42h";}
+  {name="pykde4";value="00gpjqgsfv83xfk1xmglr8c32ln9cc05m4nf1qbd3gvr5jb6cxmg";}
+  {name="qtruby";value="1312v8vn091q5lh81cm5z5wkgidigdngqkjs3kf7lp9d1k50ai47";}
+  {name="qyoto";value="0sjii1i31x1cxhr5y5ijaain9ql75fbba9ss1cxz9agswp95kpcz";}
+  {name="rocs";value="0h72mrb65gnk36g9d4l55bm7kfldh3v95hbv0wxad0p9v7baxmn2";}
+  {name="smokegen";value="0x4qz1pk8wn4vq0fmy344v9m1gh12dav3n71z6xi4pnpmpmq7kna";}
+  {name="smokekde";value="1wl88jy9yvvrykzknj1vy7rqhfxr52q053y2jmay53hvx1iaqjxm";}
+  {name="smokeqt";value="1lphdjxcvysn1lkq6yj7z5pmhzlwpkj3xx7izfdk1g6a1pkjwr7j";}
+  {name="step";value="0ma7748ixi00zw9hrjjlgbb7d1a4cr124ka3ymn45sa4q4mza3zh";}
+  {name="superkaramba";value="0xbs2k863p2yg2k7wn70gbwvriin4lv2hv78r5m6fwvb4rsjygsb";}
+  {name="svgpart";value="1svwqxcxl2wp4wq9s3q6crys7jmz072wp4qz69fvqcvp1cd92gsp";}
+  {name="sweeper";value="19lsqw192h3863fbd265didviy7m4wk6qwfgnhc7sxaxxccm19y4";}
+  {name="umbrello";value="0lmygjjsqiw0xnv4d3d1yb1b5zlnj18lh01k954ycl8f50cxsv9a";}
+  {name="zeroconf-ioslave";value="1324mx9gsr6ghi7m1qk4kwr91g8wfd3jsw3rzp26nhrlwjsa5j6a";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  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="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdenetwork";
+  split=true;
+  pkgs=[
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+    { name="zeroconf-ioslave";  }
+    { name="kget";  }
+    { name="kopete";  }
+    { name="kppp";  }
+    { name="krdc";  }
+    { name="krfb";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwalletmanager";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdetoys";
+  split=true;
+  pkgs=[
+    { name="amor";  }
+    { name="kteatime";  }
+    { name="ktux";  }
+  ];
+}
+{
+  module="kdesdk";
+  split=true;
+  pkgs=[
+    { name="cervisia";  }
+    { name="dolphin-plugins"; sane="dolphin_plugins"; }
+    { name="kapptemplate";  }
+    { name="kcachegrind";  }
+    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+    { name="kde-dev-utils"; sane="kde_dev_utils"; }
+    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+    { name="kompare";  }
+    { name="libkomparediff2";  }
+    { name="lokalize";  }
+    { name="okteta";  }
+    { name="poxml";  }
+    { name="umbrello";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  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="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdeadmin";
+  split=true;
+  pkgs=[
+    { name="kcron";  }
+    { name="ksystemlog";  }
+    { name="kuser";  }
+  ];
+}
+{
+  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="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs";  split=false;}
+{ 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="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.13/kde-package/default.nix b/pkgs/desktops/kde-4.13/kde-package/default.nix
new file mode 100644
index 00000000000..6b4e1ba0ad8
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-package/default.nix
@@ -0,0 +1,129 @@
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
+, release, branch, ignoreList, extraSubpkgs
+}:
+
+let
+  inherit (stdenv.lib) filter fold;
+  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
+in
+rec {
+  manifest = import (./. + "/${release}.nix");
+
+  # src attribute for $name tarball
+  kdesrc = name: fetchurl {
+    url = "mirror://kde/" + (if manifest.stable then "" else "un")
+      + "stable/${release}/src/${name}-${release}.tar.xz";
+    sha256 = getAttr name manifest.hashes;
+  };
+
+  # Default meta attribute
+  defMeta = {
+    homepage = http://www.kde.org;
+    inherit branch;
+    platforms = stdenv.lib.platforms.linux;
+    inherit (qt4.meta) maintainers;
+  };
+
+  # KDE package built from the whole tarball
+  # This function is used both for monolithic modules and modules which are
+  # released as individual tarballs
+  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, version ? release, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${version}";
+      src = kdesrc name;
+      meta = defMeta // meta;
+      enableParallelBuilding = true;
+    } // (removeAttrs a [ "meta" "name" ]));
+
+  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
+  # API.
+  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
+
+  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
+  kdeSubdirPkg = module:
+    {name, subdir ? name, sane ? name}:
+    let name_ = name; in
+    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${release}";
+      src = kdesrc module;
+      cmakeFlags =
+        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+          "-DBUILD_doc=TRUE"
+          "-DBUILD_${subdir}=TRUE"
+        ] ++ cmakeFlags;
+      meta = defMeta // meta;
+      enableParallelBuilding = module.enableParallelBuilding or true;
+    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
+
+  # A KDE monolithic module
+  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
+
+  # Combine packages in one module.
+  # Arguments:
+  #  * pkgFun --- a function of the following signature:
+  #               module: manifest_attrs: manual_attrs: derivation;
+  #  * module --- name of the module
+  #  * pkgs --- list of packages in manifest format
+  combinePkgs = pkgFun: module: pkgs:
+    let
+      f = p@{name, ...}:
+        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
+      list = map f pkgs;
+      attrs = listToAttrs (map
+        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
+        pkgs);
+    in
+      runCommand "${module}-${release}"
+      ({passthru = attrs // {
+         propagatedUserEnvPackages = list;
+         projects = attrs;
+       };})
+        ''
+          mkdir -pv $out/nix-support
+          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
+        '';
+
+  # Given manifest module data, return the module
+  kdeModule = { module, sane ? module, split, pkgs ? [] }:
+    let
+      pkgs_ = filterPkgs module pkgs;
+    in
+    # Module is splitted by upstream
+    if split then combinePkgs kdeSplittedPkg module pkgs_
+    # Monolithic module
+    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
+    # Module is splitted by us
+    else combinePkgs kdeSubdirPkg module pkgs_;
+
+  # The same, as nameValuePair with sane name
+  kdeModuleNV = a@{ module, sane ? module, ... }:
+    { name = sane; value = kdeModule a; };
+
+  filterPkgs = module: (p:
+      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
+      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
+
+  # Remove attrsets with x.name in subst. Optimized for empty subst.
+  removeNames = subst: big:
+    fold (s: out: filter (x: x.name != s) out) big subst;
+
+  modules = listToAttrs (map kdeModuleNV manifest.modules);
+
+  splittedModuleList =
+    let
+      splitted = filter (a: a ? pkgs) manifest.modules;
+      names = map ({module, sane ? module, ...}: sane) splitted;
+    in
+    map (m: m.projects) (stdenv.lib.attrVals names modules);
+
+  individual =
+    stdenv.lib.zipAttrsWith
+    (
+      name: list:
+      if tail list == []
+      then head list
+      else abort "Multiple modules define ${name}"
+    )
+    splittedModuleList;
+}
diff --git a/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
new file mode 100755
index 00000000000..e964ce3ddc1
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
@@ -0,0 +1,146 @@
+#! /bin/sh
+
+# Usage: download kde release to $dir, then run
+# $0 $dir
+
+dir="$1"
+
+# Detect release number & whether it is a stable release
+if [[ ! -d "${dir}" ]]; then
+  echo "${dir} is not a directory (or doesn't exist)!" >&2
+  exit 1
+fi
+
+release=$(ls "${dir}"/kdelibs-*.tar.xz | \
+  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
+
+if [[ ${release##*.} -gt 50 ]]; then
+  stable="false"
+else
+  stable="true"
+fi
+
+echo "Detected release ${release}" >&2
+
+declare -A hash
+declare -A modules
+declare -a packages
+declare -a top_level
+
+# xsltproc output declares -A module
+if [[ ! -f kde_projects.xml ]]; then
+  curl -O -J http://projects.kde.org/kde_projects.xml
+fi
+eval `xsltproc kde-submodules.xslt kde_projects.xml`
+
+module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
+
+print_sane() {
+  echo "Called print_sane $1" >&2
+  sane="${1//[^a-z0-9_]/_}"
+  if [[ "$sane" != "$1" ]]; then
+    echo "Sane version is $sane" >&2
+    echo -n "sane=\"$sane\";"
+  fi
+}
+
+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}")
+  echo -n ${hash[$package]} >&2
+
+  if [ -n "${module[$package]}" ]; then
+    m="${module[$package]}"
+    echo " (${m})" >&2
+    modules[$m]=1
+  else
+    top_level+=( "$package" )
+    echo " (top-level)" >&2
+  fi
+  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
+done
+
+
+print_pkg_hash() {
+  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
+}
+
+print_hashes(){
+  echo "hashes=builtins.listToAttrs["
+  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
+  echo "];"
+}
+
+print_split_module(){
+  echo -n "$1:" >&2
+  echo -e "{\n  module=\"$1\";"
+  print_sane "$1"
+  echo "  split=true;"
+  echo "  pkgs=["
+  for p in "${packages[@]}"; do
+    if [[ "${module[$p]}" == "$1" ]]; then
+      echo -n "    { name=\"$p\"; "
+      print_sane "$p"
+      echo " }"
+      echo -n " $p" >&2
+    fi
+  done
+  echo "  ];"
+  echo "}"
+  echo >&2
+}
+
+print_mono_module(){
+  echo -en "{ module=\"$1\"; "
+  print_sane "$1"
+  echo -n "$1 ... " >&2
+  echo -n " split=false;"
+  cml="$1-$release/CMakeLists.txt"
+  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
+    else
+      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
+        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
+        grep -v '\(doc\|cmake\)'` )
+      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
+      echo -e "\n  pkgs=["
+      for s in "${subdirs[@]}"; do
+        echo -en "    {"
+		echo -n " name=\"${s//\//-}\"; "
+        print_sane "$s"
+        if [[ $s != "${s//\//-}" ]]; then
+          echo -n "subdir=\"$s\"; "
+        fi
+        echo "}"
+      done
+      echo -e "  ];\n"
+    fi
+  else
+    echo " is monolithic (has no subdirs)" >&2
+  fi
+  rm $cml
+  rmdir $1-$release
+  echo "}"
+}
+
+print_modules(){
+  echo "modules=["
+  echo "Printing modules splitted by upstream" >&2
+  for m in "${!modules[@]}"; do print_split_module "$m"; done
+  echo >&2
+  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
+  for m in "${top_level[@]}"; do print_mono_module "$m"; done
+  echo "];"
+}
+
+echo "Writing ${release}.nix" >&2
+exec > "${release}.nix"
+echo "{stable=${stable};"
+print_hashes
+print_modules
+echo "}"
diff --git a/pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt
new file mode 100644
index 00000000000..952a05a9d27
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:output method="text" />
+	<xsl:template match="/">
+		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
+			<xsl:text>declare -A module
</xsl:text>
+			<xsl:for-each select="module">
+				<xsl:variable name="module" select='@identifier' />
+				<xsl:for-each select=".//project[repo]">
+					<xsl:text>module["</xsl:text>
+					<xsl:value-of select='@identifier' />
+					<xsl:text>"]="</xsl:text>
+					<xsl:value-of select="$module" />
+					<xsl:text>"
</xsl:text>
+				</xsl:for-each>
+			</xsl:for-each>
+		</xsl:for-each>
+	</xsl:template>
+</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.13/kde-runtime.nix b/pkgs/desktops/kde-4.13/kde-runtime.nix
new file mode 100644
index 00000000000..1c9706f4f4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-runtime.nix
@@ -0,0 +1,24 @@
+{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
+, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
+}:
+
+kde {
+  buildInputs = [
+    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
+    qca2 samba libcanberra pulseaudio gpgme
+    networkmanager kactivities kdepimlibs openexr
+#todo: add openslp
+#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+  meta = {
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kde-wallpapers.nix b/pkgs/desktops/kde-4.13/kde-wallpapers.nix
new file mode 100644
index 00000000000..393d90824eb
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-wallpapers.nix
@@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
+
+  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "1yg9c780xdxa60bw832cqj60v87cbvjxp27k6gacj2lwk7rm5hwg";
+
+  meta = {
+    description = "Wallpapers for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kde-workspace.nix b/pkgs/desktops/kde-4.13/kde-workspace.nix
new file mode 100644
index 00000000000..39e9c10a0fb
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-workspace.nix
@@ -0,0 +1,46 @@
+{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
+, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
+, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
+, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
+}:
+
+kde {
+
+  version = "4.11.6";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/4.12.2/src/kde-workspace-4.11.6.tar.xz";
+    sha256 = "0lk3k9zl4x4il5dqpw7mf25gv8a3y48fd3jq3jvgmwwlviwcpcz1";
+  };
+
+#todo: wayland, xmms,   libusb isn't found
+  buildInputs =
+    [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg 
+      xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
+      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
+      xorg.libXdamage
+
+      python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+      akonadi pam libusb1 libqalculate kdepimlibs  prison
+      kactivities
+    ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  preConfigure =
+   ''
+     # Fix incorrect path to kde4-config.
+     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+
+     # Fix the path to the keyboard configuration files.
+     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
+       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
+   '';
+
+  enableParallelBuilding = false; # frequent problems on Hydra
+
+  meta = {
+    description = "KDE workspace components such as Plasma, Kwin and System Settings";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix
new file mode 100644
index 00000000000..d38c80c4c36
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Text-to-speech synthesis daemon";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix
new file mode 100644
index 00000000000..98fae7c983f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Bridge that provides accessibility services to applications";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix
new file mode 100644
index 00000000000..606c61cddb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+#todo: package qaccessibilityclient
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Screen magnifier for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix
new file mode 100644
index 00000000000..8e0caa76ed9
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst, libXt }:
+
+kde {
+  buildInputs = [ kdelibs libXtst libXt ];
+
+  meta = {
+    description = "A program that clicks the mouse for you";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix
new file mode 100644
index 00000000000..4159501967c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A type-and-say front end for speech synthesizers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.13/kdeadmin/kcron.nix
new file mode 100644
index 00000000000..f585461af38
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeadmin/kcron.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Configure and schedule tasks";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix
new file mode 100644
index 00000000000..88757a6b91c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "System log viewer tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.13/kdeadmin/kuser.nix
new file mode 100644
index 00000000000..6118cf558bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeadmin/kuser.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kdepimlibs }:
+
+kde {
+  buildInputs = [ kdelibs kdepimlibs ];
+
+  meta = {
+    description = "User management tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix
new file mode 100644
index 00000000000..acccf66976f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-color-schemes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE color schemes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake
new file mode 100644
index 00000000000..499ed75268e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake
@@ -0,0 +1,73 @@
+#Macro to find xscreensaver directory
+
+# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+if (NOT XSCREENSAVER_FOUND)
+  FIND_PATH(XSCREENSAVER_DIR deco
+    HINTS
+      ${KDE4_INCLUDE_DIR}
+    PATHS
+      /usr
+      /usr/local
+      /opt/local
+      /usr/X11R6
+      /opt/kde
+      /opt/kde3
+      /usr/kde
+      /usr/local/kde
+      /usr/local/xscreensaver
+      /usr/openwin/lib/xscreensaver
+      /etc
+    PATH_SUFFIXES
+      lib${LIB_SUFFIX}/xscreensaver
+      lib${LIB_SUFFIX}/misc/xscreensaver
+      lib/xscreensaver
+      lib64/xscreensaver
+      lib/misc/xscreensaver
+      libexec/xscreensaver
+      bin/xscreensaver-hacks
+      hacks)
+  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
+
+  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
+    PATHS
+    ${KDE4_INCLUDE_DIR}
+    /usr/
+    /usr/local/
+    /opt/local/
+    /usr/X11R6/
+    /opt/kde/
+    /opt/kde3/
+    /usr/kde/
+    /usr/local/kde/
+    /usr/openwin/lib/xscreensaver/
+    /etc/
+    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
+  )
+  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+
+endif(NOT XSCREENSAVER_FOUND)
+
+#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
+
+# Need to fix hack
+if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+    set(XSCREENSAVER_FOUND TRUE)
+endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+
+if (XSCREENSAVER_FOUND)
+  if (NOT Xscreensaver_FIND_QUIETLY)
+    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+  endif (NOT Xscreensaver_FIND_QUIETLY)
+else (XSCREENSAVER_FOUND)
+  if (Xscreensaver_FIND_REQUIRED)
+    message(FATAL_ERROR "XScreenSaver not found")
+  endif (Xscreensaver_FIND_REQUIRED)
+endif (XSCREENSAVER_FOUND)
+
+
+MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix
new file mode 100644
index 00000000000..edffca1562e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-wallpapers-high-resolution";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE wallpapers in high resolution";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix
new file mode 100644
index 00000000000..43071e8bd14
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kdeartwork-icon-themes";
+
+  # Sources contain primary and kdeclassic as well but they're not installed
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE nuvola and mono icon themes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix
new file mode 100644
index 00000000000..947e5e17ab0
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-weather-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers (weather)";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix
new file mode 100644
index 00000000000..93dd361af73
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-desktop-themes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE desktop themes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix
new file mode 100644
index 00000000000..5ef9f78a719
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-emotion-icons";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE emotion icons (smiles)";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
new file mode 100644
index 00000000000..84cb008056e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
+
+kde {
+  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
+
+  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
+
+  meta = {
+    description = "KDE screensavers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix
new file mode 100644
index 00000000000..b5d769b216d
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Styles for KWin";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/styles.nix b/pkgs/desktops/kde-4.13/kdeartwork/styles.nix
new file mode 100644
index 00000000000..6a1306c3710
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/styles.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-style-phase";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Phase, a widget style for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix
new file mode 100644
index 00000000000..7c9846fbf9e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kdeartwork-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.13/kdebindings/perlqt.nix
new file mode 100644
index 00000000000..48eed141ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/perlqt.nix
@@ -0,0 +1,14 @@
+{ kde, cmake, smokeqt, perl }:
+
+kde {
+
+  # TODO: qscintilla2, qwt5
+
+  buildInputs = [ smokeqt perl ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Perl bindings for Qt library";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.13/kdebindings/pykde4.nix
new file mode 100644
index 00000000000..64e196452e3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/pykde4.nix
@@ -0,0 +1,32 @@
+{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
+  polkit_qt_1, boost, lndir, pkgconfig }:
+
+let pydir = "lib/python${python.majorVersion}"; in
+
+kde {
+
+  # todo: polkit isn't found by the build system
+
+  buildInputs = [
+    python kdepimlibs shared_desktop_ontologies
+    boost polkit_qt_1
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ pyqt4 sip ];
+
+  preConfigure =
+    ''
+      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
+      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
+      # needs to install a plugin.
+      mkdir -pv $out/${pydir}
+      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
+      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
+    '';
+
+  meta = {
+    description = "Python bindings for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch
new file mode 100644
index 00000000000..bd95a0d8bd3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..30aec0e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
+     return()
+ endif (NOT COMPILE_RUBY)
+ 
+-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
+-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
++string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
+ 
+ # compute an overall version number which can be compared at once
+ MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.13/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.13/kdebindings/qtruby.nix
new file mode 100644
index 00000000000..03e9dc9a007
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/qtruby.nix
@@ -0,0 +1,20 @@
+{ kde, cmake, smokeqt, ruby }:
+
+kde {
+
+ # TODO: scintilla2, qwt5
+
+  buildInputs = [ smokeqt ruby ];
+
+  nativeBuildInputs = [ cmake ];
+
+  # The patch is not ready for upstream submmission.
+  # I should add an option() instead.
+  patches = [ ./qtruby-install-prefix.patch ];
+
+  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
+
+  meta = {
+    description = "Ruby bindings for Qt library";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch
new file mode 100644
index 00000000000..f0811d335a7
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch
@@ -0,0 +1,13 @@
+--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
+@@ -36,6 +36,10 @@
+ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ set (CMAKE_SKIP_RPATH FALSE)
+
++# add the automatically determined parts of the RPATH
++# which point to directories outside the build tree to the install RPATH
++SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
+ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
+
+ add_executable(smokegen ${generator_SRC})
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch
new file mode 100644
index 00000000000..53257e836e0
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch
@@ -0,0 +1,13 @@
+diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
+--- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
++++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
+@@ -80,8 +80,7 @@
+ set(SMOKE_API_BIN "@SMOKE_API_BIN@")
+ 
+ find_library(SMOKE_BASE_LIBRARY smokebase 
+-              PATHS "@SMOKE_LIBRARY_PREFIX@"
+-              NO_DEFAULT_PATH)
++              PATHS "@SMOKE_LIBRARY_PREFIX@")
+ 
+ if (NOT SMOKE_BASE_LIBRARY)
+     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.13/kdebindings/smokegen.nix
new file mode 100644
index 00000000000..a80574ff67a
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/smokegen.nix
@@ -0,0 +1,13 @@
+{ kde, qt4, cmake }:
+
+kde {
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
+
+  meta = {
+    description = "C++ parser used to generate language bindings for Qt/KDE";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.13/kdebindings/smokekde.nix
new file mode 100644
index 00000000000..4474c1d9731
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/smokekde.nix
@@ -0,0 +1,19 @@
+{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
+, shared_desktop_ontologies, attica, pkgconfig }:
+
+kde {
+
+  # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash
+  # okular is disabled because the code generated is broken
+  buildInputs = [
+    smokeqt kdelibs shared_desktop_ontologies
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  LD_LIBRARY_PATH = "${smokeqt}/lib/";
+
+  meta = {
+    description = "SMOKE bindings for kdelibs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix
new file mode 100644
index 00000000000..72b267e43c5
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix
@@ -0,0 +1,15 @@
+{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
+
+kde {
+
+# TODO: Qwt5, QScintilla2
+
+  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
+  nativeBuildInputs = [ cmake ];
+  propagatedNativeBuildInputs = [ smokegen ];
+
+  meta = {
+    description = "C++ parser used to generate language bindings for Qt/KDE";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/analitza.nix b/pkgs/desktops/kde-4.13/kdeedu/analitza.nix
new file mode 100644
index 00000000000..74c3a1ebb20
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/analitza.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, readline }:
+kde {
+  buildInputs = [ kdelibs readline ];
+
+  meta = {
+    description = "Library part of KAlgebra";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/blinken.nix b/pkgs/desktops/kde-4.13/kdeedu/blinken.nix
new file mode 100644
index 00000000000..cdf9728833c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/blinken.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Memory Enhancement Game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/cantor.nix b/pkgs/desktops/kde-4.13/kdeedu/cantor.nix
new file mode 100644
index 00000000000..a8cd2e44957
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/cantor.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }:
+kde {
+
+# TODO: R is not found
+
+  buildInputs = [ kdelibs libspectre analitza R libqalculate python ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "KDE Frontend to Mathematical Software";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix
new file mode 100644
index 00000000000..3675c3a225f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu, analitza }:
+kde {
+  buildInputs = [ kdelibs libkdeedu analitza ];
+
+  meta = {
+    description = "2D and 3D Graph Calculator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
new file mode 100644
index 00000000000..09de79ce1c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
+kde {
+
+# TODO: chemical mime data
+
+  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Periodic Table of Elements";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.13/kdeedu/kanagram.nix
new file mode 100644
index 00000000000..8759c96d78c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kanagram.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Letter Order Game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.13/kdeedu/kbruch.nix
new file mode 100644
index 00000000000..dc50f1e85a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kbruch.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Practice Fractions";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.13/kdeedu/kgeography.nix
new file mode 100644
index 00000000000..bd8d27c8d6e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kgeography.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Geography Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/khangman.nix b/pkgs/desktops/kde-4.13/kdeedu/khangman.nix
new file mode 100644
index 00000000000..997b50e906a
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/khangman.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "KDE hangman game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kig.nix b/pkgs/desktops/kde-4.13/kdeedu/kig.nix
new file mode 100644
index 00000000000..37906c32bcb
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kig.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost, python}:
+kde {
+  buildInputs = [ kdelibs boost python ];
+
+  cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
+  meta = {
+    description = "KDE Interactive Geometry";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kiten.nix b/pkgs/desktops/kde-4.13/kdeedu/kiten.nix
new file mode 100644
index 00000000000..939b7a9f77a
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kiten.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Japanese Reference/Study Tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/klettres.nix b/pkgs/desktops/kde-4.13/kdeedu/klettres.nix
new file mode 100644
index 00000000000..7a0fa83078e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/klettres.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE alphabet tutorial";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.13/kdeedu/kmplot.nix
new file mode 100644
index 00000000000..fc7b0578c27
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kmplot.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE mathematical function plotter";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kstars.nix b/pkgs/desktops/kde-4.13/kdeedu/kstars.nix
new file mode 100644
index 00000000000..0832dc2121e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kstars.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }:
+
+kde {
+
+# TODO: wcslib, astrometry
+
+  buildInputs = [ kdelibs eigen xplanet indilib ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "A KDE graphical desktop planetarium";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.13/kdeedu/ktouch.nix
new file mode 100644
index 00000000000..9e606adde33
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/ktouch.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxkbfile }:
+
+kde {
+  buildInputs = [ kdelibs libxkbfile ];
+
+  meta = {
+    description = "Touch Typing Tutor";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.13/kdeedu/kturtle.nix
new file mode 100644
index 00000000000..1e1922b1410
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kturtle.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Educational Programming Environment";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix
new file mode 100644
index 00000000000..1b33ba2e469
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Flash Card Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix
new file mode 100644
index 00000000000..def6c85fefe
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Libraries used by KDE Education applications";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/marble.nix b/pkgs/desktops/kde-4.13/kdeedu/marble.nix
new file mode 100644
index 00000000000..2dc07d14a0d
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/marble.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gpsd }:
+
+kde {
+
+# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
+
+  buildInputs = [ kdelibs gpsd ];
+
+  meta = {
+    description = "Marble Virtual Globe";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/pairs.nix b/pkgs/desktops/kde-4.13/kdeedu/pairs.nix
new file mode 100644
index 00000000000..36c4aba9604
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/pairs.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A memory and pairs game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/parley.nix b/pkgs/desktops/kde-4.13/kdeedu/parley.nix
new file mode 100644
index 00000000000..f9f86dde150
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/parley.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu, attica }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu attica ];
+
+  meta = {
+    description = "Vocabulary Trainer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/rocs.nix b/pkgs/desktops/kde-4.13/kdeedu/rocs.nix
new file mode 100644
index 00000000000..ce30d11fda3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/rocs.nix
@@ -0,0 +1,14 @@
+{ kde, kdelibs, boost, grantlee }:
+
+kde {
+  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
+
+  NIX_CFLAGS_COMPILE = "-fexceptions";
+
+  meta = {
+    description = "A KDE graph theory viewer";
+    kde = {
+      name = "rocs";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/step.nix b/pkgs/desktops/kde-4.13/kdeedu/step.nix
new file mode 100644
index 00000000000..f36ccef9b7c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/step.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }:
+
+kde {
+
+  buildInputs = [ kdelibs gsl libqalculate eigen ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "A KDE interactive physical simulator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/bomber.nix b/pkgs/desktops/kde-4.13/kdegames/bomber.nix
new file mode 100644
index 00000000000..026227910f2
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/bomber.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/bovo.nix b/pkgs/desktops/kde-4.13/kdegames/bovo.nix
new file mode 100644
index 00000000000..b0e7d99c589
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/bovo.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
+  };
+
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/granatier.nix b/pkgs/desktops/kde-4.13/kdegames/granatier.nix
new file mode 100644
index 00000000000..9f1ab005309
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/granatier.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kajongg.nix b/pkgs/desktops/kde-4.13/kdegames/kajongg.nix
new file mode 100644
index 00000000000..9a6f5e83695
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kajongg.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libkdegames, pythonPackages, sqlite,  pykde4 }:
+kde rec {
+
+  buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
+
+  pythonPath = [ pythonPackages.twisted pykde4 ];
+
+  postInstall = "wrapPythonPrograms";
+
+  meta = {
+    description = "an ancient Chinese board game for 4 players";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kapman.nix b/pkgs/desktops/kde-4.13/kdegames/kapman.nix
new file mode 100644
index 00000000000..f10e099da3c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kapman.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a clone of the well known game Pac-Man";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/katomic.nix b/pkgs/desktops/kde-4.13/kdegames/katomic.nix
new file mode 100644
index 00000000000..a9936c04f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/katomic.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a fun and educational puzzle game built around molecular geometry";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.13/kdegames/kblackbox.nix
new file mode 100644
index 00000000000..27eeff2f65b
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kblackbox.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kblocks.nix b/pkgs/desktops/kde-4.13/kdegames/kblocks.nix
new file mode 100644
index 00000000000..98cf068de09
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kblocks.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a classic single player falling blocks puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kbounce.nix b/pkgs/desktops/kde-4.13/kdegames/kbounce.nix
new file mode 100644
index 00000000000..77fa0db6352
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kbounce.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player arcade game with the elements of puzzle";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.13/kdegames/kbreakout.nix
new file mode 100644
index 00000000000..3a484d919bb
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kbreakout.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.13/kdegames/kdiamond.nix
new file mode 100644
index 00000000000..06dfcee5ac3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kdiamond.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.13/kdegames/kfourinline.nix
new file mode 100644
index 00000000000..11b8838e708
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kfourinline.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a board game for two players based on the Connect-Four game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix
new file mode 100644
index 00000000000..6217c47a806
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kigo.nix b/pkgs/desktops/kde-4.13/kdegames/kigo.nix
new file mode 100644
index 00000000000..32eee67cc1e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kigo.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "an open-source implementation of the popular Go game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/killbots.nix b/pkgs/desktops/kde-4.13/kdegames/killbots.nix
new file mode 100644
index 00000000000..d9c1472495e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/killbots.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple game of evading killer robots";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kiriki.nix b/pkgs/desktops/kde-4.13/kdegames/kiriki.nix
new file mode 100644
index 00000000000..72f7ab67501
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kiriki.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "an addictive and fun dice game, designed to be played by as many as six players";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix
new file mode 100644
index 00000000000..a6d22cff51c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple dice driven tactical game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/klickety.nix b/pkgs/desktops/kde-4.13/kdegames/klickety.nix
new file mode 100644
index 00000000000..b592bc40641
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/klickety.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a puzzle game where the player removes groups of colored marbles to clear the board";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/klines.nix b/pkgs/desktops/kde-4.13/kdegames/klines.nix
new file mode 100644
index 00000000000..90952fe91c0
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/klines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix
new file mode 100644
index 00000000000..946b531ff12
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+  buildInputs = [ kdelibs libkdegames libkmahjongg ];
+  meta = {
+    description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kmines.nix b/pkgs/desktops/kde-4.13/kdegames/kmines.nix
new file mode 100644
index 00000000000..538454e9598
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kmines.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a classic Minesweeper game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix
new file mode 100644
index 00000000000..42ffd2fcb4d
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a Battle Ship game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.13/kdegames/knetwalk.nix
new file mode 100644
index 00000000000..a16e578ce84
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/knetwalk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kolf.nix b/pkgs/desktops/kde-4.13/kdegames/kolf.nix
new file mode 100644
index 00000000000..78815ee5799
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kolf.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a miniature golf game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kollision.nix b/pkgs/desktops/kde-4.13/kdegames/kollision.nix
new file mode 100644
index 00000000000..3147c7305ea
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kollision.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple ball dodging game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/konquest.nix b/pkgs/desktops/kde-4.13/kdegames/konquest.nix
new file mode 100644
index 00000000000..53ddd64928c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/konquest.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "the KDE version of Gnu-Lactic Konquest";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kpat.nix b/pkgs/desktops/kde-4.13/kdegames/kpat.nix
new file mode 100644
index 00000000000..f8d9bad36dc
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kpat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a relaxing card sorting game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kreversi.nix b/pkgs/desktops/kde-4.13/kdegames/kreversi.nix
new file mode 100644
index 00000000000..2aed981428e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kreversi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kshisen.nix b/pkgs/desktops/kde-4.13/kdegames/kshisen.nix
new file mode 100644
index 00000000000..9c888034038
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kshisen.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, libkmahjongg }:
+kde {
+  buildInputs = [ kdelibs libkdegames libkmahjongg ];
+  meta = {
+    description = "a solitaire-like game played using the standard set of Mahjong tiles";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksirk.nix b/pkgs/desktops/kde-4.13/kdegames/ksirk.nix
new file mode 100644
index 00000000000..767eb67971a
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/ksirk.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames, qca2 }:
+kde {
+  buildInputs = [ kdelibs libkdegames qca2 ];
+  meta = {
+    description = "a computerized version of the well known strategic board game Risk";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix
new file mode 100644
index 00000000000..ccf1fb551e9
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple Tron-Clone";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix
new file mode 100644
index 00000000000..5285f7916ca
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksquares.nix b/pkgs/desktops/kde-4.13/kdegames/ksquares.nix
new file mode 100644
index 00000000000..a17be2da632
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/ksquares.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.13/kdegames/ksudoku.nix
new file mode 100644
index 00000000000..ea4e13a5e4f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/ksudoku.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a logic-based symbol placement puzzle";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.13/kdegames/ktuberling.nix
new file mode 100644
index 00000000000..1a6ba9d653c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/ktuberling.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a simple constructor game suitable for children and adults alike";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kubrick.nix b/pkgs/desktops/kde-4.13/kdegames/kubrick.nix
new file mode 100644
index 00000000000..9bdc6879db4
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/kubrick.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a game based on the Rubik's Cube™ puzzle";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.13/kdegames/libkdegames.nix
new file mode 100644
index 00000000000..3819dcdc9ae
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/libkdegames.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, openal, libsndfile }:
+kde {
+  buildInputs = [ kdelibs openal libsndfile ];
+  meta = {
+    description = "KDE games library";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix
new file mode 100644
index 00000000000..383b347dc33
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a library for KMahjongg game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/lskat.nix b/pkgs/desktops/kde-4.13/kdegames/lskat.nix
new file mode 100644
index 00000000000..2a5050cd667
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/lskat.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/palapeli.nix b/pkgs/desktops/kde-4.13/kdegames/palapeli.nix
new file mode 100644
index 00000000000..010dbd5d623
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/palapeli.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+
+# TODO: package qvoronoi
+
+  buildInputs = [ kdelibs libkdegames ];
+
+  meta = {
+    description = "a single-player jigsaw puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegames/picmi.nix b/pkgs/desktops/kde-4.13/kdegames/picmi.nix
new file mode 100644
index 00000000000..165d7422f95
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegames/picmi.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkdegames }:
+kde {
+  buildInputs = [ kdelibs libkdegames ];
+  meta = {
+    description = "a single player logic-based puzzle game";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix
new file mode 100644
index 00000000000..b6fd701ac12
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix
@@ -0,0 +1,15 @@
+{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
+, libjpeg, pkgconfig, kactivities, lcms2 }:
+
+kde {
+
+  buildInputs =
+    [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Gwenview, the KDE image viewer";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.13/kdegraphics/kamera.nix
new file mode 100644
index 00000000000..70904b17c23
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kamera.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libgphoto2 }:
+
+kde {
+  buildInputs = [ kdelibs libgphoto2 ];
+
+  meta = {
+    description = "KDE camera interface library";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix
new file mode 100644
index 00000000000..58528cb186b
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A small utility to select a color";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix
new file mode 100644
index 00000000000..2c2ba3796a2
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, okular }:
+
+kde {
+  buildInputs = [ kdelibs okular ];
+
+  meta = {
+    description = "A collection of plugins to handle mobipocket files";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix
new file mode 100644
index 00000000000..35af39aa611
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libtiff }:
+
+kde {
+  buildInputs = [ kdelibs libtiff ];
+
+  meta = {
+    description = "Strigi analyzers for various graphics file formats";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix
new file mode 100644
index 00000000000..18c6534eb5c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
+
+kde {
+
+  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Thumbnailers for various graphics file formats";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix
new file mode 100644
index 00000000000..28d9252187e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libXxf86vm }:
+
+kde {
+  buildInputs = [ kdelibs libXxf86vm ];
+
+  meta = {
+    description = "KDE monitor calibration tool";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix
new file mode 100644
index 00000000000..5276ec09f46
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, qimageblitz }:
+
+kde {
+  buildInputs = [ kdelibs qimageblitz ];
+
+  meta = {
+    description = "KDE paint program";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.13/kdegraphics/kruler.nix
new file mode 100644
index 00000000000..c5c2c6e05d7
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/kruler.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE screen ruler";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix
new file mode 100644
index 00000000000..1381ed7dd26
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libksane }:
+
+kde {
+  buildInputs = [ kdelibs libksane ];
+
+  meta = {
+    description = "A KScan plugin that implements the scanning through libksane";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix
new file mode 100644
index 00000000000..f01a609e20d
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, libkipi }:
+
+kde {
+  buildInputs = [ kdelibs libkipi ];
+
+  meta = {
+    description = "KDE screenshot utility";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix
new file mode 100644
index 00000000000..e7c01f98a8c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, pkgconfig, libraw, lcms2 }:
+
+kde {
+
+  buildInputs = [ kdelibs libraw lcms2 ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Library for decoding RAW images";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix
new file mode 100644
index 00000000000..096b0a6e957
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, exiv2 }:
+
+kde {
+  buildInputs = [ kdelibs exiv2 ];
+
+  meta = {
+    description = "Exiv2 support library";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix
new file mode 100644
index 00000000000..6b16265e7a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Interface library to kipi-plugins";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.13/kdegraphics/libksane.nix
new file mode 100644
index 00000000000..b539eab3899
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/libksane.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, saneBackends }:
+
+kde {
+  buildInputs = [ kdelibs saneBackends ];
+
+  meta = {
+    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/okular.nix b/pkgs/desktops/kde-4.13/kdegraphics/okular.nix
new file mode 100644
index 00000000000..aca1691eace
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/okular.nix
@@ -0,0 +1,17 @@
+{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
+, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
+
+kde {
+
+# TODO: package activeapp, qmobipocket
+
+  buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4
+                  qca2 qimageblitz libtiff kactivities libkexiv2 ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Okular, the KDE document viewer";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix
new file mode 100644
index 00000000000..a344cc4b4b4
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "SVG KPart";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix
new file mode 100644
index 00000000000..396adf9ba75
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix
@@ -0,0 +1,46 @@
+{ kde, gcc, cmake, perl
+, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi
+, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver
+, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
+, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst
+, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
+, pkgconfig
+}:
+
+kde {
+
+# TODO: media-player-info
+
+  buildInputs =
+    [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq
+      libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt
+      shared_desktop_ontologies xz udev libjpeg kerberos openexr
+      libXtst attr
+    ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
+
+  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
+
+  # TODO: make sonnet plugins (dictionaries) really work.
+  # There are a few hardcoded paths.
+  # Split plugins from libs?
+
+  patches = [ ../files/polkit-install.patch ];
+
+  cmakeFlags = [
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    "-DHUPNP_ENABLED=ON"
+    "-DWITH_SOLID_UDISKS2=ON"
+  ];
+
+  passthru.wantsUdisks2 = true;
+
+  meta = {
+    description = "KDE libraries";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix
new file mode 100644
index 00000000000..7e29eebf3b7
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
+, pkgconfig, doxygen, ebook_tools
+}:
+
+kde {
+
+# TODO: qmobipocket
+
+  buildInputs = [
+    kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
+    popplerQt4 ebook_tools
+  ];
+
+  nativeBuildInputs = [ pkgconfig doxygen ];
+
+  meta = {
+    description = "NEPOMUK core";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix
new file mode 100644
index 00000000000..0d29a4f97de
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+
+  buildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "NEPOMUK Widgets";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix
new file mode 100644
index 00000000000..4c56e7529dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
+kde {
+  buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
+  meta = {
+    description = "transparent audio CD access for applications using the KDE Platform";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix
new file mode 100644
index 00000000000..006300742ec
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a multimedia player with the focus on simplicity";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix
new file mode 100644
index 00000000000..45f6c9abcb6
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, ffmpeg }:
+kde {
+  buildInputs = [ kdelibs ffmpeg ];
+  meta = {
+    description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.13/kdemultimedia/juk.nix
new file mode 100644
index 00000000000..5d7b1db224e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/juk.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, taglib, libtunepimp }:
+kde {
+
+# TODO: opusfile
+
+  buildInputs = [ kdelibs taglib libtunepimp ];
+  meta = {
+    description = "an audio jukebox application";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix
new file mode 100644
index 00000000000..1dd8108166f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libcanberra, pulseaudio }:
+kde {
+  buildInputs = [ kdelibs libcanberra pulseaudio ];
+  meta = {
+    description = "sound mixer, an application to allow you to change the volume of your sound card";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix
new file mode 100644
index 00000000000..e99ae53935b
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs, libmusicbrainz }:
+kde {
+  buildInputs = [ kdelibs libmusicbrainz ];
+  meta = {
+    description = "KDE CD player";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix
new file mode 100644
index 00000000000..720b01d1861
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+#todo: libmusicbrainz5
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a library used to retrieve audio CD meta data from the internet";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix
new file mode 100644
index 00000000000..6ed08af89f3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "KDE library for playing & ripping CDs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix
new file mode 100644
index 00000000000..c88ebcc2a5a
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix
@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+  meta = {
+    description = "a video thumbnail generator for KDE";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix
new file mode 100644
index 00000000000..0330511a258
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE properties dialog plugin to share a directory with the local network";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix
new file mode 100644
index 00000000000..e838d84fc5e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, boost }:
+
+kde {
+  buildInputs = [ kdelibs boost ];
+
+  meta = {
+    description = "Strigi analyzers for various network protocols";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kget.nix b/pkgs/desktops/kde-4.13/kdenetwork/kget.nix
new file mode 100644
index 00000000000..f986da2de21
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/kget.nix
@@ -0,0 +1,20 @@
+{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost
+, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets
+, pkgconfig }:
+
+kde {
+
+# TODO: QGpgME
+
+  buildInputs =
+    [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
+      libmms kde_baseapps kde_workspace boost ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  KDEDIRS = libktorrent;
+
+  meta = {
+    description = "KDE download manager";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.13/kdenetwork/kopete.nix
new file mode 100644
index 00000000000..7d8aec21ce6
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/kopete.nix
@@ -0,0 +1,26 @@
+{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
+  jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
+  libgadu, boost, qca2, sqlite, jsoncpp,
+  ortp, srtp, libv4l }:
+
+kde {
+
+# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
+
+  buildInputs = [
+    kdelibs qca2 mediastreamer libgadu jsoncpp
+    kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
+    libidn libxslt boost
+    ortp srtp libv4l
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  KDEDIRS = libktorrent;
+
+  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
+
+  meta = {
+    description = "A KDE multi-protocol IM client";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.13/kdenetwork/kppp.nix
new file mode 100644
index 00000000000..4c6bd65769f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/kppp.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "PPP(Dial-Up) client tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.13/kdenetwork/krdc.nix
new file mode 100644
index 00000000000..80557e827fe
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/krdc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }:
+
+kde {
+  buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ];
+
+  meta = {
+    description = "KDE remote desktop client";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.13/kdenetwork/krfb.nix
new file mode 100644
index 00000000000..cb4857965a3
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/krfb.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }:
+
+kde {
+  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ];
+
+  meta = {
+    description = "KDE desktop sharing";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix
new file mode 100644
index 00000000000..f65960cc337
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE tool that monitors the network for DNS-SD services";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdepim-runtime.nix b/pkgs/desktops/kde-4.13/kdepim-runtime.nix
new file mode 100644
index 00000000000..d92e2254820
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdepim-runtime.nix
@@ -0,0 +1,16 @@
+{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
+
+kde {
+
+# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
+
+  buildInputs = [
+    kdepimlibs akonadi boost shared_desktop_ontologies
+    libxslt
+  ];
+
+  meta = {
+    description = "KDE PIM runtime";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdepim.nix b/pkgs/desktops/kde-4.13/kdepim.nix
new file mode 100644
index 00000000000..4f364648d23
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdepim.nix
@@ -0,0 +1,28 @@
+{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
+, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
+, nepomuk_widgets, kactivities, libXScrnSaver, qjson
+, pkgconfig }:
+
+kde {
+
+# TODO: LinkGrammar
+
+  buildInputs =
+    [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
+      libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
+      libXScrnSaver qjson
+    ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
+
+  meta = {
+    description = "KDE PIM tools";
+    longDescription = ''
+      Contains various personal information management tools for KDE, such as an organizer.
+    '';
+    license = "GPL";
+    homepage = http://pim.kde.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdepimlibs.nix b/pkgs/desktops/kde-4.13/kdepimlibs.nix
new file mode 100644
index 00000000000..ca0af9400b1
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdepimlibs.nix
@@ -0,0 +1,19 @@
+{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
+, kdelibs, akonadi, libxslt, nepomuk_core
+, shared_desktop_ontologies, qjson }:
+
+kde {
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs =
+    [ boost gpgme libical libxslt qjson prison
+      openldap cyrus_sasl akonadi shared_desktop_ontologies
+    ];
+
+  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "KDE PIM libraries";
+    license = "LGPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeplasma-addons.nix b/pkgs/desktops/kde-4.13/kdeplasma-addons.nix
new file mode 100644
index 00000000000..550099830d9
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeplasma-addons.nix
@@ -0,0 +1,23 @@
+{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
+, boost, eigen, kde_workspace, attica, qca2, qimageblitz
+, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
+, qjson, qoauth }:
+
+kde {
+
+# TODO: qwt, scim, ibus
+
+  KDEDIRS=marble;
+
+  buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
+                  eigen qca2 libXtst qimageblitz libqalculate 
+                  shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "KDE Plasma Addons";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.13/kdesdk/cervisia.nix
new file mode 100644
index 00000000000..1dabe46cd42
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/cervisia.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE CVS frontend";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix
new file mode 100644
index 00000000000..ad8132a850e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+  # Needs kdebase for libkonq
+  buildInputs = [ kdelibs kde_baseapps ];
+
+  meta = {
+    description = "Svn, mercurial, git and bazaar plugins for dolphin";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix
new file mode 100644
index 00000000000..391536248dd
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE 4 project template generator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix
new file mode 100644
index 00000000000..65d410cca48
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Frontend for Callgrind/Cachegrind";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix
new file mode 100644
index 00000000000..df81145e5d6
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Various scripts to ease KDE development";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix
new file mode 100644
index 00000000000..215c0a3c613
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, gcc, libtool }:
+
+kde {
+  buildInputs = [ kdelibs libtool ];
+
+  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
+
+  meta = {
+    description = "various KDE development utilities";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix
new file mode 100644
index 00000000000..98bbce35a97
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, subversionClient, apr, aprutil,perl }:
+
+kde {
+
+  buildInputs = [ kdelibs subversionClient apr aprutil perl ];
+
+  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
+
+  meta = {
+    description = "Subversion and perldoc kioslaves";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix
new file mode 100644
index 00000000000..4d579b88ba8
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Strigi analyzers for diff, po and ts";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix
new file mode 100644
index 00000000000..d707fe9038f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, gettext }:
+
+kde {
+
+  buildInputs = [ kdelibs gettext ];
+
+  meta = {
+    description = "PO file format thumbnailer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kompare.nix b/pkgs/desktops/kde-4.13/kdesdk/kompare.nix
new file mode 100644
index 00000000000..644c7c48dc9
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/kompare.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkomparediff2 }:
+
+kde {
+  buildInputs = [ kdelibs libkomparediff2 ];
+
+  meta = {
+    description = "A program to view the differences between files and optionally generate a diff";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix
new file mode 100644
index 00000000000..5933682c70a
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A library to compare files and strings";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.13/kdesdk/lokalize.nix
new file mode 100644
index 00000000000..1565426eb1f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/lokalize.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, hunspell }:
+
+kde {
+  buildInputs = [ kdelibs hunspell ];
+
+  meta = {
+    description = "KDE 4 Computer-aided translation system";
+    longDescription = ''
+      Computer-aided translation system.
+      Do not translate what had already been translated.
+    '';
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/okteta.nix b/pkgs/desktops/kde-4.13/kdesdk/okteta.nix
new file mode 100644
index 00000000000..058636596ad
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/okteta.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, qca2 }:
+
+kde {
+  buildInputs = [ kdelibs qca2 ];
+
+# TODO: Look what does -DBUILD_mobile add
+
+  enableParallelBuilding = false;
+
+  meta = {
+    description = "KDE byte editor";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/poxml.nix b/pkgs/desktops/kde-4.13/kdesdk/poxml.nix
new file mode 100644
index 00000000000..6e46c3e3ab4
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/poxml.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, antlr, gettext }:
+
+kde {
+  buildInputs = [ kdelibs antlr gettext ];
+
+  meta = {
+    description = "Po<->xml tools";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.13/kdesdk/umbrello.nix
new file mode 100644
index 00000000000..e83a2d9a901
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdesdk/umbrello.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libxml2, libxslt, boost }:
+
+kde {
+  buildInputs = [ kdelibs libxml2 libxslt boost ];
+
+  meta = {
+    description = "Umbrello UML modeller";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdetoys/amor.nix b/pkgs/desktops/kde-4.13/kdetoys/amor.nix
new file mode 100644
index 00000000000..936d63d544a
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdetoys/amor.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE creature for your desktop";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.13/kdetoys/kteatime.nix
new file mode 100644
index 00000000000..dacf54def4b
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdetoys/kteatime.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE utility for making a fine cup of tea";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdetoys/ktux.nix b/pkgs/desktops/kde-4.13/kdetoys/ktux.nix
new file mode 100644
index 00000000000..108f9be7c72
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdetoys/ktux.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Tux Screen Saver";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/ark.nix b/pkgs/desktops/kde-4.13/kdeutils/ark.nix
new file mode 100644
index 00000000000..99844b909fd
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/ark.nix
@@ -0,0 +1,17 @@
+{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson
+, unzip }:
+
+kde {
+  buildInputs = [
+    makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson
+  ];
+
+  postInstall = ''
+    wrapProgram $out/bin/ark \
+      --prefix PATH ":" "${unzip}/bin"
+  '';
+
+  meta = {
+    description = "KDE Archiving Tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/filelight.nix b/pkgs/desktops/kde-4.13/kdeutils/filelight.nix
new file mode 100644
index 00000000000..25ecabed27c
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/filelight.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Tool to visualise file and directory sizes";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.13/kdeutils/kcalc.nix
new file mode 100644
index 00000000000..08b202e8f0e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/kcalc.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, gmp }:
+
+kde {
+  buildInputs = [ kdelibs gmp ];
+
+  meta = {
+    description = "KDE Calculator";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix
new file mode 100644
index 00000000000..d4c9c06f483
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE character selection utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kdf.nix b/pkgs/desktops/kde-4.13/kdeutils/kdf.nix
new file mode 100644
index 00000000000..3f9da58d0a6
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/kdf.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE free disk space utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix
new file mode 100644
index 00000000000..2434a4fa671
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Floppy disk formatting utility";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.13/kdeutils/kgpg.nix
new file mode 100644
index 00000000000..3ff1a286ae5
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/kgpg.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs, kdepimlibs, boost }:
+
+kde {
+
+  buildInputs = [ kdelibs kdepimlibs boost ];
+
+  meta = {
+    description = "Simple KDE GUI for GPG";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix
new file mode 100644
index 00000000000..70311a789f9
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst }:
+
+kde {
+  buildInputs = [ kdelibs libXtst ];
+
+  meta = {
+    description = "KDE remote control";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.13/kdeutils/ktimer.nix
new file mode 100644
index 00000000000..5700977349e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/ktimer.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Timer";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix
new file mode 100644
index 00000000000..9ec0e6c0396
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Wallet (password storage) management tool";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.13/kdeutils/print-manager.nix
new file mode 100644
index 00000000000..ae72becd1e4
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/print-manager.nix
@@ -0,0 +1,27 @@
+{ kde, kdelibs
+, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
+
+let s_c_p = system_config_printer.override { withGUI = false; }; in
+
+kde rec {
+  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
+    ] ++ pythonPath;
+
+  pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
+
+  passthru.propagatedUserEnvPackages = [ s_c_p ];
+
+  postInstall =
+    ''
+      wrapPythonPrograms
+
+      # "system-config-printer" supplies some D-Bus policy that we need.
+      mkdir -p $out/nix-support
+      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
+    '';
+
+  meta = {
+    description = "KDE printer manager";
+    longDescription = "Applet to view current print jobs and configure new printers";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix
new file mode 100644
index 00000000000..cbe7a285606
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, qimageblitz, python }:
+
+kde {
+  buildInputs = [ kdelibs qimageblitz python ];
+
+  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
+
+  meta = {
+    description = "A KDE Eye-candy Application";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.13/kdeutils/sweeper.nix
new file mode 100644
index 00000000000..78d56c7df30
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeutils/sweeper.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Helps clean unwanted traces the user leaves on the system";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix
new file mode 100644
index 00000000000..55e37809e07
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Batch search and replace tool";
+    homepage = http://www.kdewebdev.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix
new file mode 100644
index 00000000000..6d22f72461f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix
@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "An HTML imagemap editor";
+    homepage = http://www.nongnu.org/kimagemap/;
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix
new file mode 100644
index 00000000000..918512e2b2d
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix
@@ -0,0 +1,13 @@
+{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
+
+kde {
+
+# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
+
+  buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
+
+  meta = {
+    description = "A KDE link checker";
+    homepage = http://klinkstatus.kdewebdev.org;
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.13/kdewebdev/kommander.nix
new file mode 100644
index 00000000000..d5f4337f714
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdewebdev/kommander.nix
@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A graphical editor of scripted dialogs";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/l10n/default.nix b/pkgs/desktops/kde-4.13/l10n/default.nix
new file mode 100644
index 00000000000..fa6406043b1
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/l10n/default.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
+
+let
+
+  inherit (stdenv.lib) attrByPath singleton;
+
+  kdeL10nDerivation =
+    { lang, saneName, sha256 }:
+
+    stdenv.mkDerivation rec {
+      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.xz";
+        name = "${name}.tar.xz";
+        inherit sha256;
+      };
+
+      buildInputs = [ gettext kdelibs ];
+
+      cmakeFlags = "-Wno-dev";
+
+      meta = {
+        description = "KDE translation for ${lang}";
+        inherit branch;
+        license = "GPL";
+        platforms = stdenv.lib.platforms.linux;
+        inherit (kdelibs.meta) maintainers homepage;
+      };
+    };
+
+  kdeL10nRelease =
+    builtins.listToAttrs (
+      map ({lang, saneName, sha256}:
+        {
+          name = saneName;
+          value = kdeL10nDerivation { inherit lang saneName sha256; };
+        }
+      ) (import (./manifest + "-${release}.nix"))
+    );
+
+in
+{
+  inherit kdeL10nDerivation;
+  recurseForDerivations = true;
+} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
new file mode 100755
index 00000000000..ec159a1e204
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+# Usage: download kde-l10n to $dir, then run
+# $0 $dir
+
+dir=$1
+
+if [[ ! -d "${dir}" ]]; then
+  echo "${dir} is not a directory (or doesn't exist)!" >&2
+  exit 1
+fi
+
+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.xz`; do
+  lang=${i%-${release}.tar.xz}
+  lang=${lang#kde-l10n-}
+  echo -n "${lang}.. " >&2
+  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+  echo "{"
+  echo "  lang = \"${lang}\";"
+  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
+  echo "  sha256 = \"${hash}\";"
+  echo "}"
+  echo $hash >&2
+done
+echo "]"
diff --git a/pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix b/pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix
new file mode 100644
index 00000000000..e646e352887
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix
@@ -0,0 +1,262 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "1pygy9kckankwhlm4j61fk42zinafw2insc9kkpgmh9mvb8gv0jk";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "1qqbl7l84j3d5928gmdq7f7s0i31gw0rlf4y74p5zx8m80xbdd6l";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "0cg143wlalplw0qr10h60i6srn0avsim94m1hjbm8xrlg71iihjj";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "15s85xmqbnv7bm7ywivkyi62481ip4vy6yyw81m720hza0imbj9z";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "1d0bhndwf8b0pmglf3sx28r6s3li72x7a05kc39n026ha5zyx5f1";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "1dx5c6fkgn4hglx8qacrdnxn0l9p7dqbaz6cd7h9pa8b9zri5j9w";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1ynh8s17999pa60bzwr2595pcd744h1n8zznyzr5lq302ir8f8qj";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "1da01wd1n64g3l57pagvrb8mn2jj50ni1qhicnlwylk8n2krw0pf";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "1qf9g5in9zr39gkip06hr80pzc4frchb2x9q76sqs36h58az5yfd";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1lhrbfh74sqglqxl7yh68qkx0gmppg7iir194vxhm2s1j0jxq8r4";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "0qz39nxkiivgk720lgdbfgxdp3wn5wrvx2zf0phvb8g6q5rl68kw";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "1i9h68pfsnbi4gw5f4mb6q8jq56hdmi1lqxhwzj6vrbqiip7b9gl";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "020b1p164v82pj6x0jxz6d41w539786ygkfmgrf9dr20zwhchzha";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "0vs8bqr6if32bmwvjzdmakyqdl5fz13igg31mzwga4aqlzalxa1w";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "1wcd9gzf754150i62zl3fa24jq8p7vskn6adaa8x5qy208c0d6v1";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "0fpsc36sk7zh3flxgnvfgxig4cm5hm56sgdgbl01dfg1mac6dckq";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1hrbsd595q2w09mym9h56hymikkpxbq0qmdxvphap5wsh0xsfxms";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "1q2y9js6j32rbm5jg8yn6s9zw0jh6yq1q4z6hxy9nss1gh6diqda";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "0zaknfk8kzcid7839wsj61qgn81gjz0hbpis7q2q1syky4nzjwsb";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1d14h5kdfz8np5p27darraxq4ps0yhxhczg9yli436kgiflbvp88";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "0p29dybsalnjk00f7l3gni7pxzv1ig95m100svhhkmcwvh065kjf";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1qqbn3v30z058580qr9qyq0sy6g4jw0far8w7ywgnhks4aapy97a";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "1gfm0k2j2jvff9lab87yjrywc1j0gayw2fxibzifvpygr9bl60i7";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "11zax6c3qfscadqfamls5k78hw36iwadqsgyiphl574ijz9q48ba";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "1ab658x0a44kydzs05zgzq7nks6dfl0z8m69ank5ngd12qnhb38s";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "0n26860ah421x8q2jmz8mh3mdzy26s8ckbfpnyph1vc23zqx9vqv";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "05ad1d5klc11s138zb5fj4h2kfida83xqr4z1m6nhv0igwzmza0g";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "14kchh6yixgrkzrrkdz25xaj2q91il6yshz79n4h0yk01lfc3sq5";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "0aa4spy2nc1hfbx1z2b4k3sahha0pdxih1k3pl6n9223cjgwcbqp";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "14341a4qr8p7idvsw6zp23kyva5lb4684wjygm24d9wj69nkc2c4";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "02rq9spp8vzvv8bvzny48qwksimrnqj6y9rpc3xh6bmzfhvr7qsa";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1s2gbynxdbpi32rwdgddabsp3n10ngwpnh6za3yjp4is93ici6rm";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "18nmh605ya47w0x2nkglg8lrfks7l9pxr6mjnw3z3lsazafigvx1";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1jxd109m2y7ky0c4im70ipx07rysbr0ndl2fpjb3myxb2nks106h";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "117zl85myjnnb957c4gx0h65ks842sk3gbw9dfp8hpzdwg8zvsn4";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "1q5c61a2swxvyhdw5rambibyms40hj34093ihx32ad73kb4mn72w";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0wg4nlra1z6pf8mxlz3w0jq68k0qfhxrhsqij35l9zml5y203n4y";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "0rryyjfgplar77fz332jv2w0lv7d6273gv022pb1m83w945pzkf9";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "0aglgvj1ljfdf6gjs478l4wisp2z4dzkkbhz1sgry00p4q1417ab";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "14aqlg64lp287m09zhh9r9l6ywfwzz7f2nz0vr1fg3wqsdrchglw";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "0cq6xacyrb9wrrwbl8xrb2ah3h7s7a9vr7kz3fy5rf2rgq0phfd7";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "07i0plzmg0nykfalyjvwnhg5qrcfdf1h6i18b34xyrp3y4gm540a";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "0gw1iv550nr307ibgb8i48fxcq03liq5r2x7fr9pl0n9xknh3c8a";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0489n0l9c9wig5567dfh4apyyy6xws7yxq79r4jl00zxl1j43bla";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "1n4ckll9ngj8qn976nikxfljf23qsvphblbjnjm0vk4713bnpf9h";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "0pzjdnanhynalcjlsg94g88i92hwdsqz02x85yxxg87vn74p13ks";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "1z9mjzh0w6i2a75ys0dx5ksm8fpwyw8wrwdh14bvbnxpnkx0jv8x";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "032vjcjpl19dyyc36z1nwyc9h696iys8dfyadpw9rhcllpk4ck67";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "0sd6vzb1qmbbxk6d1vfq21gkq009lp7qxnpdcr7jbykcf0licq7i";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "1m6fa0adfjzfqakjyrrjwak4p0y5wwdkkq61qx9wvzdb78qm83rw";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "11is37g7fafxhk7ydydgbxdg0x1s5cxr8v1pjzwqb858n1cq5x1h";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "1vbr0pjm8d25lxbmhqz8d4x57sjc411a5fkvyxh4rr34fd7xxhwq";
+}
+]
diff --git a/pkgs/desktops/kde-4.13/oxygen-icons.nix b/pkgs/desktops/kde-4.13/oxygen-icons.nix
new file mode 100644
index 00000000000..01020e095f9
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/oxygen-icons.nix
@@ -0,0 +1,15 @@
+{ kde, cmake }:
+
+kde {
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "06qddsbq0sadj9jh2x1qkbm69b7cnd2474b3h0zrzrqgnrsf8jn2";
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "KDE Oxygen theme icons";
+    longDescription = "Icons for KDE's default theme";
+    license = "GPL";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/support/akonadi/default.nix b/pkgs/desktops/kde-4.13/support/akonadi/default.nix
new file mode 100644
index 00000000000..d51996e3bc1
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/support/akonadi/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
+
+stdenv.mkDerivation rec {
+  name = "akonadi-1.11.0";
+  
+  src = fetchurl {
+    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
+    sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
+  };
+
+  buildInputs = [ qt4 soprano libxslt boost sqlite ];
+
+  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
+
+  enableParallelBuilding = true;
+  
+  meta = with stdenv.lib; {
+    description = "KDE PIM Storage Service";
+    license = "LGPL";
+    homepage = http://pim.kde.org/akonadi;
+    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4aa330a119c..857ac5d278b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10362,7 +10362,7 @@ let
 
   kde4 = recurseIntoAttrs pkgs.kde412;
 
-  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
+  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde413 );
 
   kde412 = kdePackagesFor (pkgs.kde412 // {
       eigen = eigen2;
@@ -10370,6 +10370,12 @@ let
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.12;
 
+  kde413 = kdePackagesFor (pkgs.kde413 // {
+      eigen = eigen2;
+      libusb = libusb1;
+      libcanberra = libcanberra_kde;
+    }) ../desktops/kde-4.13;
+
   kdePackagesFor = self: dir:
     let callPackageOrig = callPackage; in
     let
@@ -10405,7 +10411,8 @@ let
 
       k3b = callPackage ../applications/misc/k3b { };
 
-      kadu = callPackage ../applications/networking/instant-messengers/kadu { };
+      # Broken phonon
+      #kadu = callPackage ../applications/networking/instant-messengers/kadu { };
 
       kbibtex = callPackage ../applications/office/kbibtex { };
 

From 8dcf70f9185b6e466aff067e504db7b0255e87f9 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Thu, 19 Jun 2014 19:50:38 +0200
Subject: [PATCH 11/61] kde: Some tweaks to kde-manifest.sh

- Allow packages with different versions than $release (kde-workspace)
- Extra checks
---
 .../desktops/kde-4.13/kde-package/default.nix | 16 +++---
 .../kde-4.13/kde-package/kde-manifest.sh      | 53 ++++++++++++++-----
 2 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/pkgs/desktops/kde-4.13/kde-package/default.nix b/pkgs/desktops/kde-4.13/kde-package/default.nix
index 6b4e1ba0ad8..beb475889ad 100644
--- a/pkgs/desktops/kde-4.13/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.13/kde-package/default.nix
@@ -10,9 +10,9 @@ rec {
   manifest = import (./. + "/${release}.nix");
 
   # src attribute for $name tarball
-  kdesrc = name: fetchurl {
+  kdesrc = name: version: fetchurl {
     url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${release}.tar.xz";
+      + "stable/${release}/src/${name}-${version}.tar.xz";
     sha256 = getAttr name manifest.hashes;
   };
 
@@ -27,10 +27,12 @@ rec {
   # KDE package built from the whole tarball
   # This function is used both for monolithic modules and modules which are
   # released as individual tarballs
-  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, version ? release, ...}:
+  kdeMonoPkg = name:
+    let n_ = name; v_ = getAttr name manifest.versions; in
+    a@{meta, name ? n_, version ? v_, ...}:
     stdenv.mkDerivation ({
       name = "${name}-${version}";
-      src = kdesrc name;
+      src = kdesrc name version;
       meta = defMeta // meta;
       enableParallelBuilding = true;
     } // (removeAttrs a [ "meta" "name" ]));
@@ -42,11 +44,11 @@ rec {
   # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
   kdeSubdirPkg = module:
     {name, subdir ? name, sane ? name}:
-    let name_ = name; in
-    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
+    let name_ = name; version_ = getAttr name manifest.versions; in
+    a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, ...}:
     stdenv.mkDerivation ({
       name = "${name}-${release}";
-      src = kdesrc module;
+      src = kdesrc module version;
       cmakeFlags =
         [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
           "-DBUILD_doc=TRUE"
diff --git a/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
index e964ce3ddc1..1da7bc810c3 100755
--- a/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
@@ -5,15 +5,21 @@
 
 dir="$1"
 
-# Detect release number & whether it is a stable release
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
+
+if [[ -z $(type -p xsltproc) ]]; then
+  echo "Please provide libxslt" >&2
   exit 1
 fi
 
 release=$(ls "${dir}"/kdelibs-*.tar.xz | \
   sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
 
+# Detect release number & whether it is a stable release
+if [[ $? -ne 0 || -z $release ]]; then
+  echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2
+  exit 1
+fi
+
 if [[ ${release##*.} -gt 50 ]]; then
   stable="false"
 else
@@ -23,15 +29,19 @@ fi
 echo "Detected release ${release}" >&2
 
 declare -A hash
+declare -A version
 declare -A modules
 declare -a packages
 declare -a top_level
 
-# xsltproc output declares -A module
-if [[ ! -f kde_projects.xml ]]; then
-  curl -O -J http://projects.kde.org/kde_projects.xml
+if [[ ! -f ${dir}/kde_projects.xml ]]; then
+  if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then
+    echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2
+    exit 1
+  fi
 fi
-eval `xsltproc kde-submodules.xslt kde_projects.xml`
+# xsltproc output declares -A module
+eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml`
 
 module[kde-baseapps]=kde-baseapps
 unset module[kactivities]
@@ -45,13 +55,17 @@ print_sane() {
   fi
 }
 
-for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
-  package=${i%-${release}.tar.xz}
+for i in `cd "${dir}"; ls *.tar.xz`; do
+  package=${i%.tar.xz}
+  v=${package##*-}
+  package=${i%-*}
   packages+=( "$package" )
   echo -n "${package}.. " >&2
   hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
   echo -n ${hash[$package]} >&2
 
+  version[$package]=$v
+
   if [ -n "${module[$package]}" ]; then
     m="${module[$package]}"
     echo " (${m})" >&2
@@ -60,7 +74,7 @@ for i in `cd "${dir}"; ls *-${release}.tar.xz`; do
     top_level+=( "$package" )
     echo " (top-level)" >&2
   fi
-  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
+  nix-store --add-fixed sha256 "${dir}/${i}" >&2
 done
 
 
@@ -68,12 +82,22 @@ print_pkg_hash() {
   echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
 }
 
+print_pkg_version() {
+  echo "  {name=\"${1}\";value=\"${version[$1]}\";}"
+}
+
 print_hashes(){
   echo "hashes=builtins.listToAttrs["
   for p in "${packages[@]}"; do print_pkg_hash "$p"; done
   echo "];"
 }
 
+print_versions(){
+  echo "versions=builtins.listToAttrs["
+  for p in "${packages[@]}"; do print_pkg_version "$p"; done
+  echo "];"
+}
+
 print_split_module(){
   echo -n "$1:" >&2
   echo -e "{\n  module=\"$1\";"
@@ -97,9 +121,11 @@ print_mono_module(){
   echo -en "{ module=\"$1\"; "
   print_sane "$1"
   echo -n "$1 ... " >&2
+  pkg=$(cd "$dir"; echo "$1"-*.tar.xz)
+  pkg="${pkg%.tar.xz}"
   echo -n " split=false;"
-  cml="$1-$release/CMakeLists.txt"
-  tar -xf "${dir}/$1-${release}.tar.xz" "$cml"
+  cml="$pkg/CMakeLists.txt"
+  tar -xf "${dir}/$pkg.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
@@ -124,7 +150,7 @@ print_mono_module(){
     echo " is monolithic (has no subdirs)" >&2
   fi
   rm $cml
-  rmdir $1-$release
+  rmdir "$pkg"
   echo "}"
 }
 
@@ -142,5 +168,6 @@ echo "Writing ${release}.nix" >&2
 exec > "${release}.nix"
 echo "{stable=${stable};"
 print_hashes
+print_versions
 print_modules
 echo "}"

From 1a1c83fa7756313618f29c26770bdee1ae3dfb88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jun 2014 20:24:23 +0200
Subject: [PATCH 12/61] alsa{Lib,Plugins}: update to 1.28.0

Dropped unrecognized option, patch no longer applying, fixed licenses.
---
 pkgs/os-specific/linux/alsa-lib/default.nix   | 16 +++-----
 .../linux/alsa-lib/mips-atomic.patch          | 39 -------------------
 .../linux/alsa-plugins/default.nix            | 17 ++++----
 3 files changed, 14 insertions(+), 58 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/alsa-lib/mips-atomic.patch

diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index 8ad77c6b99e..f46e54448b9 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,14 +1,14 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.0.27.2";
+  name = "alsa-lib-1.0.28";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
      "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
     ];
-    sha256 = "068d8c92122hwca5jzhrjp4a131995adlb1d79zgrm7gwy9x63k9";
+    sha256 = "0vaafg5q1q1mqcsgin5v7xlmngl3cnbmg5a9xxw0xcz1vn2ln1rw";
   };
 
   patches = [
@@ -18,11 +18,6 @@ stdenv.mkDerivation rec {
        See http://thread.gmane.org/gmane.linux.distributions.nixos/3435
     */
     ./alsa-plugin-dirs.patch
-
-    /* patch provided by larsc on irc.
-       it may be a compiler problem on mips; without this, alsa does not build
-       on mips, because lacks some symbols atomic_add/atomic_sub  */
-    ./mips-atomic.patch
   ];
 
   # Fix pcm.h file in order to prevent some compilation bugs
@@ -35,15 +30,13 @@ stdenv.mkDerivation rec {
     sed -i -e 's/u_int\([0-9]*\)_t/uint\1_t/g' include/pcm.h
   '';
 
-  configureFlags = "--disable-xmlto";
-
   crossAttrs = {
     patchPhase = ''
       sed -i s/extern/static/g include/iatomic.h
     '';
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.alsa-project.org/;
     description = "ALSA, the Advanced Linux Sound Architecture libraries";
 
@@ -52,6 +45,7 @@ stdenv.mkDerivation rec {
       MIDI functionality to the Linux-based operating system.
     '';
 
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/alsa-lib/mips-atomic.patch b/pkgs/os-specific/linux/alsa-lib/mips-atomic.patch
deleted file mode 100644
index 3af7c5d4deb..00000000000
--- a/pkgs/os-specific/linux/alsa-lib/mips-atomic.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/include/iatomic.h b/include/iatomic.h
-index e92dbfd..364bc5c 100644
---- a/include/iatomic.h
-+++ b/include/iatomic.h
-@@ -720,7 +720,7 @@ typedef struct { volatile int counter; } atomic_t;
-  * Atomically adds @i to @v.  Note that the guaranteed useful range
-  * of an atomic_t is only 24 bits.
-  */
--extern __inline__ void atomic_add(int i, atomic_t * v)
-+static __inline__ void atomic_add(int i, atomic_t * v)
- {
- 	unsigned long temp;
- 
-@@ -744,7 +744,7 @@ extern __inline__ void atomic_add(int i, atomic_t * v)
-  * Atomically subtracts @i from @v.  Note that the guaranteed
-  * useful range of an atomic_t is only 24 bits.
-  */
--extern __inline__ void atomic_sub(int i, atomic_t * v)
-+static __inline__ void atomic_sub(int i, atomic_t * v)
- {
- 	unsigned long temp;
- 
-@@ -763,7 +763,7 @@ extern __inline__ void atomic_sub(int i, atomic_t * v)
- /*
-  * Same as above, but return the result value
-  */
--extern __inline__ int atomic_add_return(int i, atomic_t * v)
-+static __inline__ int atomic_add_return(int i, atomic_t * v)
- {
- 	unsigned long temp, result;
- 
-@@ -784,7 +784,7 @@ extern __inline__ int atomic_add_return(int i, atomic_t * v)
- 	return result;
- }
- 
--extern __inline__ int atomic_sub_return(int i, atomic_t * v)
-+static __inline__ int atomic_sub_return(int i, atomic_t * v)
- {
- 	unsigned long temp, result;
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 5b822969968..59520b18cf2 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,26 +1,27 @@
 { stdenv, fetchurl, lib, pkgconfig, alsaLib, pulseaudio ? null, jackaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-plugins-1.0.27";
+  name = "alsa-plugins-1.0.28";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
       "http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
     ];
-    sha256 = "0ddbycq4cn9mc8xin0vh1af0zywz2rc2xyrs6qbayyyxq8vhrg8b";
+    sha256 = "081is33afhykb4ysll8s6gh0d6nm1cglslj9ck0disbyl3qqlvs2";
   };
 
+  # ToDo: a52, etc.?
   buildInputs =
     [ pkgconfig alsaLib ]
-    ++ stdenv.lib.optional (pulseaudio != null) pulseaudio
-    ++ stdenv.lib.optional (jackaudio != null) jackaudio;
+    ++ lib.optional (pulseaudio != null) pulseaudio
+    ++ lib.optional (jackaudio != null) jackaudio;
 
-  meta = { 
+  meta = with lib; {
     description = "Various plugins for ALSA";
     homepage = http://alsa-project.org/;
-    license = "GPL2.1";
-    maintainers = [lib.maintainers.marcweber];
-    platforms = lib.platforms.linux;
+    license = licenses.gpl2;
+    maintainers = [maintainers.marcweber];
+    platforms = platforms.linux;
   };
 }

From 36e79e3b90b9fe5bdd6b9f5e966c33d6d8547281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jun 2014 20:51:30 +0200
Subject: [PATCH 13/61] upower: pull patches used in Ubuntu/trusty (fix #2884)

---
 pkgs/os-specific/linux/upower/default.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index e9fa2b4adb1..605d3d7adc5 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
+{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit
 , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils
 , useSystemd ? true, systemd, gobjectIntrospection
 }:
@@ -13,6 +13,20 @@ stdenv.mkDerivation rec {
     sha256 = "06wqhab2mn0j4biiwh7mn4kxbxnfnzjkxvhpgvnlpaz9m2q54cj3";
   };
 
+  patches = [
+    (fetchpatch rec {
+      url = "http://anonscm.debian.org/gitweb/?p=pkg-utopia/upower.git;"
+        + "a=blob_plain;f=debian/patches/${name};hb=b424b2763fbbba95df8c6ab3feeb57d072a9ddf7";
+      sha256 = "0iq991abrn745icyz6x0wyixrjli01vbmbd9lnwwgyil58h3z8sp";
+      name = "no_deprecation_define.patch";
+    })
+    (fetchpatch {
+      url = "http://cgit.freedesktop.org/upower/patch/?id=22da1a0bc5943b683189418d8b0f766e91b2bdbe";
+      sha256 = "0yfgg6pw4bwskannvdwjxr75lgdrjpxhsskwlzm0frp8v5jy4k4z";
+      name = "clamp-battery-percentages.patch";
+    })
+  ];
+
   buildInputs =
     [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ]
     ++ stdenv.lib.optional useSystemd systemd;

From c7c626a897ce80eab8f6b85f9626757d38206b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jun 2014 22:54:16 +0200
Subject: [PATCH 14/61] farstream: minor update

---
 pkgs/development/libraries/farstream/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index bcc3821d5e2..eabb9789d79 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/pkgs/development/libraries/farstream/default.nix
@@ -4,10 +4,10 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "farstream-0.2.3";
+  name = "farstream-0.2.4";
   src = fetchurl {
     url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
-    sha256 = "15h4qv30ql3rnmlm4ac3h7rplvj7125z14fbfh1zrkajjaa3bxdz";
+    sha256 = "0c5vlyiwb799wpby4g9vffiy0nf09gy2cr84ksfy3jwzsxf5n38j";
   };
 
   buildInputs = [ libnice python pygobject gupnp_igd libnice ];

From 5c482db0dd701004ab02acdf48484057667bf0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jun 2014 23:02:18 +0200
Subject: [PATCH 15/61] telepathy_qt: minor update, drop not applying patch

Also enableParallelBuilding.
---
 .../libraries/telepathy/qt/cmake-2.8.12.diff  | 25 -------------------
 .../libraries/telepathy/qt/default.nix        | 15 ++++++++---
 2 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff

diff --git a/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff b/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
deleted file mode 100644
index f6e57c626c3..00000000000
--- a/pkgs/development/libraries/telepathy/qt/cmake-2.8.12.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake
-index c2eac76..b3131f0 100644
---- a/cmake/modules/FindQt.cmake
-+++ b/cmake/modules/FindQt.cmake
-@@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS)
- 
- MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options)
-   IF(QT_VERSION_MAJOR MATCHES 4)
--    QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+    ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+      QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+    ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-   ELSE(QT_VERSION_MAJOR MATCHES 4)
-     IF(QT_VERSION_MAJOR MATCHES 5)
--      QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "")
-+      ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-+        QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}")
-+      ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607)
-     ENDIF(QT_VERSION_MAJOR MATCHES 5)
-   ENDIF(QT_VERSION_MAJOR MATCHES 4)
- ENDMACRO(QT_CREATE_MOC_COMMAND)
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index f2e0d194562..4ec8c4befc6 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,18 +1,25 @@
-{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib
+{ stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib, dbus_daemon
 , telepathy_farstream, telepathy_glib, pythonDBus }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-qt-0.9.3";
+  name = "telepathy-qt-0.9.4";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
-    sha256 = "1yabyhsikw828ns7cf6hvzbxdxh53na1ck0q7qsav1lvlyz5gzy0";
+    sha256 = "1wk13rwpas1crj19xsbgl1c4qzri616xxa1hyhnykv4nkwxdpcgi";
   };
 
+  patches = [ ./farstream-0.2.diff ];
+
   nativeBuildInputs = [ cmake pkgconfig python libxslt ];
   propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib pythonDBus ];
-  patches = [ ./cmake-2.8.12.diff ./farstream-0.2.diff ];
+
+  buildInputs = stdenv.lib.optional doCheck dbus_daemon;
+
   preBuild = ''
     NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
   '';
+
+  enableParallelBuilding = true;
+  doCheck = false; # giving up for now
 }

From 87ef13ee80595f492217f958b090789f55d286ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jun 2014 23:19:22 +0200
Subject: [PATCH 16/61] telepathy-gabble: major update 0.17.2 -> 0.18.2

Also doCheck, enableParallelBuilding, and add meta attributes.
---
 .../telepathy/gabble/default.nix                | 17 ++++++++++++-----
 pkgs/top-level/all-packages.nix                 |  4 +---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
index b3036037f7f..7f9ffa8f5d9 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@@ -1,20 +1,27 @@
-{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib, dbus_daemon
 , sqlite, libsoup, libnice, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-gabble-0.17.2";
+  name = "telepathy-gabble-0.18.2";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-gabble/${name}.tar.gz";
-    sha256 = "137sslbgh0326lmwihcr2ybljgq9mzsx5wnciilpx884si22wpk8";
+    sha256 = "00ag32ccbj0hmy41rb0fg9gp40m7zbq45r4yijnyslk2mpkvg7c9";
   };
 
   nativeBuildInputs = [pkgconfig libxslt];
-  buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];
+  buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ]
+    ++ stdenv.lib.optional doCheck dbus_daemon;
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";
 
-  meta = {
+  enableParallelBuilding = true;
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "A Jabber/XMPP connection manager for the Telepathy framework";
     homepage = http://telepathy.freedesktop.org;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3ba6a64df2..6f59a8cff0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9552,9 +9552,7 @@ let
 
   telegram-cli = callPackage ../applications/networking/instant-messengers/telegram-cli/default.nix { };
 
-  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble {
-    inherit (pkgs.gnome) libsoup;
-  };
+  telepathy_gabble = callPackage ../applications/networking/instant-messengers/telepathy/gabble { };
 
   telepathy_haze = callPackage ../applications/networking/instant-messengers/telepathy/haze {};
 

From a00c34534334d52dece3f72f494fec325e3bf788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 19 Jun 2014 23:36:48 +0200
Subject: [PATCH 17/61] telepathy_mission_control: minor update, doCheck

Also add meta, and support upower.
---
 .../telepathy/mission-control/default.nix       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index a8142fc1e5c..b463ff2f230 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
@@ -1,20 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper }:
+{ stdenv, fetchurl, pkgconfig, telepathy_glib, libxslt, makeWrapper, upower }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-5.16.0";
+  name = "${pname}-5.16.2";
   pname = "telepathy-mission-control";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "1l61w6j04mbrjsbcfrlc0safh9nlsjnj0z6lszal64r9bhkcghzd";
+    sha256 = "1sk8f9jfaxgbsniz0n5hmrcwvxla3x8axjcnjbppg7nidk9gijrx";
   };
 
-  buildInputs = [ telepathy_glib makeWrapper ];
+  buildInputs = [ telepathy_glib makeWrapper upower ]; # ToDo: optional stuff missing
 
   nativeBuildInputs = [ pkgconfig libxslt ];
 
+  doCheck = true;
+
   preFixup = ''
     wrapProgram "$out/libexec/mission-control-5" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
+
+  meta = with stdenv.lib; {
+    description = "An account manager and channel dispatcher for the Telepathy framework";
+    homepage = http://telepathy.freedesktop.org/wiki/;
+    license = licenses.lgpl21;
+    platforms = platforms.unix;
+  };
 }

From 219cae447dabe459da1510c5815c01afdc94aac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 20 Jun 2014 00:22:38 +0200
Subject: [PATCH 18/61] llvmPackages: maintenance update to 3.4.2

Updated all that was released: llvm, clang, and libc++.
---
 pkgs/development/compilers/llvm/3.4/clang.nix   | 2 +-
 pkgs/development/compilers/llvm/3.4/default.nix | 4 ++--
 pkgs/development/compilers/llvm/3.4/llvm.nix    | 2 +-
 pkgs/development/libraries/libc++/default.nix   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix
index 7fe94cbf8d8..6ec3f7bf44a 100644
--- a/pkgs/development/compilers/llvm/3.4/clang.nix
+++ b/pkgs/development/compilers/llvm/3.4/clang.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "clang-${version}";
 
   unpackPhase = ''
-    unpackFile ${fetch "cfe" "1dvbkld0a1aqj6wcn0ia1wa8lwha30yfgq16j1r7akdka44z70xb"}
+    unpackFile ${fetch "cfe" "045wjnp5j8xd2zjhvldcllnwlnrwz3dafmlk412z804d5xvzb9jv"}
     mv cfe-${version}.src clang
     sourceRoot=$PWD/clang
     unpackFile ${clang-tools-extra_src}
diff --git a/pkgs/development/compilers/llvm/3.4/default.nix b/pkgs/development/compilers/llvm/3.4/default.nix
index 237c7f73d7f..ef4e8d4bbc5 100644
--- a/pkgs/development/compilers/llvm/3.4/default.nix
+++ b/pkgs/development/compilers/llvm/3.4/default.nix
@@ -15,13 +15,13 @@ let
 
   self = {
     llvm = callPackage ./llvm.nix rec {
-      version = "3.4.1";
+      version = "3.4.2";
       fetch = fetch_v version;
       inherit compiler-rt_src;
     };
 
     clang = callPackage ./clang.nix rec {
-      version = "3.4.1";
+      version = "3.4.2";
       fetch = fetch_v version;
       inherit clang-tools-extra_src;
     };
diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 52617acad43..fbc881fc8e0 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -15,7 +15,7 @@
 }:
 
 let
-  src = fetch "llvm" "0fprxrilnlwk9qv7f0kplxc7kd8mp4x781asssv2nfi4r9pbna3x";
+  src = fetch "llvm" "1mzgy7r0dma0npi1qrbr1s5n4nbj1ipxgbiw0q671l4s0r3qs0qp";
 in stdenv.mkDerivation rec {
   name = "llvm-${version}";
 
diff --git a/pkgs/development/libraries/libc++/default.nix b/pkgs/development/libraries/libc++/default.nix
index 70da4462486..2268801bad5 100644
--- a/pkgs/development/libraries/libc++/default.nix
+++ b/pkgs/development/libraries/libc++/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, fetchsvn, cmake, libcxxabi, python }:
 
 let
-  version = "3.4";
+  version = "3.4.2";
 
 in stdenv.mkDerivation rec {
   name = "libc++-${version}";
 
   src = fetchurl {
     url = "http://llvm.org/releases/${version}/libcxx-${version}.src.tar.gz";
-    sha256 = "1sqd5qhqj7qnn9zjxx9bv7ky4f7xgmh9sbgd53y1kszhg41217xx";
+    sha256 = "0z3jdvgcq995khkpis5c5vaxhbmvbqjlalbhn09k6pgb5zp46rc2";
   };
 
   buildInputs = [ cmake libcxxabi python ];

From a4042c373b3c3c5c858224f27cae77791a1241f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 20 Jun 2014 10:11:41 +0200
Subject: [PATCH 19/61] alsa{Oss,Utils}: update to 1.0.28

I somehow forgot to update these other parts.
---
 pkgs/os-specific/linux/alsa-oss/default.nix   | 10 ++++++----
 pkgs/os-specific/linux/alsa-utils/default.nix | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-oss/default.nix b/pkgs/os-specific/linux/alsa-oss/default.nix
index 904c56665d1..0d02daebe1d 100644
--- a/pkgs/os-specific/linux/alsa-oss/default.nix
+++ b/pkgs/os-specific/linux/alsa-oss/default.nix
@@ -1,12 +1,14 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-oss-1.0.25";
+  name = "alsa-oss-1.0.28";
 
   src = fetchurl {
-    url = "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2";
-    # url = "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2";
-    sha256 = "ed823b8e42599951d896c1709615d4cf7cb1cb3a7c55c75ccee82e24ccaf28e3";
+    urls = [
+      "ftp://ftp.alsa-project.org/pub/oss-lib/${name}.tar.bz2"
+      "http://alsa.cybermirror.org/oss-lib/${name}.tar.bz2"
+    ];
+    sha256 = "1mbabiywxjjlvdh257j3a0v4vvy69mwwnvc3xlq7pg50i2m2rris";
   };
 
   buildInputs = [ alsaLib ncurses libsamplerate ];
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index 6167696f336..7ab4a919786 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,12 +1,14 @@
 {stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate}:
 
 stdenv.mkDerivation rec {
-  name = "alsa-utils-1.0.27.2";
+  name = "alsa-utils-1.0.28";
 
   src = fetchurl {
-    # url = "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2";
-    url = "http://alsa.cybermirror.org/utils/${name}.tar.bz2";
-    sha256 = "1sjjngnq50jv5ilwsb4zys6smifni3bd6fn28gbnhfrg14wsrgq2";
+    urls = [
+      "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
+      "http://alsa.cybermirror.org/utils/${name}.tar.bz2"
+    ];
+    sha256 = "1k1ach1jv0bf71klj9sqaijnw9wjrjad0g5in6bpfnhjn24lrzzk";
   };
 
   buildInputs = [ alsaLib ncurses libsamplerate ];

From dac60392fc99bb21038d0365f76a8afcefc98344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 22 Jun 2014 11:37:43 +0200
Subject: [PATCH 20/61] fontconfig: attempt to fix installation on darwin

---
 pkgs/development/libraries/fontconfig/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix
index 73461b077de..5e211c74d5e 100644
--- a/pkgs/development/libraries/fontconfig/default.nix
+++ b/pkgs/development/libraries/fontconfig/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   # Don't try to write to /var/cache/fontconfig at install time.
-  installFlags = "fc_cachedir=$(TMPDIR)/dummy";
+  installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false";
 
   postInstall = ''
     cd "$out/etc/fonts" && tar xvf ${infinality_patch}

From 6ca980f0b4096175dc3e0b9ddf7a7e3558da89ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 22 Jun 2014 14:11:46 +0200
Subject: [PATCH 21/61] llpp: fix freetype include path

Fixes build, probably after freetype-2.5 update.
---
 pkgs/applications/misc/llpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix
index 81ca87af707..e04898fba29 100644
--- a/pkgs/applications/misc/llpp/default.nix
+++ b/pkgs/applications/misc/llpp/default.nix
@@ -20,11 +20,11 @@ stdenv.mkDerivation {
     ccopt="-O"
     ccopt="$ccopt -I ${jbig2dec}/include"
     ccopt="$ccopt -I ${libjpeg}/include"
-    ccopt="$ccopt -I ${freetype}/include"
+    ccopt="$ccopt -I ${freetype}/include/freetype2"
     ccopt="$ccopt -I ${openjpeg}/include"
     ccopt="$ccopt -I ${zlib}/include"
     ccopt="$ccopt -I ${mupdf}/include"
-    ccopt="$ccopt -include ${freetype}/include/ft2build.h"
+    ccopt="$ccopt -include ft2build.h"
     ccopt="$ccopt -D_GNU_SOURCE"
 
     cclib="$cclib -lmupdf"

From ab184b33886c8a2ecb8f62680e654604bac3e166 Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 22 Jun 2014 19:28:18 +0200
Subject: [PATCH 22/61] kde: Allow kde_next as a desktop environment

---
 .../services/x11/desktop-managers/default.nix |   2 +-
 .../x11/desktop-managers/kde4_next.nix        | 163 ++++++++++++++++++
 2 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/x11/desktop-managers/kde4_next.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index b82398ccf9d..5c30d3c0f53 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -17,7 +17,7 @@ in
   # Note: the order in which desktop manager modules are imported here
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
-  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./e17.nix ./gnome3.nix ./xbmc.nix ];
+  imports = [ ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix ./e17.nix ./gnome3.nix ./xbmc.nix ];
 
   options = {
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde4_next.nix b/nixos/modules/services/x11/desktop-managers/kde4_next.nix
new file mode 100644
index 00000000000..fc27c49e0de
--- /dev/null
+++ b/nixos/modules/services/x11/desktop-managers/kde4_next.nix
@@ -0,0 +1,163 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  xcfg = config.services.xserver;
+  cfg = xcfg.desktopManager.kde4_next;
+  xorg = pkgs.xorg;
+  kde = pkgs.kde4_next;
+
+  # Disable Nepomuk and Strigi by default.  As of KDE 4.7, they don't
+  # really work very well (e.g. searching files often fails to find
+  # files), segfault sometimes and consume significant resources.
+  # They can be re-enabled in the KDE System Settings under "Desktop
+  # Search".
+  nepomukConfig = pkgs.writeTextFile
+    { name = "nepomuk-config";
+      destination = "/share/config/nepomukserverrc";
+      text =
+        ''
+          [Basic Settings]
+          Start Nepomuk=false
+
+          [Service-nepomukstrigiservice]
+          autostart=false
+        '';
+    };
+
+  phononBackends = {
+    gstreamer = [
+      pkgs.phonon_backend_gstreamer
+      pkgs.gst_all.gstPluginsBase
+      pkgs.gst_all.gstPluginsGood
+      pkgs.gst_all.gstPluginsUgly
+      pkgs.gst_all.gstPluginsBad
+      pkgs.gst_all.gstFfmpeg # for mp3 playback
+      pkgs.gst_all.gstreamer # needed?
+    ];
+
+    vlc = [pkgs.phonon_backend_vlc];
+  };
+
+  phononBackendPackages = flip concatMap cfg.phononBackends
+    (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
+
+in
+
+{
+  options = {
+
+    services.xserver.desktopManager.kde4_next = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Enable the KDE 4 desktop environment.";
+      };
+
+      phononBackends = mkOption {
+        type = types.listOf types.str;
+        default = ["gstreamer"];
+        example = ["gstreamer" "vlc"];
+        description = "Which phonon multimedia backend kde should use";
+      };
+    };
+
+  };
+
+
+  config = mkIf (xcfg.enable && cfg.enable) {
+
+    # If KDE 4 is enabled, make it the default desktop manager (unless
+    # overridden by the user's configuration).
+    # !!! doesn't work yet ("Multiple definitions. Only one is allowed
+    # for this option.")
+    # services.xserver.desktopManager.default = mkOverride 900 "kde4_next";
+
+    services.xserver.desktopManager.session = singleton
+      { name = "kde4_next";
+        bgSupport = true;
+        start =
+          ''
+            # The KDE icon cache is supposed to update itself
+            # automatically, but it uses the timestamp on the icon
+            # theme directory as a trigger.  Since in Nix the
+            # timestamp is always the same, this doesn't work.  So as
+            # a workaround, nuke the icon cache on login.  This isn't
+            # perfect, since it may require logging out after
+            # installing new applications to update the cache.
+            # See http://lists-archives.com/kde-devel/26175-what-when-will-icon-cache-refresh.html
+            rm -fv $HOME/.kde/cache-*/icon-cache.kcache
+
+            # Qt writes a weird ‘libraryPath’ line to
+            # ~/.config/Trolltech.conf that causes the KDE plugin
+            # paths of previous KDE invocations to be searched.
+            # Obviously using mismatching KDE libraries is potentially
+            # disastrous, so here we nuke references to the Nix store
+            # in Trolltech.conf.  A better solution would be to stop
+            # Qt from doing this wackiness in the first place.
+            if [ -e $HOME/.config/Trolltech.conf ]; then
+                sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+            fi
+
+            # Start KDE.
+            exec ${kde.kdebase_workspace}/bin/startkde
+          '';
+      };
+
+    security.setuidOwners = singleton
+      { program = "kcheckpass";
+        source = "${kde.kdebase_workspace}/lib/kde4/libexec/kcheckpass";
+        owner = "root";
+        group = "root";
+        setuid = true;
+      };
+
+    environment.systemPackages =
+        [ kde.kdelibs
+
+          kde.kde_baseapps # Splitted kdebase
+          kde.kde_workspace
+          kde.kde_runtime
+          kde.konsole
+          kde.kate
+
+          kde.kde_wallpapers # contains kdm's default background
+          kde.oxygen_icons
+          pkgs.virtuoso # to enable Nepomuk to find Virtuoso
+
+          # Starts KDE's Polkit authentication agent.
+          kde.polkit_kde_agent
+
+          # Miscellaneous runtime dependencies.
+          kde.qt4 # needed for qdbus
+          pkgs.shared_mime_info
+          xorg.xmessage # so that startkde can show error messages
+          xorg.xset # used by startkde, non-essential
+          xorg.xauth # used by kdesu
+          pkgs.shared_desktop_ontologies # used by nepomuk
+          pkgs.strigi # used by nepomuk
+          pkgs.mysql # used by akonadi
+        ]
+       ++ lib.optional config.hardware.pulseaudio.enable kde.kmix  # Perhaps this should always be enabled
+       ++ lib.optional config.hardware.bluetooth.enable kde.bluedevil
+       ++ lib.optional config.networking.networkmanager.enable kde.networkmanagement
+      ++ [ nepomukConfig ] ++ phononBackendPackages;
+
+    environment.pathsToLink = [ "/share" ];
+
+    environment.etc = singleton
+      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
+        target = "X11/xkb";
+      };
+
+    # Enable helpful DBus services.
+    services.udisks2.enable = true;
+    services.upower.enable = config.powerManagement.enable;
+
+    security.pam.services.kde = { allowNullPassword = true; };
+
+  };
+
+}

From f34e801dd10c3c97eb3a8af82aea781bf30969ca Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Sun, 22 Jun 2014 19:35:31 +0200
Subject: [PATCH 23/61] kde: Make kde4_next desktop compile

---
 pkgs/desktops/kde-4.13/default.nix            |   4 +-
 pkgs/desktops/kde-4.13/kde-package/4.12.4.nix | 444 -------------
 pkgs/desktops/kde-4.13/kde-package/4.13.2.nix | 625 ++++++++++++++++++
 pkgs/desktops/kde-4.13/kde-wallpapers.nix     |   2 +-
 pkgs/desktops/kde-4.13/kde-workspace.nix      |  14 +-
 .../kde-4.13/kdeartwork/kscreensaver.nix      |   4 +-
 pkgs/desktops/kde-4.13/kdeedu/artikulate.nix  |  11 +
 pkgs/desktops/kde-4.13/kdeedu/kalzium.nix     |   4 +-
 .../kde-4.13/kdeedu/kqtquickcharts.nix        |   8 +
 pkgs/desktops/kde-4.13/kdeedu/kstars.nix      |   4 +-
 pkgs/desktops/kde-4.13/kdeedu/step.nix        |   4 +-
 .../kde-4.13/kdelibs/baloo-widgets.nix        |  11 +
 pkgs/desktops/kde-4.13/kdelibs/baloo.nix      |  15 +
 .../kde-4.13/kdelibs/kfilemetadata.nix        |  12 +
 pkgs/desktops/kde-4.13/kdeplasma-addons.nix   |   8 +-
 pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh  |   1 +
 .../kde-4.13/l10n/manifest-4.12.4.nix         | 262 --------
 .../kde-4.13/l10n/manifest-4.13.2.nix         | 267 ++++++++
 pkgs/desktops/kde-4.13/oxygen-icons.nix       |   2 +-
 .../kde-4.13/support/akonadi/default.nix      |  13 +-
 pkgs/top-level/all-packages.nix               |   2 -
 21 files changed, 976 insertions(+), 741 deletions(-)
 delete mode 100644 pkgs/desktops/kde-4.13/kde-package/4.12.4.nix
 create mode 100644 pkgs/desktops/kde-4.13/kde-package/4.13.2.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/artikulate.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdelibs/baloo.nix
 create mode 100644 pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix
 delete mode 100644 pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix
 create mode 100644 pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix

diff --git a/pkgs/desktops/kde-4.13/default.nix b/pkgs/desktops/kde-4.13/default.nix
index ffcd3115de7..14861a8885f 100644
--- a/pkgs/desktops/kde-4.13/default.nix
+++ b/pkgs/desktops/kde-4.13/default.nix
@@ -1,7 +1,7 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.4" }:
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.13.2" }:
 
 let
-  branch = "4.12";
+  branch = "4.13";
 
   # Need callPackageOrig to avoid infinite cycle
   kde = callPackageOrig ./kde-package {
diff --git a/pkgs/desktops/kde-4.13/kde-package/4.12.4.nix b/pkgs/desktops/kde-4.13/kde-package/4.12.4.nix
deleted file mode 100644
index 9b5a53cee48..00000000000
--- a/pkgs/desktops/kde-4.13/kde-package/4.12.4.nix
+++ /dev/null
@@ -1,444 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="amor";value="0c8298z7c3a71yj6nik7h8h7rngqzrz6rc95kl990p37jp2ng0d9";}
-  {name="analitza";value="0l122nh81nf7r4bm73gc6dp9k4jh2dxc7majrzjq37hb8pi77njh";}
-  {name="ark";value="155bhqqyw3afm99c47b3pxqf9fiqcz6gqg1pavsx9q4rmk7rp8m6";}
-  {name="audiocd-kio";value="1c5234s1hdh6jc8szyb4nwqr1h8hhwlmin0iyxabsl0c45pss9pa";}
-  {name="blinken";value="0q0y3xfv3pjrw0h8mnbigpywwrqk8wb2lqbjcgk755j6syinhphh";}
-  {name="bomber";value="1f12qmg58n9sj6vjqdj57ch50pq5f0h6anx06x9bhhs502w6aqwy";}
-  {name="bovo";value="10x4qy4vdp76iv3n60iy24lk1wbsjdfr88l1m9xifj4k942wk2ir";}
-  {name="cantor";value="1x5rxshdbgl40cqx6h5r0hx49rrc6gwnabsl8b7kzimh0kbv2ma9";}
-  {name="cervisia";value="0ia78cjkq606232jy14ps7cpm77pq4xdmcfimv4l6p0xjpq8jzsg";}
-  {name="dolphin-plugins";value="08h278jpbll7wc1mhz58cklj1bkrk61dfwjlflag6fnlm6i4xx8k";}
-  {name="dragon";value="16gyr0dl50nl9r3yc2fkwmqlrfgzzyim6bdlb9a76winzbz8mgxr";}
-  {name="ffmpegthumbs";value="01cmwm6w1z2gsllwdmrzsl9882fw5k59lr1k7z114kkrh1l0b2j4";}
-  {name="filelight";value="01rs1r80ixm1dj5d73a22893rdz2srxqp4dv5pysw1fhn02zdkkf";}
-  {name="granatier";value="1ia85yxfbbi8qxdyn0vwgmdjrxwssb6nadbia1yqsjdncfsnhbvs";}
-  {name="gwenview";value="01p5b1z05v3c7f192fxrrfp6x3ss7gx8pxv29czkp641hpmcg3jl";}
-  {name="jovie";value="1hfkj3vlvm63sgb4gx3xl7nksb5cfqnh7shs7wqm3gl6yj2rwhjj";}
-  {name="juk";value="1vxnrxz6gbyk7fd15akhiyczpgq03cym3nldi61m958cx4khd4y7";}
-  {name="kaccessible";value="0a9r2bk8a5h7mpl37li3bqbsz5dfgn8rsxnri93msvc6555pnyzv";}
-  {name="kactivities";value="1fl638cyj3abxfmbqcfqsd3idmdmys1xim4flf1jpbqa29psl75j";}
-  {name="kajongg";value="19awqjqn9hqhprzi7mjb6nkrgvb3mzhignkgalfjd4j5rga7vzz0";}
-  {name="kalgebra";value="1bj88nh7znk86i6a4d3jcjyqp46kzipfc99xvhxvqdsy8drbrwjp";}
-  {name="kalzium";value="00pjpdbd11jgzs443kgh8y6pxf3ff0ypgl5j3zfa6gbj18cnkkq0";}
-  {name="kamera";value="12mcjw8l0nh2jbi04myx1y1irbf92x9bx93gdymw939lawaalqic";}
-  {name="kanagram";value="1yd5agh61nv4ajlrijxg5g3hvw0xjxdvnc6h3lbz5mgvc8smvazk";}
-  {name="kapman";value="1aa78q6y2s9dig2603b9nry5rx5jbbxz2pb3jxr323hmqxp6jy1z";}
-  {name="kapptemplate";value="08j8xh9spk6ymlichl74n1v2zn342d94m6f4jragnx2jvif2163k";}
-  {name="kate";value="1cxc9bgzvfpns7dhmmafzxhnyjqxyq0adr0l1mbwsahxpkblc30r";}
-  {name="katomic";value="01lk7ajlj98rjbs76xd9r3hnd98dy49xv809m2zchm5ria7hdh48";}
-  {name="kblackbox";value="1sgbs0flllmy6d3518wwnzmdr14kqkxsi76h2p4xyk3bq2g9q2xg";}
-  {name="kblocks";value="1zinpxbvri52r26qiiiv4j4r02a22947hcrchf1z3n6lf817vqwv";}
-  {name="kbounce";value="0f9ssdpicvkiv7dxnj75h1cmz24mz2sy2zyp7rw7mvr9ynnl8w21";}
-  {name="kbreakout";value="02ix39kfkagmsqs8icqrqy9cz90lbl2wqajyjzrshw1vi29iahc7";}
-  {name="kbruch";value="0mfqdgwd5d8sy3bdiicpd5927dgg6zhm521f2q853qd2sqjbspgl";}
-  {name="kcachegrind";value="0dydarm1a2i64nazcl59s0a8b8z7znnm20wdmx2gfm5377j98y8x";}
-  {name="kcalc";value="1znrv4fqwaf56djf9qg6fxcp7nfi7fzza2whjlkayvc9kxv3ah9y";}
-  {name="kcharselect";value="0mbl9zvb9hp0xdi58v0vb8z0by71xkz22pr9flnkar5b1klnjpdb";}
-  {name="kcolorchooser";value="1d1cyaqi0rhwfnmjbxpjjavgwjhr3pd2rywlxxb9g4q3rv8k7wg5";}
-  {name="kcron";value="033f0s14crqpsirhgysi309b9pj02vwsd7fr28n6n2sh5imj30a0";}
-  {name="kdeartwork";value="08snjhaqiddiaj5jfd0vx1fjijsyqwngy7p1mkpdfhj7575sbx7c";}
-  {name="kde-baseapps";value="0k0mfbpvmv0n2brrb8hc0rd1wz04m3cyr1byb0z34a7x7kk1h1i4";}
-  {name="kde-base-artwork";value="0vmkbmir7hviqkv7nqrbqd6skj2srp9w4nrs8rkcvq7c8n76rk5w";}
-  {name="kde-dev-scripts";value="0l5frvb1akhy86j3yic3n1jirclj8r1jwjn760fi89vl1xysrarq";}
-  {name="kde-dev-utils";value="0807c8mq8rqqk8vf9r1idqmqrlfv9bsc8rjn8mfv2ch49mzzdrdj";}
-  {name="kdegraphics-mobipocket";value="1m6lnkr460261iq634lz887dbhvmj56p97k4llch3h80ra10mlh8";}
-  {name="kdegraphics-strigi-analyzer";value="1rqb1lzqb39p95xpf8c26pm9rxhcmycd518hxzp8arz6k2chazj8";}
-  {name="kdegraphics-thumbnailers";value="04aaxjznb176ym89f06gp4bycg67zndwc451mkdr33mal58jh0zs";}
-  {name="kdelibs";value="0dn0z1fs4vym7cp2749viw171dhay9ql2dp65a4hphmsdmk9bzv4";}
-  {name="kdenetwork-filesharing";value="1r3a5y9nmcf06nqsdh8k4jny7dmrhya8xi3jwz0d1mfzlfjksyf7";}
-  {name="kdenetwork-strigi-analyzers";value="0gqj5b91q3l5hna6zbgm17wi54g7g058n605adc1mch97yshqyrd";}
-  {name="kdepim";value="00lsyg6762kd2qvhhqq6vrrrl1fbk07yd3ha8w1yyjwiy9cnsy7z";}
-  {name="kdepimlibs";value="1h7k5ravilwz9r5lh7dqjnzh9h8hz43plbdaicjwk2sg4mqwzzhh";}
-  {name="kdepim-runtime";value="1z631kag1gpmk2ljk64vhscr3lad3mj3599phh0i8jqlxvr4007c";}
-  {name="kdeplasma-addons";value="0lfza3454hzbicqpz0ipjys9brjkblmpsngqg5njxd6ph9mzg34a";}
-  {name="kde-runtime";value="05n5cllsjyf03bgisykrbc74i7a3nm5f0k6hnq9sphf8xnxl318x";}
-  {name="kdesdk-kioslaves";value="045kf44s2gg3i2xl6087zn3cz80y7li26fzxdvvv89ywcq0npg59";}
-  {name="kdesdk-strigi-analyzers";value="15xxpgiy5bp6m78crw448mzv3yijjzipsrybadrbwqz6p7dpysbv";}
-  {name="kdesdk-thumbnailers";value="039rgq5p4mkdrilcvkf6k1d9d45swk74hdg3qnsbz3m47vqqf92h";}
-  {name="kde-wallpapers";value="0z7ffz2i410k2xxl1cr8m74mm90c5sizpbhmhyqxwjlsbz1gwfya";}
-  {name="kdewebdev";value="0ljwbzdcshjaz2dv7yp4ckj0c0jxa60ka6vjbhdmc4x7nvwnx737";}
-  {name="kdf";value="0s8ms5h5gdfa3697xg1yzz0h2hijlv68gi2g7n7g3xwpawbqrzv1";}
-  {name="kdiamond";value="10v7zrj4d96ppawjib1jgdz00455h8334w4vb619g448pj5h66sn";}
-  {name="kfloppy";value="1fd7wwbxngaiy0fbxvqp027rp61jg8fwajz70lx7acs20kcs0301";}
-  {name="kfourinline";value="1s2gc7zk932ks89c24pyimcsspnmabbmsdjh520xkzzxrp41gz0b";}
-  {name="kgamma";value="0n19zrarda9fvhimgnm84mdcaqgcqn4qfr0yw6i76la24pjbl46y";}
-  {name="kgeography";value="0w32841fligd3gyjl34q2f31jldw2vl47bi6cljwp7nlkdlp0lkn";}
-  {name="kget";value="1kls245b5s2dlxcrpa4d969zlr2lw797p7p2ilyhb4rbv871c0wd";}
-  {name="kgoldrunner";value="10xq9827gwib6w9h4hhys1v896rxqd50mz66k3frnrqals04zbbk";}
-  {name="kgpg";value="1wa5ymibiqnjxl5ck94y1xh3qk0bx3v7k7n2y3jcvprmhglffx6j";}
-  {name="khangman";value="1jfi30cb17gkn7v3i42wj0pqgaq3mr4fjbwh60ikvhxxd0nf5nny";}
-  {name="kig";value="1z0f50m1hgr5jj79v5v610bdggy4knlqnbxpnwf6ihj60v3cn0x0";}
-  {name="kigo";value="1klcgh3bpl3gqyh5zvij7ah754wjjf409a9l1xqxjigz4samnism";}
-  {name="killbots";value="04vy4zybgqls4whymqnzgkfbmzb17cc1m2xf2hp32bq5fq0r8103";}
-  {name="kimono";value="1bqbgch1z2nm143sp4lwnh3swvmvavhkj4scgx6d17m24jgd69hn";}
-  {name="kiriki";value="04r7p5f9a2iwv7c40pcnbga5ldcfjjig31fx81ww0b6p62dv2vrl";}
-  {name="kiten";value="1fxyy805b1q2sxdkd0hq2fr6plbnawzyascsbwychsqsasw2rmng";}
-  {name="kjumpingcube";value="0q2hn6lvz5grwz10nqq5jkcg3j1lgqsmmmhmx0glr4c732hg1z1d";}
-  {name="klettres";value="1w4340gaaip8imwy5d0058600v6fi7wnifppay2l7kvlp09iwmws";}
-  {name="klickety";value="088xvrb1jn8f3cfh39387pzw9simrjan63c24hn76290fkqjadgq";}
-  {name="klines";value="0n3bsvf5skr4816mjrd7zqjnh8vp5klvgx3h0025hwcbqyfa64bs";}
-  {name="kmag";value="0x91b1fwvwppiwzsnvc0647429ffhn56gndykmmyzr27i45znk3r";}
-  {name="kmahjongg";value="19qz7q5sr5xphzwxjf84h5vg0fll45fvs3pi5q9a5x5g4dy14wsv";}
-  {name="kmines";value="1nm7di7xs727jvfvv2039hpgkxzddgfv6vvrw3jwls975akl1wmb";}
-  {name="kmix";value="19s9z6m1v3wk5prngmm612r34013z7dkira83ap6kn3v32cfciry";}
-  {name="kmousetool";value="1zf7d3k1jf5ydaiw7v7a34hd5w4fmgkd4g9427546x64n27vx0a2";}
-  {name="kmouth";value="12n1x1imy7w3rn8g8zawmfivic0avzgrpmwm71hy7kxw9ya24yjg";}
-  {name="kmplot";value="1zji3lkq332zgvccnlisdavwxh0d1x81131xcy25r36q9c42syj3";}
-  {name="knavalbattle";value="0ibbahwck80z1dhycvm52k4nnj0pifzf9vi7j64kczc54z20b6d2";}
-  {name="knetwalk";value="0j8lyv60rvs5w214vhpmkf0807vi8b2vc8lglmmvz66cpw42c45z";}
-  {name="kolf";value="060dmnpr84g1512l0c0myxf1h1qp4jdsfgnxg5vwpciqk0dc9qhy";}
-  {name="kollision";value="033x8dg57f5amsnignri6ln8adavbaw1l3sydlf0jrw7ww3qvw1h";}
-  {name="kolourpaint";value="0c7i95cplwvxxm6aqgsk70q8ny8yfarcah9113vk6b81llbwn5sc";}
-  {name="kompare";value="0mq2v9nissb5s41lwvjbpba6fznkzwah9a7yisjq1nq47rp4ymqb";}
-  {name="konquest";value="0bsqxr12x9qgk4al21s2hrm48hv15ir98792z8jna3d5w6j0a2zy";}
-  {name="konsole";value="13kv6pmziqfis4qxkfxbmm3yiy2w3fy2l2qi68l0s6yiaqkd9y37";}
-  {name="kopete";value="012zjq0zmqkgahnzzj02xaqhsh800bn1x7sj8vmv1mxqyi66srvy";}
-  {name="korundum";value="1qyk8gvzcjwi5pi7s0a74glyvi1mi7k5z5ilza16y0z5k6ffgvck";}
-  {name="kpat";value="0lmhygv4l1vkmbf7vmrbns6fl1anbcxsnldn0hccdpp73x1py88g";}
-  {name="kppp";value="0nnz137c384xlnrvy625zdjfzzrp6yrcfnn9gw6fs81cq4zwrr64";}
-  {name="krdc";value="0g7p94q0h3i3j9wwcmmiylz0604v4z9f0b2dppfiaq5bnz9m5pdl";}
-  {name="kremotecontrol";value="1hg4fq6ypws4zb07glsrflmr7vq35h7qqmjf5r5b5j53xqmgr6hp";}
-  {name="kreversi";value="059xsi9x6jhsdsgrxrk08haz1v4p4i46l7zkg8id64s9kvywgn5j";}
-  {name="krfb";value="01l8jv5ad3gc5kxjbr7k4ggcipc5903z82pq9616mk0qpd96j6jb";}
-  {name="kross-interpreters";value="0cdb9kaq9fdjaxks83z3gvjwwhz94g4kgjq1rp6wmzwydk28ip6i";}
-  {name="kruler";value="0i9n2znhm6llriipvrrjh8yymj76a17895w7kbcyd41srk0akk5i";}
-  {name="ksaneplugin";value="1fqkbf47ajw7ckzipphdjpnpv4gk426k1rpq3z1qlbag9f9wvxsd";}
-  {name="kscd";value="1f8099bhylrr5m3a5lrmjxz2rz59k3qi1abfjs63hk2z523p99n3";}
-  {name="kshisen";value="1nhq2rxiylzr7klpqqbhl35v7s4prv15wrckgx84mdm5hmyh4nsw";}
-  {name="ksirk";value="0s577h7sswqr44mzmm2a5gi62w8lpzivy9xy5jpib3iw768a9gxy";}
-  {name="ksnakeduel";value="09jp1cd138cqv131h7m3c994zwxbn97yw77fq1yrcfgyspmdx0x9";}
-  {name="ksnapshot";value="1fiqracij106c22b0ws6n047wn4fww5fzli8rqjas5m25931azl4";}
-  {name="kspaceduel";value="1a2n9kyn6y62yps5apclgpmzbchdrfn3lck9fl68alk0bpqdnz1n";}
-  {name="ksquares";value="1bg9na03ph1lignnl6fdxkvcbsq77dskbgn8d7hyq1p800n7jx7q";}
-  {name="kstars";value="1wf13434sxxwikrp29jl5klggmv0ln73a57rs0m4gr4zrjvbrs2s";}
-  {name="ksudoku";value="1nq4nj1q723s7gv1d0l3wafs2d6wz67xhir2sa1wsw12dzh856vf";}
-  {name="ksystemlog";value="0khb92vxr0hfny2yxwnww33ahgm9gmmrf5h7qaj0lqnyrh5fcl6c";}
-  {name="kteatime";value="13jzf4mcq8glkhg5szpawj2k0ss4qfzrjhpmjn3m3grz1zf167sw";}
-  {name="ktimer";value="0y6q9khxlmb7pgds4f9a83aqnbn0gwbi3r15s8vf72qr3qj3f5xc";}
-  {name="ktouch";value="1swdkzvm9q4r8ily7n4cs91y186zlzys7kjs3lf2q46d63l9nfdz";}
-  {name="ktuberling";value="0fzd17hvb2zaqwd0fw6f3rq0mlq8xrmz155dyg916jg2alslicxh";}
-  {name="kturtle";value="1hlfv77g0v48qfqwpqqnw5qf8fcl4v38612v3jy5z038g4sacxkx";}
-  {name="ktux";value="0shib3f2gcdgf88zh2w67kizbmj7gz0vqy8ff5vmr75fp44111b4";}
-  {name="kubrick";value="1dkd7rzkxyk71hd4r9l6nlvcl3zj8vf6i9v1gqi8zjrqwpxvf188";}
-  {name="kuser";value="1qc4wk5q9y7mmkfjqndcby7782z2aaj7x1cc4dcmds01glm2bw6j";}
-  {name="kwalletmanager";value="1f0ncnx3d6z3v373095nhydj844hiva64qh80cc7rmb624vlcsa4";}
-  {name="kwordquiz";value="1m0zi0gldw7shjy4nhiw2azgrfvhcmm5h423gckjczpqd9f17ihd";}
-  {name="libkcddb";value="0k1xr8z3dmfq08qh7fkjhi2v523lhy1inmggnk3gaxzarlvhqxxa";}
-  {name="libkcompactdisc";value="03ch51firb2xcqwy3p6q5j5zr9570nvqa5cgd5yj7pjnzdwcjxv8";}
-  {name="libkdcraw";value="1ypamhdk8y7vb9y250vilmv5dgxf1svvsw329yxc146ii0pb4nwr";}
-  {name="libkdeedu";value="0m20vxa9x2ww7xmq1a7j4pmqsdj5pp05hsg4q64slz69m5npi30r";}
-  {name="libkdegames";value="1hz02x2k7iiw0i78ifa4ji60l87by855v5f6pm3ksw3rdw0ipz9v";}
-  {name="libkexiv2";value="0mz88j3kszqxf518h7n0fjnql2iqwx780hv4jhvrkraclf4czng9";}
-  {name="libkipi";value="0x4d356c20fdjaqadzaqhsf43v9c9bgbwbyy304q2w329m8ab058";}
-  {name="libkmahjongg";value="0911knwvhwa77hr0ncqwjqzfcyvgi806ckyldglrhvm0gw0mgy60";}
-  {name="libkomparediff2";value="0rn5xhbnywjjbk9qx3xw3gss57l105a4a4v05gh9vvl82hc5sfzx";}
-  {name="libksane";value="19zibd1y96sxwnpdxkd752jiky83b8is85qi7six60g5kkzi948m";}
-  {name="lokalize";value="0sl9i146rx0ls3rii6893alkvsjv8ln0d5yabd72f8kagsaw42h7";}
-  {name="lskat";value="1flx7l8svf51fkr3lw0z85d0gkrabjzi73w4qn2wnsaz9wr6kahi";}
-  {name="marble";value="1gvlq0si76bk4yd8dfbixzwxj618ifd2jlr7fq6f9mx498cvifpi";}
-  {name="mplayerthumbs";value="1nw01216mghwxz7zhkf7px5kkb2d4dqdk7par20agvw2raan9axi";}
-  {name="nepomuk-core";value="0gavipa1hn5aw77q3xrdv9464l8qpabq6kawlvjvv90hjvs8clis";}
-  {name="nepomuk-widgets";value="1cr4v4s567vcx1046gj066xfmhrqx4g6lipffr6d3wdq9cgy5y5i";}
-  {name="okteta";value="0maadxyngj8an0hl3kidvmgj538n6vzpz964yilzj6qrry9f46wc";}
-  {name="okular";value="0cmcaqpaxx8910qmsvag6spjbchdbv6j9hgbizw6qq09kz4d9a7k";}
-  {name="oxygen-icons";value="00l7qy95za3c323hkjiihavmq2vjm2yi81yn4cgwpnc5l336pynb";}
-  {name="pairs";value="15kafhp54dsrv2466j9gnn0c8iqbfx4frrql0r6v5qza015vybr9";}
-  {name="palapeli";value="0bx7qqidywxwkj9vdbzpqsy2fvkjgf9vj8nqk5ypx7jm7da87y94";}
-  {name="parley";value="163xnfd9h8r6dp3riqs3s32qaramyf225bhy6y9laknbrr9lxnsm";}
-  {name="perlkde";value="05ybh43ckfq5qh03pklkgiajc2s6b6cmvp5alx0dvq605h5z881f";}
-  {name="perlqt";value="1fn3gxb8b4kx7g24pnrbg42dv17hn2wv70g53yfr6z277ljinxzl";}
-  {name="picmi";value="19gli6mii15qya9hi6qyb52rsk2n2dk6r4kzla99ps3cs8n4h9x8";}
-  {name="poxml";value="11cwhjil8vdwwpmp1l61335b5j9714hbxiyqw0wyxcr6yccasbdf";}
-  {name="print-manager";value="0v940bsksw04ymxq56lgm6sprkdlyzjm5fgsm24yb564nay3x42h";}
-  {name="pykde4";value="00gpjqgsfv83xfk1xmglr8c32ln9cc05m4nf1qbd3gvr5jb6cxmg";}
-  {name="qtruby";value="1312v8vn091q5lh81cm5z5wkgidigdngqkjs3kf7lp9d1k50ai47";}
-  {name="qyoto";value="0sjii1i31x1cxhr5y5ijaain9ql75fbba9ss1cxz9agswp95kpcz";}
-  {name="rocs";value="0h72mrb65gnk36g9d4l55bm7kfldh3v95hbv0wxad0p9v7baxmn2";}
-  {name="smokegen";value="0x4qz1pk8wn4vq0fmy344v9m1gh12dav3n71z6xi4pnpmpmq7kna";}
-  {name="smokekde";value="1wl88jy9yvvrykzknj1vy7rqhfxr52q053y2jmay53hvx1iaqjxm";}
-  {name="smokeqt";value="1lphdjxcvysn1lkq6yj7z5pmhzlwpkj3xx7izfdk1g6a1pkjwr7j";}
-  {name="step";value="0ma7748ixi00zw9hrjjlgbb7d1a4cr124ka3ymn45sa4q4mza3zh";}
-  {name="superkaramba";value="0xbs2k863p2yg2k7wn70gbwvriin4lv2hv78r5m6fwvb4rsjygsb";}
-  {name="svgpart";value="1svwqxcxl2wp4wq9s3q6crys7jmz072wp4qz69fvqcvp1cd92gsp";}
-  {name="sweeper";value="19lsqw192h3863fbd265didviy7m4wk6qwfgnhc7sxaxxccm19y4";}
-  {name="umbrello";value="0lmygjjsqiw0xnv4d3d1yb1b5zlnj18lh01k954ycl8f50cxsv9a";}
-  {name="zeroconf-ioslave";value="1324mx9gsr6ghi7m1qk4kwr91g8wfd3jsw3rzp26nhrlwjsa5j6a";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  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="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="zeroconf-ioslave";  }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwalletmanager";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="libkomparediff2";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  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="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
-  ];
-}
-{
-  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="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdelibs";  split=false;}
-{ 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="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.13/kde-package/4.13.2.nix b/pkgs/desktops/kde-4.13/kde-package/4.13.2.nix
new file mode 100644
index 00000000000..de929376863
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kde-package/4.13.2.nix
@@ -0,0 +1,625 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="amor";value="0lrgvi8r2b4z3yp8xdjydf41gm84cxzr90flswb9a0vrsvshkkx1";}
+  {name="analitza";value="0gmhjhm366ddz0r8bapkbl62ghqnixiarqp3c12jg80fgl369raz";}
+  {name="ark";value="1x7bxcn8z863zir09dl0jrb863idz1g6m23va39ny7ks0cmj0vfc";}
+  {name="artikulate";value="04l1mz79zwkrsgawvn3rf7pg5qg4idfsz70g4hafxsl6d8p3lcip";}
+  {name="audiocd-kio";value="0f0gjxr4n6sgfq14vkylagipv6xpq9zb6z8scmf3h4kphcylcjah";}
+  {name="baloo";value="04zls6mxz0d8m9nmsrvd6ayld5610hwgcp0cxc5w87wkdqx3nd44";}
+  {name="baloo-widgets";value="1fl2rlrlx2ccmwqpl3knjjyca1dl1zzl8ifwaryklqm1yibg9yxq";}
+  {name="blinken";value="13p1c58gj477s9zr5hsxbd5nxfzaippx1qrlblzn2hf49an1gf9d";}
+  {name="bomber";value="090ii827nfnlx1bx9lnx74sid1b9crgw8jgwynywx3jw5dbqrih0";}
+  {name="bovo";value="1hys6lfp455kixlhzk0mf2x24p6b0n0i14fwid05anj3mzjycdwh";}
+  {name="cantor";value="1mdgrm1va8377c0hy5h4x1l5fvzb1wh2a3j2rbwfh2z1glwicpyw";}
+  {name="cervisia";value="1kig86y8lihxask4qlibrxc18w1dl0ljj93721ivwz1hl3ja1nwa";}
+  {name="dolphin-plugins";value="0rf450vn56fw3cmvr434crllc1fv0brb2cf5sk5q284pgmxg7jn2";}
+  {name="dragon";value="0b64bpyba85hfx6ai4m4zazilcj6sabphafnw87m51xa5bq8gz08";}
+  {name="ffmpegthumbs";value="1i3f15rfwizsaqqz0jn8ghpg55hx3zwxp049jaghgy9d4w2f0mbq";}
+  {name="filelight";value="1nrw06kpwyhvjicwikzg2b2pq5g2pwfv9s694wwigz58xp6mqqp1";}
+  {name="granatier";value="03zpgk8naidy044v2r5kimb5scmj0nvyw6w37nrb4sbqz2s0zjl6";}
+  {name="gwenview";value="090ij5yv6c8a6vf4q0fw2dskdbqd66anwk5p6c754kffzphy69k6";}
+  {name="jovie";value="1hppkv83i9qwpdd9j1bfqyjxqpjy318y1mk0fd2z5r00qxyfbr0f";}
+  {name="juk";value="1ifw1r3sbi9z265asm9gv8cs4sdc0l8w21fvbh8yish5m6riwxvx";}
+  {name="kaccessible";value="1w7m0cpxy9jl61bknx87g7i97lx2y28qljis4d7smpbvhyzk3sg6";}
+  {name="kactivities";value="11b3z1wkbykyv8frd9ssz1pb0qjczdnbn6zw2awhq0py94psrh62";}
+  {name="kajongg";value="1qf8y5d436cys9v2xcfr0zvl5gxml3gxjql3w7fdsa0bfa3czr2w";}
+  {name="kalgebra";value="19f91bb2a5l7hd0b0mcf690lgipdybdras1j2ggd775czijq10hc";}
+  {name="kalzium";value="0i0va37r73mcp9xk8jd203wxpky6bsswhgmi6w4qfz05ql0llyls";}
+  {name="kamera";value="1idazzg35a29kz6k1c5m5madkfyzp15vdkfcbjabc7gwj8dggn6c";}
+  {name="kanagram";value="1xm4cn9ypsqfrp1rqgl0bqzkp4vqjqwm1fr67lr64g4mwspp2m10";}
+  {name="kapman";value="053lrfvdryhyigrglqyxqbislwwc98n0hxrkxziakmw32k69lnlf";}
+  {name="kapptemplate";value="0b8dj3wildq80bxf8km19iahlz2cg5m5rdp0lz5shrz5b9sl7vg0";}
+  {name="kate";value="0pgxq0xlzbiag1w9am090bi30gq3gs2bxrdjpqwk4zwcllz94ym7";}
+  {name="katomic";value="10kcd0c586h96aggq7xg0h98bz65qf0dy1g0zk63z7jrqqmsaimr";}
+  {name="kblackbox";value="04m169inzbz19i120ybw3wlilsh6pdxfknhg2lxbm9gndjdyxghh";}
+  {name="kblocks";value="0vq1mxi05nb12a533fn940sz9mcpmz2qqzyspvdiijy1ff1h9ax9";}
+  {name="kbounce";value="0jhmbga21a9b6i2z52f0zgmxywq46sr5fy68hh9m1ka9khrrz6cx";}
+  {name="kbreakout";value="1vp1c3i3pwm1xysfm21c6dzxpxfiy44bwjqxhwskialir5q09c57";}
+  {name="kbruch";value="04q6pa60mrw58nk73is6fby03ppvafahhbmbq7kdzwa1k67hkrkd";}
+  {name="kcachegrind";value="0wrbr66lhpbxj064j1qx8lmks6s77j5w6qv3kpnx2mlzs48v424r";}
+  {name="kcalc";value="17psx2hwrpxx4w9wa70gy9y1b63cvc2yr9r3xm25nvx9x6mjak5p";}
+  {name="kcharselect";value="0b9cc2vjh1aslvj6a9pp4g2j65x5h915gnm3lz09p1bq1wnf3pn0";}
+  {name="kcolorchooser";value="1hr86adginxa1x15gkhf7y9210pl6gx4qnm4jz2vsggwi959i183";}
+  {name="kcron";value="1bzk3qs6mwl7djk98davwys1s8a8vsz8w8kfmmbql5mwzy3q0n6f";}
+  {name="kdeartwork";value="1qz9dlbx576vlbckdq9vyvyr4zlnbaxwgqlzagh5cqspmp1yq1jj";}
+  {name="kde-baseapps";value="0237i2d1nv3931af07bzf93sf4y500xdv079l97l21lbpavfacqa";}
+  {name="kde-base-artwork";value="1gv310n0ym5lb17mpfsb5679mh774rv4ahzk7x5vmlv53lh4zc4s";}
+  {name="kde-dev-scripts";value="1qbdw5kjks1l8aky1lpx2p14q3l5x45pk92xij259n2216ibq3qz";}
+  {name="kde-dev-utils";value="097i2lvanmdkws3id7f06m3brnixw43fqh6dhvxhz19xcdsckhzv";}
+  {name="kdegraphics-mobipocket";value="09c8d6jsy257hvr8s8qxpa3vrh70l2z1ykqfsdwgbic3nkqskg9j";}
+  {name="kdegraphics-strigi-analyzer";value="0xx2vjndsg2p1gawfd3azjax1045xqd95icif45v6x7cdjp4j47l";}
+  {name="kdegraphics-thumbnailers";value="0adqpj3gm959yvjvv3aas6b4zw4adk82sm91inp7rf88c44bjj2m";}
+  {name="kdelibs";value="03nsxwcxxpb861cd2dyl7hfbksxhk267xdjg384z23xq0b30k62m";}
+  {name="kdenetwork-filesharing";value="1v9n9jqk9dgnw73nizyqgjfk1h5sxw2rin39xraj1vpmw4pp6ylr";}
+  {name="kdenetwork-strigi-analyzers";value="1g1aap4pz8ifj4gxzfaw4bspnn8syd33l97hn1xn2vqqzim376c3";}
+  {name="kdepimlibs";value="1j5692msbnsp9xpm2gfqqkybck8pyagl86a6rdq7n2zp85jyy03a";}
+  {name="kdepim-runtime";value="19v729ijx42f86q0aw8rwv470hgrn0mnl8qa7ajrynswp0v820lx";}
+  {name="kdeplasma-addons";value="1bmp2wl8ya4mili8zv69hbpwasvda7r5b7z2i79rpfw4kcf7lgnv";}
+  {name="kde-runtime";value="11r06hkvkrlva7lhfdfd8p7b6q53fvjckixbsiavl259sdfl7hhy";}
+  {name="kdesdk-kioslaves";value="1iww0r61cmfpcs2v3jswh9c2ba54bbqnnwihnq9g2dlsy77138b1";}
+  {name="kdesdk-strigi-analyzers";value="0hm680sxgv7r51kyyhng00jnh6smki70cl7ms0gg07pyixhkjxqm";}
+  {name="kdesdk-thumbnailers";value="1zzhzpp6cmx6va1z2x2vq34wilh7sbinw0nqdhm4jra5qndx9j4h";}
+  {name="kde-wallpapers";value="0jsy9kdg6w241lf4zs693cgkc6mvlby9ligfqskf97529y4bjpkm";}
+  {name="kdewebdev";value="0vwx9vf59hmjypgzpmgdzxzxmkx758d5y69c101dmkjb52iadknp";}
+  {name="kde-workspace";value="11lfqfg646blm770xsblcvf48i126z956wv4yxqw9la39m21dlcr";}
+  {name="kdf";value="06dj0pqpk1h58zm5gncsddcss0b5n8wb6m1whsxp86al9xm1d5ck";}
+  {name="kdiamond";value="0z76p92zk548kimkzq5v7c145xwl5pzf69w48gkldgwi2amwhqc9";}
+  {name="kfilemetadata";value="1s2vs2lw9ml79ccl5vsik76ynk7nwqjsp8lm2xg91l8pn9laywgr";}
+  {name="kfloppy";value="1vnwi1rwgi1mrngdc69mm84159r933z54vdphcfyfjpngb5irk2n";}
+  {name="kfourinline";value="042n2jmps4z9l4w5vqixc2lx495839gfm58shdnzxxph5z29927v";}
+  {name="kgamma";value="0s5w37gr8c4cy0mv63x3qixkp7n2ayj4jmfnw25npxzd4phj21lz";}
+  {name="kgeography";value="0yv4bfk8fg0k9r2iiqhh52cfm4jpj5lpbhpq3ycngzi83mw71wv6";}
+  {name="kget";value="18mrvh22wfyz4k1jlvh8gd3szybixd1z8zzbd8dkykjis3yw1p5r";}
+  {name="kgoldrunner";value="17d6xmfjqkxyji7v2cv97gxrxp8a87vjw1yhz6blcg0vc6d9lq6j";}
+  {name="kgpg";value="0sngvdd8sfymi9wxivrzsgh3naf2hxv300a94pw1dalvvsrgxpxp";}
+  {name="khangman";value="0rbf3vz9ji0hyq9vj90pqpz0ch3bhqlqyj1030vbb0rvry2bb0h8";}
+  {name="kig";value="1y6kbq47zbhdm7v9x71nlzv0aa08nrm7g7g87ln0nbvxsn3v1xj3";}
+  {name="kigo";value="12awan4k2k6505i4bl3zyv4mr589q2m4grb4znh3d24qbgmk218l";}
+  {name="killbots";value="12wgnhiahgrzz5gxn77b0xqljdc22k4pw01fi3ixydx62a7a2402";}
+  {name="kimono";value="0dd3rjpwi7c1289i9vhcnmyqrhw0sx5dd6vmccyqb6krxw0iv3xr";}
+  {name="kiriki";value="1wr8za85qzaqsw7drlslvdqkmbbxhd4mlih6j862xk5rbfps1287";}
+  {name="kiten";value="1nppl5pqjbgmzshw1ahscb33lhfdmbid1ygdjjj5p9kdjx9p7yqn";}
+  {name="kjumpingcube";value="036j428grzcsphaq176c3ix8js59lss61m2nda7psk9jrkffyz22";}
+  {name="klettres";value="1pdldl7rxhbi4m98gb4an8k8z6djjamg7rwcl4pg0nj8k27idj3f";}
+  {name="klickety";value="02hghzi91raan0dqjskb4mann42pfz3c0frngdcnp23s616cqfg6";}
+  {name="klines";value="1z6v5nv6sq4kki9annpkb53bn8zcdcv3g70c7fddbiawq9kr0ai0";}
+  {name="kmag";value="1l1x1rprqf84wkiz09fyl1gvcx3bkk156mybh1gy7hdy114frgam";}
+  {name="kmahjongg";value="1wg09bdb5gaa28rdppafvvxc7h1gps3dv7ggy41pv9dm9fjw8zk2";}
+  {name="kmines";value="1ssw0vq0sxlp12wncnmcfdvglk45ds4hldinhdxbn9slfsc5vjg4";}
+  {name="kmix";value="13hdm8vg92mxm2v49x5r8r58614nbbd3ng0d6xj3h7v24g04h9db";}
+  {name="kmousetool";value="199f3wbf2yga1s0qjfnbmn1v80y2shsi4w5zhhrs8iscf8dzkyz0";}
+  {name="kmouth";value="13fshp58jk2bpk3z44krglr02bpl96s7ky2hz4lkghf0kgigh4wf";}
+  {name="kmplot";value="0syw06smr33ykjkgmf96iyfk7wmxbq6xvvfpasq0lyybjp9z62bv";}
+  {name="knavalbattle";value="171fgfc6g23nnzbmy1w1hm2v9780ihrw8cfz92xgars3ibfkjn6w";}
+  {name="knetwalk";value="0hi5bqg2dvrmkkcqiiylwvjmwdc22h76ndh5ym2d3kcmhmn3jmgp";}
+  {name="kolf";value="1y90lnci7bji47dkwa9p2b6fqj6k0qg53ng7hp430654xklv4k7m";}
+  {name="kollision";value="109a0zdv4mp7cd5qbf0yv0g0k6b698h2kssxndrmybaz5v2kj8kb";}
+  {name="kolourpaint";value="1ff6wzr28m6nlh1p6ggcxdjm03y8fsaffl929jkw9pqhhy2rhgd4";}
+  {name="kompare";value="03lgsfq1j6bxf31gaszxw65qxc9zcf021h6zd8wx5c6zmn72a4zz";}
+  {name="konquest";value="1zgs4hsff4wv5j49w327xjzsmya924iqwzygcxld9h4k4j78ypqc";}
+  {name="konsole";value="08sg90263916pihmp65s9lih3hjvbvk0sjybqqzxsbh310jwa12a";}
+  {name="kopete";value="1g4fcfq3g05hnbrm2fnsrxwiil2sj4jdr3szl96rsf2pgjy8wc84";}
+  {name="korundum";value="0chqsjc986dsm99zkm1ds9h292kpmnwd1hicmf1vg49zfchxkms4";}
+  {name="kpat";value="0visia7f6s6gs0kwspgkjg4lx0nm49glms2wqspsrli3bzjn415d";}
+  {name="kppp";value="1vmq3a83rb8rc54bf50jwk981mwr6i776wrbgmpq6pl7cpjmxnvm";}
+  {name="kqtquickcharts";value="0g0bn60j9bpfbxpy6fyfl504n5l1zafb3awkql9ld67h8946935p";}
+  {name="krdc";value="114bp80k1w01xv3y1kq38hdc7dnkhcgbiw89kpgn9wyscgrxd4kk";}
+  {name="kremotecontrol";value="1paxn1dd3fwagmiy7a772k4kdglvcszxw56lj3jqas3isdjhxm6a";}
+  {name="kreversi";value="0rsqpyaqw9blcl8hvbh4225xi3m7kmywc0i2m2hpv8ihqz30k2cb";}
+  {name="krfb";value="1qa6hvlwh55piw2hp4b5rpd8b7mp3wrlkh75p34l05fq55c60azw";}
+  {name="kross-interpreters";value="1j61fq2sl3lg4sy8vdm8spxcbv863icnx33y683ynrpcd8389jb4";}
+  {name="kruler";value="0b3hza24c11a6m12wi1am0wszi76405m5rpfna0pd94pl0mnp3ii";}
+  {name="ksaneplugin";value="0w16vxqanjs8faf8941wsz3bz8wg4pvk9h5ji78pf83kqnb0aj3g";}
+  {name="kscd";value="1k90wa4wndvyayms80ra0n93nmzcl5imgp0prx0kczfywvn9dm8l";}
+  {name="kshisen";value="1nbx9b2h06dr818zs7j1xq27ka8klgp4jpz55q2l2kqkgnyf5483";}
+  {name="ksirk";value="1z52hi8c0dgqs2zd8dmr11xf0ackg66w37d4qgz6iqfxhsb9j4mg";}
+  {name="ksnakeduel";value="108p8v3qirh6m8nbjrsnbxixmg3paar8853b69s54ssvwdl0in3c";}
+  {name="ksnapshot";value="0417qs7bb85vl3kp4saml27sl9yya1arzr8f2wlhkialwdlfxc5d";}
+  {name="kspaceduel";value="09mww9znxg4jzrfnvw3c2s3xjv6z5vflnmn61hdv1v9nqyxkxm6i";}
+  {name="ksquares";value="0zzap46yav1ddqd1nj8gmvmmrb3d6h4jvjzxn9793bbrrj001zq1";}
+  {name="kstars";value="1rfd5s366vzcs8zfa50rrmfp8xhqmm5gswsygxx2pr6xiny22g57";}
+  {name="ksudoku";value="0yfx3pwfzr8567h0zz0691wfv00444818cfr7qfy6s5p0520jaw4";}
+  {name="ksystemlog";value="0wc2cdyg4cj79lxzpxp73ag71w5z1wnpc4lfq8l9661hl0y1xwby";}
+  {name="kteatime";value="0587278b8wi5qk6gnqahw602nyaiflzbdpw7az4iwp0dy7s8ziiz";}
+  {name="ktimer";value="02i1lv916k1g0rgsfnx9qdzsk965l3p862g71zdfxnp8hsqxw3k8";}
+  {name="ktouch";value="06y1afrl7d67g4cw06k8kx63xa1bjdbsbg4v3fn6v8fgavkdkc70";}
+  {name="ktuberling";value="1z3gl2np2a03jfzhkcdakvibp0kihnqy9k6mfjwqpz5w0179sfyd";}
+  {name="kturtle";value="0a25y3cibxmdjyif4467a5yzsadpdciyaw99r47fpw8f1jdzz03f";}
+  {name="ktux";value="1sxggakp7vhkj0ygwnpangq4dyi1mykacdwyqlx08hj659w9ihdc";}
+  {name="kubrick";value="0ji5j9ai66fczx6mrfkjk2asnp5q5cq5qw5l75w0c0jnsfwg1qi4";}
+  {name="kuser";value="18lx93v9lka30gb16dk93svgq8rjgj0fa7la4w4b200zy01ci5ps";}
+  {name="kwalletmanager";value="1r55w4z2pa8b782b2apr0dy2lr7sw61z2vzzhjrip728sxd749ix";}
+  {name="kwordquiz";value="0afpd0gqprbs95lq4c68ybbdqsiz4n5b219156c5f1zv83lwn2l7";}
+  {name="libkcddb";value="1d56hnnfa8gwawfa0z0235b3ixjqcb96iybgcy2pdc2lh1ny9p74";}
+  {name="libkcompactdisc";value="1n470n7f16zb9zcrhfbhjsx7fhd8bi9zii6vk2rcmawwiw9x62ib";}
+  {name="libkdcraw";value="1n3g333px3vr61pmf158l57i1sqh26pbyzs20zvfzqyqhvbxmq02";}
+  {name="libkdeedu";value="1pyskpkaiz6ngya9adghq8xj835hgdjmjpkdc8dq3695k7fwdj4j";}
+  {name="libkdegames";value="0z1c2ybw3j97jx30yiq65lf72r0fllwsjl5mgclj9fp03m5225q6";}
+  {name="libkexiv2";value="0kgvx1a2qmsyagy10p4vypks557bivvajnggsaq2naya6kg8lwv6";}
+  {name="libkipi";value="05wflvasjmgglms4x2di5fs7lpx4wh3fqiqba376363r084drhdp";}
+  {name="libkmahjongg";value="1vkxcvhnhxhhq08pjr3r6wyckb8w2lpnhmkf4aiaspjspbvrfkgr";}
+  {name="libkomparediff2";value="0i7qxzpzsmxki8kk22z43jmm1z685lcsg03dzzsr6i49jbc59iid";}
+  {name="libksane";value="0wl20z4d84i3wb5h24nq92swirhyb4hiljrc7k6830g6i27lwm7m";}
+  {name="lokalize";value="1nw0jg4m2z3q6y7wrlv7lw7f0z2vwxd17zhmxy2cv5ckqlaj9rxg";}
+  {name="lskat";value="0qy04dgscazlxclqwipwla1cv27brjsp05lv1wbvpx0xg7m3cdsn";}
+  {name="marble";value="0h7jj3jfnyjkyw1882ak0275rr95j0qr65qkr6qjddy672q17xl5";}
+  {name="mplayerthumbs";value="1agr08ssdk50k73f7hyzh8j3j8l745qdwfa9brggv0hxmh6lk24k";}
+  {name="nepomuk-core";value="0z8mr47h1l1i5yzys39vfl7mylf9c72m1sakld633aryx4y94ch4";}
+  {name="nepomuk-widgets";value="1sblpfvpia6v28xanqh470hd7y24llqjbakr6xahz9wkb5bc837v";}
+  {name="okteta";value="1c50qa1v70j6wwc4d36v0dca1b88i18qky95vw1sd8cm2jmdc3ss";}
+  {name="okular";value="1k4wgkhz8kmixd2xdy1bmfz3qksniybmhwwwcbh1b8fzgw432ppw";}
+  {name="oxygen-icons";value="173hhnxxryl1fypgapgnni1yzh90sp8lsgdlyw7z35cqmppqvmbw";}
+  {name="pairs";value="1prg15q4jy83p5jxlpwrpa2fc6slqf9dw8jnznxbkdmm8f77dir3";}
+  {name="palapeli";value="1wzgik0wx3g6mdx8kmvjlmazw4i6rq8xlhqmnmz9vxcjpljz1vr3";}
+  {name="parley";value="1fd2wj9mb5if28qmd3a2ldd1vr0qkaky1r01vpyq82m6db035d7r";}
+  {name="perlkde";value="07qm9c06ff38l1bwbkxqrssnzz519wnzvglml4qs5b2kjlbzpjvi";}
+  {name="perlqt";value="0fynxqdkd7drxys96ifyd3nl21blbjrdr5fr9j7ws742lfgd32xc";}
+  {name="picmi";value="1v86rfc5clmccggyqdcv3k8amhr4hm1yds2v675pnj63gcg5qbnb";}
+  {name="poxml";value="1ihx6x1bhxywwy1gspbs85hr0lywnjrb33jj52sgcm6x8a2hg054";}
+  {name="print-manager";value="052m4a23nvafckq5zha3p6pbnilsrh5fwldf6i6jxwcaky7vjakv";}
+  {name="pykde4";value="06ip2al7ngpy0w20qd86ny7f2cdhjjqb99djk8p2rkkcm6gvl571";}
+  {name="qtruby";value="1r00k17x6g1x5cddvgvy450412kl63wwzc55dsa6ng6ywxk4qs7l";}
+  {name="qyoto";value="1f7rs1gnl5ircvnrgn6fjzhx383jyxiv53h3cjiqxg2mwf1iv2qn";}
+  {name="rocs";value="1af4np70xgzcfjzl8m18q5pn2zmjdm47p250f99gyrbmqmzamqfa";}
+  {name="smokegen";value="1grs9sysysv8n439ia52s25avx4ps74yw23gi8bjj8769f7hrjxj";}
+  {name="smokekde";value="1f3snr45charllv36cf24hy9c2wf58pfai7lv9kyc9xy1hyyfcbi";}
+  {name="smokeqt";value="01d4k0iqi50202d5c841vfv3518faalpgw6vzscbr32gprvffzj3";}
+  {name="step";value="0brpd13hjhvi9f7gra87d6chlizjvc4w9girlfxx26r70r2wf3mp";}
+  {name="superkaramba";value="1k14a8sy6vgi3h9jqfdmjsrkj5mi4rnqjnkb6p6j3yzi2ihni1mx";}
+  {name="svgpart";value="1g2j9advnvyxf0yv1yspycn33vsslq8yfxfa2y4nhn2qm10xsnyv";}
+  {name="sweeper";value="1dvw4gl18w9r07m3y2zqxvhlxspfal4zz9lhni1b4h3y0c021hz9";}
+  {name="umbrello";value="08g7j9frgp4956y0m3i0hsspw0c4j5kms03k1wlzj57vpgk3r1b0";}
+  {name="zeroconf-ioslave";value="0riyfnswq4gfjvd9fsfpc18sb3xxh36q1d9w50h7pyzsgdb7lisw";}
+];
+versions=builtins.listToAttrs[
+  {name="amor";value="4.13.2";}
+  {name="analitza";value="4.13.2";}
+  {name="ark";value="4.13.2";}
+  {name="artikulate";value="4.13.2";}
+  {name="audiocd-kio";value="4.13.2";}
+  {name="baloo";value="4.13.2";}
+  {name="baloo-widgets";value="4.13.2";}
+  {name="blinken";value="4.13.2";}
+  {name="bomber";value="4.13.2";}
+  {name="bovo";value="4.13.2";}
+  {name="cantor";value="4.13.2";}
+  {name="cervisia";value="4.13.2";}
+  {name="dolphin-plugins";value="4.13.2";}
+  {name="dragon";value="4.13.2";}
+  {name="ffmpegthumbs";value="4.13.2";}
+  {name="filelight";value="4.13.2";}
+  {name="granatier";value="4.13.2";}
+  {name="gwenview";value="4.13.2";}
+  {name="jovie";value="4.13.2";}
+  {name="juk";value="4.13.2";}
+  {name="kaccessible";value="4.13.2";}
+  {name="kactivities";value="4.13.2";}
+  {name="kajongg";value="4.13.2";}
+  {name="kalgebra";value="4.13.2";}
+  {name="kalzium";value="4.13.2";}
+  {name="kamera";value="4.13.2";}
+  {name="kanagram";value="4.13.2";}
+  {name="kapman";value="4.13.2";}
+  {name="kapptemplate";value="4.13.2";}
+  {name="kate";value="4.13.2";}
+  {name="katomic";value="4.13.2";}
+  {name="kblackbox";value="4.13.2";}
+  {name="kblocks";value="4.13.2";}
+  {name="kbounce";value="4.13.2";}
+  {name="kbreakout";value="4.13.2";}
+  {name="kbruch";value="4.13.2";}
+  {name="kcachegrind";value="4.13.2";}
+  {name="kcalc";value="4.13.2";}
+  {name="kcharselect";value="4.13.2";}
+  {name="kcolorchooser";value="4.13.2";}
+  {name="kcron";value="4.13.2";}
+  {name="kdeartwork";value="4.13.2";}
+  {name="kde-baseapps";value="4.13.2";}
+  {name="kde-base-artwork";value="4.13.2";}
+  {name="kde-dev-scripts";value="4.13.2";}
+  {name="kde-dev-utils";value="4.13.2";}
+  {name="kdegraphics-mobipocket";value="4.13.2";}
+  {name="kdegraphics-strigi-analyzer";value="4.13.2";}
+  {name="kdegraphics-thumbnailers";value="4.13.2";}
+  {name="kdelibs";value="4.13.2";}
+  {name="kdenetwork-filesharing";value="4.13.2";}
+  {name="kdenetwork-strigi-analyzers";value="4.13.2";}
+  {name="kdepimlibs";value="4.13.2";}
+  {name="kdepim-runtime";value="4.13.2";}
+  {name="kdeplasma-addons";value="4.13.2";}
+  {name="kde-runtime";value="4.13.2";}
+  {name="kdesdk-kioslaves";value="4.13.2";}
+  {name="kdesdk-strigi-analyzers";value="4.13.2";}
+  {name="kdesdk-thumbnailers";value="4.13.2";}
+  {name="kde-wallpapers";value="4.13.2";}
+  {name="kdewebdev";value="4.13.2";}
+  {name="kde-workspace";value="4.11.10";}
+  {name="kdf";value="4.13.2";}
+  {name="kdiamond";value="4.13.2";}
+  {name="kfilemetadata";value="4.13.2";}
+  {name="kfloppy";value="4.13.2";}
+  {name="kfourinline";value="4.13.2";}
+  {name="kgamma";value="4.13.2";}
+  {name="kgeography";value="4.13.2";}
+  {name="kget";value="4.13.2";}
+  {name="kgoldrunner";value="4.13.2";}
+  {name="kgpg";value="4.13.2";}
+  {name="khangman";value="4.13.2";}
+  {name="kig";value="4.13.2";}
+  {name="kigo";value="4.13.2";}
+  {name="killbots";value="4.13.2";}
+  {name="kimono";value="4.13.2";}
+  {name="kiriki";value="4.13.2";}
+  {name="kiten";value="4.13.2";}
+  {name="kjumpingcube";value="4.13.2";}
+  {name="klettres";value="4.13.2";}
+  {name="klickety";value="4.13.2";}
+  {name="klines";value="4.13.2";}
+  {name="kmag";value="4.13.2";}
+  {name="kmahjongg";value="4.13.2";}
+  {name="kmines";value="4.13.2";}
+  {name="kmix";value="4.13.2";}
+  {name="kmousetool";value="4.13.2";}
+  {name="kmouth";value="4.13.2";}
+  {name="kmplot";value="4.13.2";}
+  {name="knavalbattle";value="4.13.2";}
+  {name="knetwalk";value="4.13.2";}
+  {name="kolf";value="4.13.2";}
+  {name="kollision";value="4.13.2";}
+  {name="kolourpaint";value="4.13.2";}
+  {name="kompare";value="4.13.2";}
+  {name="konquest";value="4.13.2";}
+  {name="konsole";value="4.13.2";}
+  {name="kopete";value="4.13.2";}
+  {name="korundum";value="4.13.2";}
+  {name="kpat";value="4.13.2";}
+  {name="kppp";value="4.13.2";}
+  {name="kqtquickcharts";value="4.13.2";}
+  {name="krdc";value="4.13.2";}
+  {name="kremotecontrol";value="4.13.2";}
+  {name="kreversi";value="4.13.2";}
+  {name="krfb";value="4.13.2";}
+  {name="kross-interpreters";value="4.13.2";}
+  {name="kruler";value="4.13.2";}
+  {name="ksaneplugin";value="4.13.2";}
+  {name="kscd";value="4.13.2";}
+  {name="kshisen";value="4.13.2";}
+  {name="ksirk";value="4.13.2";}
+  {name="ksnakeduel";value="4.13.2";}
+  {name="ksnapshot";value="4.13.2";}
+  {name="kspaceduel";value="4.13.2";}
+  {name="ksquares";value="4.13.2";}
+  {name="kstars";value="4.13.2";}
+  {name="ksudoku";value="4.13.2";}
+  {name="ksystemlog";value="4.13.2";}
+  {name="kteatime";value="4.13.2";}
+  {name="ktimer";value="4.13.2";}
+  {name="ktouch";value="4.13.2";}
+  {name="ktuberling";value="4.13.2";}
+  {name="kturtle";value="4.13.2";}
+  {name="ktux";value="4.13.2";}
+  {name="kubrick";value="4.13.2";}
+  {name="kuser";value="4.13.2";}
+  {name="kwalletmanager";value="4.13.2";}
+  {name="kwordquiz";value="4.13.2";}
+  {name="libkcddb";value="4.13.2";}
+  {name="libkcompactdisc";value="4.13.2";}
+  {name="libkdcraw";value="4.13.2";}
+  {name="libkdeedu";value="4.13.2";}
+  {name="libkdegames";value="4.13.2";}
+  {name="libkexiv2";value="4.13.2";}
+  {name="libkipi";value="4.13.2";}
+  {name="libkmahjongg";value="4.13.2";}
+  {name="libkomparediff2";value="4.13.2";}
+  {name="libksane";value="4.13.2";}
+  {name="lokalize";value="4.13.2";}
+  {name="lskat";value="4.13.2";}
+  {name="marble";value="4.13.2";}
+  {name="mplayerthumbs";value="4.13.2";}
+  {name="nepomuk-core";value="4.13.2";}
+  {name="nepomuk-widgets";value="4.13.2";}
+  {name="okteta";value="4.13.2";}
+  {name="okular";value="4.13.2";}
+  {name="oxygen-icons";value="4.13.2";}
+  {name="pairs";value="4.13.2";}
+  {name="palapeli";value="4.13.2";}
+  {name="parley";value="4.13.2";}
+  {name="perlkde";value="4.13.2";}
+  {name="perlqt";value="4.13.2";}
+  {name="picmi";value="4.13.2";}
+  {name="poxml";value="4.13.2";}
+  {name="print-manager";value="4.13.2";}
+  {name="pykde4";value="4.13.2";}
+  {name="qtruby";value="4.13.2";}
+  {name="qyoto";value="4.13.2";}
+  {name="rocs";value="4.13.2";}
+  {name="smokegen";value="4.13.2";}
+  {name="smokekde";value="4.13.2";}
+  {name="smokeqt";value="4.13.2";}
+  {name="step";value="4.13.2";}
+  {name="superkaramba";value="4.13.2";}
+  {name="svgpart";value="4.13.2";}
+  {name="sweeper";value="4.13.2";}
+  {name="umbrello";value="4.13.2";}
+  {name="zeroconf-ioslave";value="4.13.2";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  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="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="baloo";  }
+    { name="baloo-widgets"; sane="baloo_widgets"; }
+    { name="kfilemetadata";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdenetwork";
+  split=true;
+  pkgs=[
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+    { name="kget";  }
+    { name="kopete";  }
+    { name="kppp";  }
+    { name="krdc";  }
+    { name="krfb";  }
+    { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwalletmanager";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdetoys";
+  split=true;
+  pkgs=[
+    { name="amor";  }
+    { name="kteatime";  }
+    { name="ktux";  }
+  ];
+}
+{
+  module="kdesdk";
+  split=true;
+  pkgs=[
+    { name="cervisia";  }
+    { name="dolphin-plugins"; sane="dolphin_plugins"; }
+    { name="kapptemplate";  }
+    { name="kcachegrind";  }
+    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+    { name="kde-dev-utils"; sane="kde_dev_utils"; }
+    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+    { name="kompare";  }
+    { name="libkomparediff2";  }
+    { name="lokalize";  }
+    { name="okteta";  }
+    { name="poxml";  }
+    { name="umbrello";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="artikulate";  }
+    { 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="kqtquickcharts";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdeadmin";
+  split=true;
+  pkgs=[
+    { name="kcron";  }
+    { name="ksystemlog";  }
+    { name="kuser";  }
+  ];
+}
+{
+  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="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs";  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="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.13/kde-wallpapers.nix b/pkgs/desktops/kde-4.13/kde-wallpapers.nix
index 393d90824eb..b74d38d433e 100644
--- a/pkgs/desktops/kde-4.13/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.13/kde-wallpapers.nix
@@ -9,7 +9,7 @@ kde {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "1yg9c780xdxa60bw832cqj60v87cbvjxp27k6gacj2lwk7rm5hwg";
+  outputHash = "1bhc4nrcwnlyhxff2h7v9aqvg2ipikzr5y2djfq2qnx8qk5cms37";
 
   meta = {
     description = "Wallpapers for KDE";
diff --git a/pkgs/desktops/kde-4.13/kde-workspace.nix b/pkgs/desktops/kde-4.13/kde-workspace.nix
index 39e9c10a0fb..0a8c960eeae 100644
--- a/pkgs/desktops/kde-4.13/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.13/kde-workspace.nix
@@ -1,19 +1,11 @@
 { kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
-, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
+, pciutils, libraw1394, libusb, python, libqalculate, akonadi
 , xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
 , libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
 }:
 
 kde {
-
-  version = "4.11.6";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/4.12.2/src/kde-workspace-4.11.6.tar.xz";
-    sha256 = "0lk3k9zl4x4il5dqpw7mf25gv8a3y48fd3jq3jvgmwwlviwcpcz1";
-  };
-
-#todo: wayland, xmms,   libusb isn't found
+#todo: wayland, xmms, ckconnector
   buildInputs =
     [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg 
       xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
@@ -21,7 +13,7 @@ kde {
       xorg.libXdamage
 
       python boost qjson lm_sensors gpsd libraw1394 pciutils udev
-      akonadi pam libusb1 libqalculate kdepimlibs  prison
+      akonadi pam libusb libqalculate kdepimlibs  prison
       kactivities
     ];
 
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
index 84cb008056e..6318232dd60 100644
--- a/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
@@ -1,7 +1,7 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen2, libkexiv2, libXt, pkgconfig }:
 
 kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+  buildInputs = [ kdelibs xscreensaver kde_workspace eigen2 libkexiv2 libXt ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.13/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.13/kdeedu/artikulate.nix
new file mode 100644
index 00000000000..3f418cc5920
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/artikulate.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, pkgconfig, qt_gstreamer }:
+kde {
+
+  buildInputs = [ kdelibs qt_gstreamer ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Pronunciation training";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
index 09de79ce1c0..8cc4c0e388c 100644
--- a/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
+++ b/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
@@ -1,9 +1,9 @@
-{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro, pkgconfig }:
+{ kde, kdelibs, facile, ocaml, eigen2, openbabel, avogadro, pkgconfig }:
 kde {
 
 # TODO: chemical mime data
 
-  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
+  buildInputs = [ kdelibs facile ocaml eigen2 openbabel avogadro ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix b/pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix
new file mode 100644
index 00000000000..04925c75e6f
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix
@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "KDE Qt Quick Charts";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kstars.nix b/pkgs/desktops/kde-4.13/kdeedu/kstars.nix
index 0832dc2121e..6192fb3faf9 100644
--- a/pkgs/desktops/kde-4.13/kdeedu/kstars.nix
+++ b/pkgs/desktops/kde-4.13/kdeedu/kstars.nix
@@ -1,10 +1,10 @@
-{ kde, kdelibs, eigen, xplanet, indilib, pkgconfig }:
+{ kde, kdelibs, eigen2, xplanet, indilib, pkgconfig }:
 
 kde {
 
 # TODO: wcslib, astrometry
 
-  buildInputs = [ kdelibs eigen xplanet indilib ];
+  buildInputs = [ kdelibs eigen2 xplanet indilib ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.13/kdeedu/step.nix b/pkgs/desktops/kde-4.13/kdeedu/step.nix
index f36ccef9b7c..95e991e8481 100644
--- a/pkgs/desktops/kde-4.13/kdeedu/step.nix
+++ b/pkgs/desktops/kde-4.13/kdeedu/step.nix
@@ -1,8 +1,8 @@
-{ kde, kdelibs, gsl, libqalculate, eigen, pkgconfig }:
+{ kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }:
 
 kde {
 
-  buildInputs = [ kdelibs gsl libqalculate eigen ];
+  buildInputs = [ kdelibs gsl libqalculate eigen2 ];
 
   nativeBuildInputs = [ pkgconfig ];
 
diff --git a/pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix b/pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix
new file mode 100644
index 00000000000..b71c7bd1b6e
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix
@@ -0,0 +1,11 @@
+{ kde, kdelibs, baloo, kfilemetadata }:
+
+kde {
+
+  buildInputs = [ kdelibs baloo kfilemetadata ];
+
+  meta = {
+    description = "Baloo Widgets";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/baloo.nix b/pkgs/desktops/kde-4.13/kdelibs/baloo.nix
new file mode 100644
index 00000000000..ef627e38607
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdelibs/baloo.nix
@@ -0,0 +1,15 @@
+{ kde, pkgconfig, kdepimlibs, xapian, kfilemetadata, boost, akonadi, qjson }:
+
+kde {
+
+  buildInputs = [
+    kdepimlibs xapian kfilemetadata boost akonadi qjson
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  meta = {
+    description = "Baloo file searcher";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix
new file mode 100644
index 00000000000..f8420a33a45
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix
@@ -0,0 +1,12 @@
+{ kde, kdelibs, ffmpeg, popplerQt4, exiv2, taglib }:
+
+kde {
+
+  # todo: qmobipocket, epub
+  buildInputs = [ kdelibs ffmpeg popplerQt4 exiv2 taglib ];
+
+  meta = {
+    description = "KDE file metadata something";
+    license = "GPLv2";
+  };
+}
diff --git a/pkgs/desktops/kde-4.13/kdeplasma-addons.nix b/pkgs/desktops/kde-4.13/kdeplasma-addons.nix
index 550099830d9..1c7a71a5c64 100644
--- a/pkgs/desktops/kde-4.13/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-4.13/kdeplasma-addons.nix
@@ -1,16 +1,16 @@
 { kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen, kde_workspace, attica, qca2, qimageblitz
+, boost, eigen2, kde_workspace, attica, qca2, qimageblitz
 , kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth }:
+, qjson, qoauth, ibus }:
 
 kde {
 
-# TODO: qwt, scim, ibus
+# TODO: qwt, scim
 
   KDEDIRS=marble;
 
   buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
-                  eigen qca2 libXtst qimageblitz libqalculate 
+                  eigen2 qca2 libXtst qimageblitz libqalculate ibus
                   shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
   ];
 
diff --git a/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
index ec159a1e204..5eb97638bf4 100755
--- a/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
+++ b/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
@@ -22,6 +22,7 @@ for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
   lang=${lang#kde-l10n-}
   echo -n "${lang}.. " >&2
   hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+  nix-store --add-fixed sha256 "${dir}/${i}" >&2
   echo "{"
   echo "  lang = \"${lang}\";"
   echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
diff --git a/pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix b/pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix
deleted file mode 100644
index e646e352887..00000000000
--- a/pkgs/desktops/kde-4.13/l10n/manifest-4.12.4.nix
+++ /dev/null
@@ -1,262 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1pygy9kckankwhlm4j61fk42zinafw2insc9kkpgmh9mvb8gv0jk";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1qqbl7l84j3d5928gmdq7f7s0i31gw0rlf4y74p5zx8m80xbdd6l";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "0cg143wlalplw0qr10h60i6srn0avsim94m1hjbm8xrlg71iihjj";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "15s85xmqbnv7bm7ywivkyi62481ip4vy6yyw81m720hza0imbj9z";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "1d0bhndwf8b0pmglf3sx28r6s3li72x7a05kc39n026ha5zyx5f1";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "1dx5c6fkgn4hglx8qacrdnxn0l9p7dqbaz6cd7h9pa8b9zri5j9w";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1ynh8s17999pa60bzwr2595pcd744h1n8zznyzr5lq302ir8f8qj";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "1da01wd1n64g3l57pagvrb8mn2jj50ni1qhicnlwylk8n2krw0pf";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1qf9g5in9zr39gkip06hr80pzc4frchb2x9q76sqs36h58az5yfd";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "1lhrbfh74sqglqxl7yh68qkx0gmppg7iir194vxhm2s1j0jxq8r4";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0qz39nxkiivgk720lgdbfgxdp3wn5wrvx2zf0phvb8g6q5rl68kw";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1i9h68pfsnbi4gw5f4mb6q8jq56hdmi1lqxhwzj6vrbqiip7b9gl";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "020b1p164v82pj6x0jxz6d41w539786ygkfmgrf9dr20zwhchzha";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0vs8bqr6if32bmwvjzdmakyqdl5fz13igg31mzwga4aqlzalxa1w";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1wcd9gzf754150i62zl3fa24jq8p7vskn6adaa8x5qy208c0d6v1";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0fpsc36sk7zh3flxgnvfgxig4cm5hm56sgdgbl01dfg1mac6dckq";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1hrbsd595q2w09mym9h56hymikkpxbq0qmdxvphap5wsh0xsfxms";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1q2y9js6j32rbm5jg8yn6s9zw0jh6yq1q4z6hxy9nss1gh6diqda";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "0zaknfk8kzcid7839wsj61qgn81gjz0hbpis7q2q1syky4nzjwsb";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1d14h5kdfz8np5p27darraxq4ps0yhxhczg9yli436kgiflbvp88";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "0p29dybsalnjk00f7l3gni7pxzv1ig95m100svhhkmcwvh065kjf";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1qqbn3v30z058580qr9qyq0sy6g4jw0far8w7ywgnhks4aapy97a";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1gfm0k2j2jvff9lab87yjrywc1j0gayw2fxibzifvpygr9bl60i7";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "11zax6c3qfscadqfamls5k78hw36iwadqsgyiphl574ijz9q48ba";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "1ab658x0a44kydzs05zgzq7nks6dfl0z8m69ank5ngd12qnhb38s";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "0n26860ah421x8q2jmz8mh3mdzy26s8ckbfpnyph1vc23zqx9vqv";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "05ad1d5klc11s138zb5fj4h2kfida83xqr4z1m6nhv0igwzmza0g";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "14kchh6yixgrkzrrkdz25xaj2q91il6yshz79n4h0yk01lfc3sq5";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0aa4spy2nc1hfbx1z2b4k3sahha0pdxih1k3pl6n9223cjgwcbqp";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "14341a4qr8p7idvsw6zp23kyva5lb4684wjygm24d9wj69nkc2c4";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "02rq9spp8vzvv8bvzny48qwksimrnqj6y9rpc3xh6bmzfhvr7qsa";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1s2gbynxdbpi32rwdgddabsp3n10ngwpnh6za3yjp4is93ici6rm";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "18nmh605ya47w0x2nkglg8lrfks7l9pxr6mjnw3z3lsazafigvx1";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1jxd109m2y7ky0c4im70ipx07rysbr0ndl2fpjb3myxb2nks106h";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "117zl85myjnnb957c4gx0h65ks842sk3gbw9dfp8hpzdwg8zvsn4";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "1q5c61a2swxvyhdw5rambibyms40hj34093ihx32ad73kb4mn72w";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0wg4nlra1z6pf8mxlz3w0jq68k0qfhxrhsqij35l9zml5y203n4y";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "0rryyjfgplar77fz332jv2w0lv7d6273gv022pb1m83w945pzkf9";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "0aglgvj1ljfdf6gjs478l4wisp2z4dzkkbhz1sgry00p4q1417ab";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "14aqlg64lp287m09zhh9r9l6ywfwzz7f2nz0vr1fg3wqsdrchglw";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "0cq6xacyrb9wrrwbl8xrb2ah3h7s7a9vr7kz3fy5rf2rgq0phfd7";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "07i0plzmg0nykfalyjvwnhg5qrcfdf1h6i18b34xyrp3y4gm540a";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "0gw1iv550nr307ibgb8i48fxcq03liq5r2x7fr9pl0n9xknh3c8a";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0489n0l9c9wig5567dfh4apyyy6xws7yxq79r4jl00zxl1j43bla";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "1n4ckll9ngj8qn976nikxfljf23qsvphblbjnjm0vk4713bnpf9h";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "0pzjdnanhynalcjlsg94g88i92hwdsqz02x85yxxg87vn74p13ks";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "1z9mjzh0w6i2a75ys0dx5ksm8fpwyw8wrwdh14bvbnxpnkx0jv8x";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "032vjcjpl19dyyc36z1nwyc9h696iys8dfyadpw9rhcllpk4ck67";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "0sd6vzb1qmbbxk6d1vfq21gkq009lp7qxnpdcr7jbykcf0licq7i";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "1m6fa0adfjzfqakjyrrjwak4p0y5wwdkkq61qx9wvzdb78qm83rw";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "11is37g7fafxhk7ydydgbxdg0x1s5cxr8v1pjzwqb858n1cq5x1h";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "1vbr0pjm8d25lxbmhqz8d4x57sjc411a5fkvyxh4rr34fd7xxhwq";
-}
-]
diff --git a/pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix b/pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix
new file mode 100644
index 00000000000..c3cab65fbb0
--- /dev/null
+++ b/pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix
@@ -0,0 +1,267 @@
+[
+{
+  lang = "ar";
+  saneName = "ar";
+  sha256 = "0hlaflf11h5j7lgklxvvmdjdd2bj6hdb65iszdlprz8i9y4xckaq";
+}
+{
+  lang = "bg";
+  saneName = "bg";
+  sha256 = "11r7m5c3qpsqgy92y0g3gkrvdzjp0bdpn4pb2ypqbcvqr2s10iz4";
+}
+{
+  lang = "bs";
+  saneName = "bs";
+  sha256 = "08j09rc0jhx8z4a5640902sbq1b4j2nj7054w9nlf20gbd2162qj";
+}
+{
+  lang = "ca";
+  saneName = "ca";
+  sha256 = "0bjwq3b0n4phyjxw5my40d77vqdff307smf5arsmnxdykk03wvyg";
+}
+{
+  lang = "ca@valencia";
+  saneName = "ca_valencia";
+  sha256 = "19acbawjl1qpvavw381n9b5vd0if4vs3xrnwcdn3cafd518s4agl";
+}
+{
+  lang = "cs";
+  saneName = "cs";
+  sha256 = "0vy6vx8kj2lwr4rf5m6y1b4p47m6yrizsrp9zrjryh73w122w8lj";
+}
+{
+  lang = "da";
+  saneName = "da";
+  sha256 = "1vqk5g78ngzl5c1clha05vjzl91j7gn2d6f2lgz0l2vim2abms56";
+}
+{
+  lang = "de";
+  saneName = "de";
+  sha256 = "0jyarxxkg67mbyd62c0c1vkhg0g3px01bsirmjaf8s3qb0vadpx8";
+}
+{
+  lang = "el";
+  saneName = "el";
+  sha256 = "05ksirpq0np9nzlnknfk92ab7hnvc2izbxxa92ccraq493v58sjw";
+}
+{
+  lang = "en_GB";
+  saneName = "en_GB";
+  sha256 = "1qzyp08rv73ij0kcyvwp592hi83v407adyhkd4xihygwxdq9kk0k";
+}
+{
+  lang = "es";
+  saneName = "es";
+  sha256 = "04qnv32wargq7nn12kzz0gvh5i64h6rnmcly3rn15nr02rvjhkp1";
+}
+{
+  lang = "et";
+  saneName = "et";
+  sha256 = "0v1i163g7wjy4n3w3y85dgnivd25zn2p6zrk7h6ksynqqv2lcvyj";
+}
+{
+  lang = "eu";
+  saneName = "eu";
+  sha256 = "1l6rv8pbg0wcvxfgpw13lkwk3h3b0skxj7fp6629ln977nm80jf9";
+}
+{
+  lang = "fi";
+  saneName = "fi";
+  sha256 = "1hrj2rif8pbfjj5cq50b6prgd4dy3z5wqibqpa9m7nfvqvhzd6lw";
+}
+{
+  lang = "fr";
+  saneName = "fr";
+  sha256 = "0w5pcbv3kdssrd3dybcp3grjlwl5sglyshf1427ydd3690n3cz42";
+}
+{
+  lang = "ga";
+  saneName = "ga";
+  sha256 = "0249lkc52vs0hfjg8x86sjn3zk42m8c8zi14y90vjd1w1aikscwl";
+}
+{
+  lang = "gl";
+  saneName = "gl";
+  sha256 = "1h7m4wsh6b80gmn2miyjz84r5ydph8dnfj3kg3gvj0i365w4grd0";
+}
+{
+  lang = "he";
+  saneName = "he";
+  sha256 = "17acm31gskf5psrsg6vbnpkznsz82c0k0k68gi986c9n4hwi39r3";
+}
+{
+  lang = "hi";
+  saneName = "hi";
+  sha256 = "13swbmzav0ffvq231dxbgjjyscybwlmwhs70hxs2zlrvjiq2jka4";
+}
+{
+  lang = "hr";
+  saneName = "hr";
+  sha256 = "1ycc0sbic9b2sa50f70qhvb02q7hi41drrhkksacbc9963hplzpg";
+}
+{
+  lang = "hu";
+  saneName = "hu";
+  sha256 = "1qsr5l6bfrid7dk30m720f6nc3yaa5z69f77w1133x344nig532s";
+}
+{
+  lang = "ia";
+  saneName = "ia";
+  sha256 = "1hcpk2nzljcd3z0dni05w0ykjsij5pnzmlmh8b6gpkn1w2pbd6xy";
+}
+{
+  lang = "id";
+  saneName = "id";
+  sha256 = "0iazqsc72q2hdggfimwqzk1m071ygvmhvx5bskqyyd7z34mc60s7";
+}
+{
+  lang = "is";
+  saneName = "is";
+  sha256 = "0rjcpw5s94x51fz7qnscy2d826rcr0df3gs8n05y8f7ajqzzrkjh";
+}
+{
+  lang = "it";
+  saneName = "it";
+  sha256 = "1vyf5kq2ki3j44qqslav0arahbpadl0a0d7611zm2b60qh6d57wn";
+}
+{
+  lang = "ja";
+  saneName = "ja";
+  sha256 = "0l4n45lx85if8v5yq2j854lmymv9aibichpdc7ilsw8z54rgr942";
+}
+{
+  lang = "kk";
+  saneName = "kk";
+  sha256 = "1c1cb1x1kgzalmfmk2pv9x0as50grq6lpms8m55baaxymvm9k6d2";
+}
+{
+  lang = "km";
+  saneName = "km";
+  sha256 = "14gmnb4im6dhcqhr4ira3zmy0asgv1l1k4nqfrw1skkg4j94bvn6";
+}
+{
+  lang = "ko";
+  saneName = "ko";
+  sha256 = "0n5z9w86g1davyldpbl5xxp9n4zbfyl73fsr8y57xf19p9f6h0v4";
+}
+{
+  lang = "lt";
+  saneName = "lt";
+  sha256 = "1m79bh4z2hxzacbfbbddsyx6cwsqjj9b74in8cr5sqg41si8sd6c";
+}
+{
+  lang = "lv";
+  saneName = "lv";
+  sha256 = "0nzbn4qvkgk4b10xq1i10cjvkard1qp37a0vlzw9b0sbphd21zsr";
+}
+{
+  lang = "mr";
+  saneName = "mr";
+  sha256 = "0jncd61c0z72v1m4j6kps2bm19d59hdczvdlnk4yw13v0s83404p";
+}
+{
+  lang = "nb";
+  saneName = "nb";
+  sha256 = "1fyhg5qj6z2vdbk7wrsr1sspgj01wk3rsv708xb640klmsxi86wp";
+}
+{
+  lang = "nds";
+  saneName = "nds";
+  sha256 = "1gzcbk4kdcwrwnhl5fs43hv0gi5v7ajd8yhzk87s6ri58qf1sgxs";
+}
+{
+  lang = "nl";
+  saneName = "nl";
+  sha256 = "1rn5c3v2p68ai6x03li7k48lygqykdxpmwm2cpnggp4l67f1nwqp";
+}
+{
+  lang = "nn";
+  saneName = "nn";
+  sha256 = "11n4kpfw0hf72m5h4aiv3pi0b6v4h0m0czziqsv3caxvg2fsawg0";
+}
+{
+  lang = "pa";
+  saneName = "pa";
+  sha256 = "0nhpiqww84sc2mxqghk9dsxyqff2p3a1ipd6g495a2qrj6iyl448";
+}
+{
+  lang = "pl";
+  saneName = "pl";
+  sha256 = "0wpjmz0k7rxh6b9dxgkay2n7nzlp95vlrkwszshmpgksp52j2m3v";
+}
+{
+  lang = "pt";
+  saneName = "pt";
+  sha256 = "06l2am1hfk2bbbwggvig062nllf0kn67fzwq5lrrqcbj3c7pigic";
+}
+{
+  lang = "pt_BR";
+  saneName = "pt_BR";
+  sha256 = "07i449awjcz40wna2016zamkgiq09b74j037y4557p9czws756nb";
+}
+{
+  lang = "ro";
+  saneName = "ro";
+  sha256 = "1mdz7j3scbi0b75dxx3zyvnf3c9qqs975y7xijk2xscybk3dbcpl";
+}
+{
+  lang = "ru";
+  saneName = "ru";
+  sha256 = "1dhb2f8f5ypz74xf6vjzsmg3mp95plisf7nr7kcia1q62xm2cpsl";
+}
+{
+  lang = "sk";
+  saneName = "sk";
+  sha256 = "0cqcf4b3550yal9ldhyhdhwig9qj73q1hhgbh9656xzadx1z0i3q";
+}
+{
+  lang = "sl";
+  saneName = "sl";
+  sha256 = "1jkw8yzigbdvhv03s9j7xfnwiy22xf3hdk7hrsnp8q571692v5ik";
+}
+{
+  lang = "sr";
+  saneName = "sr";
+  sha256 = "0py22ysfrv54bipjdilcw719hvsksxirri6j810gvwi53pici5mn";
+}
+{
+  lang = "sv";
+  saneName = "sv";
+  sha256 = "118yfgqjp6q7q5kfn961bx8daqv02bp2q1fhdfksyh7d6zl5g1xr";
+}
+{
+  lang = "tr";
+  saneName = "tr";
+  sha256 = "1yy9j7rlcjsms7yh3iif9yr2vx2m4i8z7p42p9k86403vzsim674";
+}
+{
+  lang = "ug";
+  saneName = "ug";
+  sha256 = "00295fxgahhsssdprhv06jnrdc9759bfazs1fdzmfz274zbc590b";
+}
+{
+  lang = "uk";
+  saneName = "uk";
+  sha256 = "1j2phacx2lsax8ibsbpp13ixykcrxbnj5r2l2w141hzccl6afjw6";
+}
+{
+  lang = "vi";
+  saneName = "vi";
+  sha256 = "0han6vsrcabr6yzll39jqpkms1sfxjabyppb7vvb5safakdpp2fd";
+}
+{
+  lang = "wa";
+  saneName = "wa";
+  sha256 = "09235scll21ic4rv13wrcy8wlibnipmxmhmdipk3d4sl5h5ygdli";
+}
+{
+  lang = "zh_CN";
+  saneName = "zh_CN";
+  sha256 = "1afdx9b62hbkg1lg6lpmwjkmypz92jdlhch82010xkyfzv5m17gd";
+}
+{
+  lang = "zh_TW";
+  saneName = "zh_TW";
+  sha256 = "1pf6jjxgw62lzj9i38l4bzb4lip9cwlyy1vz9pbnznj5ic8whz3g";
+}
+]
diff --git a/pkgs/desktops/kde-4.13/oxygen-icons.nix b/pkgs/desktops/kde-4.13/oxygen-icons.nix
index 01020e095f9..f8b638d3f46 100644
--- a/pkgs/desktops/kde-4.13/oxygen-icons.nix
+++ b/pkgs/desktops/kde-4.13/oxygen-icons.nix
@@ -3,7 +3,7 @@
 kde {
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "06qddsbq0sadj9jh2x1qkbm69b7cnd2474b3h0zrzrqgnrsf8jn2";
+  outputHash = "0lgpy1x844wq7dgd61v15byh5nnbqhfih5ps8bypa7hm7spkfi9l";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/pkgs/desktops/kde-4.13/support/akonadi/default.nix b/pkgs/desktops/kde-4.13/support/akonadi/default.nix
index d51996e3bc1..30840ae1d77 100644
--- a/pkgs/desktops/kde-4.13/support/akonadi/default.nix
+++ b/pkgs/desktops/kde-4.13/support/akonadi/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite }:
+{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano
+, sqlite, mysql, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "akonadi-1.11.0";
+  name = "akonadi-1.12.1";
   
   src = fetchurl {
     url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "0k96i8xq3xkm5rrxrj3zqgppcmqbzcpc918xnx0p54jkkm85gchc";
+    sha256 = "0i9iv3lsqhkb51d4xnn6xaimignw8i64nbgkda1wznwbva7j4wx0";
   };
 
-  buildInputs = [ qt4 soprano libxslt boost sqlite ];
+  buildInputs = [ qt4 soprano libxslt boost sqlite mysql ];
 
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info ];
+  nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ];
 
   enableParallelBuilding = true;
   
@@ -18,7 +19,7 @@ stdenv.mkDerivation rec {
     description = "KDE PIM Storage Service";
     license = "LGPL";
     homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.urkud maintainers.phreedom ];
+    maintainers = with maintainers; [ sander urkud phreedom wmertens ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 857ac5d278b..f80da972e32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10371,8 +10371,6 @@ let
     }) ../desktops/kde-4.12;
 
   kde413 = kdePackagesFor (pkgs.kde413 // {
-      eigen = eigen2;
-      libusb = libusb1;
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.13;
 

From e993219be75a86b69b6a553104c4cd27bb0b80a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 26 Jun 2014 18:22:49 +0200
Subject: [PATCH 24/61] gtk2: maintenance update

---
 pkgs/development/libraries/gtk+/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index c57179364a7..8812ea70c79 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -8,11 +8,11 @@ assert xineramaSupport -> xlibs.libXinerama != null;
 assert cupsSupport -> cups != null;
 
 stdenv.mkDerivation rec {
-  name = "gtk+-2.24.23";
+  name = "gtk+-2.24.24";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gtk+/2.24/${name}.tar.xz";
-    sha256 = "0z2ic7fma1lmmv4ncgki3vadqp7d0qkj2d235impsplvgvi0d950";
+    sha256 = "0v9xxpkypizy9k866rvqc36zvj4kj9p8nd1nxf9znay8k3hv5khj";
   };
 
   enableParallelBuilding = true;

From 02a1e85ab17727544415d710fa781aa9aaf1a762 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 26 Jun 2014 18:24:44 +0200
Subject: [PATCH 25/61] cmake, podofo: fix finding freetype-2.5

---
 pkgs/development/libraries/podofo/default.nix     | 15 +++++++++++++--
 .../tools/build-managers/cmake/default.nix        |  7 ++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix
index d6b604367fb..b1464817a70 100644
--- a/pkgs/development/libraries/podofo/default.nix
+++ b/pkgs/development/libraries/podofo/default.nix
@@ -1,12 +1,14 @@
-{stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig,
-openssl, libpng, lua5}:
+{ stdenv, fetchurl, cmake, zlib, freetype, libjpeg, libtiff, fontconfig
+, openssl, libpng, lua5 }:
 
 stdenv.mkDerivation rec {
   name = "podofo-0.9.2";
+
   src = fetchurl {
     url = "mirror://sourceforge/podofo/${name}.tar.gz";
     sha256 = "1wx3s0718rmhdzdwyi8hgpf2s92sk3hijy8f4glrmnjpiihr2la6";
   };
+
   propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ];
   nativeBuildInputs = [ cmake ];
   buildInputs = [ lua5 stdenv.gcc.libc ];
@@ -17,6 +19,15 @@ stdenv.mkDerivation rec {
       lua5.crossDrv stdenv.gccCross.libc ];
   };
 
+  # fix finding freetype-2.5
+  preConfigure = ''
+    substituteInPlace ./CMakeLists.txt \
+      --replace FREETYPE_INCLUDE_DIR FREETYPE_INCLUDE_DIRS \
+      --replace 'FIND_PACKAGE(FREETYPE' 'FIND_PACKAGE(Freetype'
+
+    rm ./cmake/modules/Find{FREETYPE,ZLIB,PkgConfig}.cmake
+  '';
+
   cmakeFlags = "-DPODOFO_BUILD_SHARED=ON -DPODOFO_BUILD_STATIC=OFF";
 
   meta = {
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 42277b22036..45dffe06676 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, replace, curl, expat, zlib, bzip2, libarchive
+{ stdenv, fetchurl, fetchpatch, replace, curl, expat, zlib, bzip2, libarchive
 , useNcurses ? false, ncurses, useQt4 ? false, qt4
 }:
 
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   patches =
+    [(fetchpatch { # see http://www.cmake.org/Bug/view.php?id=13959
+      name = "FindFreetype-2.5.patch";
+      url = "http://www.cmake.org/Bug/file_download.php?file_id=4660&type=bug";
+      sha256 = "136z63ff83hnwd247cq4m8m8164pklzyl5i2csf5h6wd8p01pdkj";
+    })] ++
     # Don't search in non-Nix locations such as /usr, but do search in
     # Nixpkgs' Glibc. 
     optional (stdenv ? glibc) ./search-path.patch ++

From e80ec957f04e6f867518756ead9d0767ca2584b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 26 Jun 2014 18:31:52 +0200
Subject: [PATCH 26/61] mesa: feature update 10.1.5 -> 10.2.2

---
 pkgs/development/libraries/mesa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 215ee46e47c..f3f7bd4befa 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 */
 
 let
-  version = "10.1.5";
+  version = "10.2.2";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1g2vy7zaamzs00xasiwg0d6cb5sclfd9v8jms14ll9bghg3mwv5w";
+    sha256 = "171rfxa5i4rhc373h0his60lji7v7iplysd1vb6qj3q0ch1s9i1q";
   };
 
   prePatch = "patchShebangs .";
@@ -70,7 +70,7 @@ stdenv.mkDerivation {
     "--enable-glx-tls"
     "--enable-shared-glapi" "--enable-shared-gallium"
     "--enable-driglx-direct" # seems enabled anyway
-    "--enable-gallium-llvm" "--with-llvm-shared-libs"
+    "--enable-gallium-llvm" "--enable-llvm-shared-libs"
     "--enable-xa" # used in vmware driver
     "--enable-gles1" "--enable-gles2"
     "--enable-vdpau"

From 4e39e578f2af9f41439d40914d0475f5a926a70f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 26 Jun 2014 21:25:07 +0200
Subject: [PATCH 27/61] lmms: fix build with freetype-2.5

---
 pkgs/applications/audio/lmms/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 5195ddd42a1..46d5017c4fe 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jackaudio, libogg
-, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4
+, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype
 }:
 
 stdenv.mkDerivation  rec {
@@ -16,6 +16,11 @@ stdenv.mkDerivation  rec {
     libsndfile pkgconfig pulseaudio qt4
   ];
 
+  # work around broken build system of 0.4.*
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Linux MultiMedia Studio";
     homepage = "http://lmms.sourceforge.net";

From c63a9c155cb91865b91fe06a3d5ae2063e90e6e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 26 Jun 2014 21:44:39 +0200
Subject: [PATCH 28/61] hhvm: fix build with freetype-2.5

---
 pkgs/development/compilers/hhvm/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index 918b75156c3..82c621936b1 100644
--- a/pkgs/development/compilers/hhvm/default.nix
+++ b/pkgs/development/compilers/hhvm/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchgit, cmake, boost, libunwind, mariadb, libmemcached, pcre
+{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, mariadb, libmemcached, pcre
 , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
 , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog
 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
-, libxslt, ocaml
+, libxslt, ocaml, freetype
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ cmake boost libunwind mariadb libmemcached pcre libevent gd curl
+    [ cmake pkgconfig boost libunwind mariadb libmemcached pcre libevent gd curl
       libxml2 icu flex bison openssl zlib php expat libcap oniguruma
       libdwarf libmcrypt tbb gperftools bzip2 openldap readline
       libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
@@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
   MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
   MYSQL_DIR=mariadb;
 
+  # work around broken build system
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
+
   patchPhase = ''
     substituteInPlace hphp/util/generate-buildinfo.sh \
       --replace /bin/bash ${stdenv.shell}

From e8dc6258a1b5b11846fecf4a00c56a308dd22527 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 26 Jun 2014 22:01:21 +0200
Subject: [PATCH 29/61] qt4: try enableParallelBuilding again

I found no problems when running the build by itself on an 8-core.
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 1679b4953e7..0d6716243b8 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -121,9 +121,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
-  # occasional build problems if one has too many cores (like on Hydra)
-  # @vcunat has been unable to find a *reliable* fix
-  enableParallelBuilding = false;
+  enableParallelBuilding = true;
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
     "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";

From c61c7e7313fdc5e402b0f71e0430ae3367a7c55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 28 Jun 2014 08:16:36 +0200
Subject: [PATCH 30/61] libav: maintenance updates of all three branches

---
 pkgs/development/libraries/libav/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libav/default.nix b/pkgs/development/libraries/libav/default.nix
index b21f530478a..cd80d61d191 100644
--- a/pkgs/development/libraries/libav/default.nix
+++ b/pkgs/development/libraries/libav/default.nix
@@ -26,9 +26,9 @@ with { inherit (stdenv.lib) optional optionals; };
 
 let
   result = {
-    libav_0_8 = libavFun "0.8.12" "0069zv9s0f4silzdyjac87g7a89jhh27sadd1zcr9xngxbvd93fr";
-    libav_9   = libavFun   "9.13" "1jp6vlza5srks1scgl000x9y1y0l88inrcby4yxv6n92rpv5vw1g";
-    libav_10  = libavFun  "10.1"  "05cy1yq9rxarajs9gfdhkji8gmcpar125xi8lrx4cfplmp4lvq6m";
+    libav_0_8 = libavFun "0.8.13" "1fr3rzykrlm1cla0csm9hqa3gcqp19hf5rgn70nyb9w92r67v685";
+    libav_9   = libavFun   "9.14" "07gn4lbqx6wfhb2h2ddj88hcsacwmzb4syalg211m55xmp1g1fp4";
+    libav_10  = libavFun  "10.2"  "06wvk51cnllw6367qagc90sva4jr5d0r6jx8183wcwzwzgv01w29";
   };
 
   libavFun = version : sha256 : stdenv.mkDerivation rec {

From 07a09fbe63192de7b62468d38f7ed8b7981062a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 30 Jun 2014 21:00:36 +0200
Subject: [PATCH 31/61] ffmpeg{_2,_1,_0_10}: minor update

---
 pkgs/development/libraries/ffmpeg/0.10.nix | 4 ++--
 pkgs/development/libraries/ffmpeg/1.x.nix  | 4 ++--
 pkgs/development/libraries/ffmpeg/2.x.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/0.10.nix b/pkgs/development/libraries/ffmpeg/0.10.nix
index 99c823e7b29..8ffe2daebf6 100644
--- a/pkgs/development/libraries/ffmpeg/0.10.nix
+++ b/pkgs/development/libraries/ffmpeg/0.10.nix
@@ -21,11 +21,11 @@ assert vdpauSupport -> libvdpau != null;
 assert faacSupport -> faac != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-0.10.12";
+  name = "ffmpeg-0.10.14";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "00nvm3iysn8zincpvv1abqrxqj1ky0322dh2j9csjw983358538i";
+    sha256 = "1frkz3971zc2a60ras5ia26b2h8wbh017x1x80q8cfw0ycrpbxqy";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
diff --git a/pkgs/development/libraries/ffmpeg/1.x.nix b/pkgs/development/libraries/ffmpeg/1.x.nix
index c43cd329956..a0dcf52dcce 100644
--- a/pkgs/development/libraries/ffmpeg/1.x.nix
+++ b/pkgs/development/libraries/ffmpeg/1.x.nix
@@ -31,11 +31,11 @@ assert playSupport -> SDL != null;
 assert freetypeSupport -> freetype != null;
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-1.2.6";
+  name = "ffmpeg-1.2.7";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "174rf3g2pqaxa8rzg03qmy4cn2gsy0p2mk26y9yk5ksq6kg59m19";
+    sha256 = "13nj5q5ad0kcrid8r5x6x8lqfhk8kms14pmncf6vbdbk6x45k6v6";
   };
 
   # `--enable-gpl' (as well as the `postproc' and `swscale') mean that
diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index 847d561fbe4..a6be1aed8ff 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-2.2.2";
+  name = "ffmpeg-2.2.4";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "062jn47sm1ifwswcd3lx47nff62rgcwp84964q0v983issnrfax4";
+    sha256 = "0gxph1mk7743fcz94zb4fhfc6khg1acrqf4qyn8j5jnssn2fa67z";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;

From 1dc09826f8e6fd1976f37f69b932688da7fa457d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 2 Jul 2014 22:22:43 +0200
Subject: [PATCH 32/61] dbus: DOS-security update 1.8.4 -> .6

CVE-2014-{3532,3533}
---
 pkgs/development/libraries/dbus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 47b6a3a7cff..a417eb763a7 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -3,8 +3,8 @@
 , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }:
 
 let
-  version = "1.8.4";
-  sha256 = "1y0zcmd4jsf2gq5yymz9gcnwxijh0vxbmxz73q3l440is343vxiy";
+  version = "1.8.6";
+  sha256 = "0gyjxd0gfpjs3fq5bx6aljb5f3zxky5zsq0yfqr9ywbv03587vgd";
 
   inherit (stdenv) lib;
 

From 51fd35e7b5ab69b60d8c9c87883139e71182f28f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 2 Jul 2014 22:30:28 +0200
Subject: [PATCH 33/61] libvdpau: minor update, fix license

Suse and wikipedia classify it as MIT,
although it seems the headers in sources aren't all consistent.
---
 pkgs/development/libraries/libvdpau/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index cc8b3f59529..9d9528b75e4 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, pkgconfig, xlibs }:
+{ stdenv, fetchurl, pkgconfig, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "libvdpau-0.7";
+  name = "libvdpau-0.8";
 
   src = fetchurl {
     url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz";
-    sha256 = "1q5wx6fmqg2iiw57wxwh5vv4yszqs4nlvlzhzdn9vig8gi30ip14";
+    sha256 = "1v81875hppablq9gpsmvhnyl7z80zihx6arry758pvdbq4fd39vk";
   };
 
-  buildInputs = with xlibs; [ pkgconfig dri2proto libXext ];
+  buildInputs = with xorg; [ pkgconfig dri2proto libXext ];
 
-  propagatedBuildInputs = [ xlibs.libX11 ];
+  propagatedBuildInputs = [ xorg.libX11 ];
 
   configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";
-    license = "bsd";
+    license = licenses.mit;
   };
 }

From 5d2ff3b5c2fd17472b9b1ba22b2a806701326ed5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 3 Jul 2014 18:20:46 +0200
Subject: [PATCH 34/61] php-5.3: fix build with freetype-2.5 (by Gentoo patch)

---
 .../interpreters/php/5.3-freetype-dirs.patch  | 64 +++++++++++++++++++
 pkgs/development/interpreters/php/5.3.nix     |  3 +-
 2 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/php/5.3-freetype-dirs.patch

diff --git a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch b/pkgs/development/interpreters/php/5.3-freetype-dirs.patch
new file mode 100644
index 00000000000..3b78f9b309b
--- /dev/null
+++ b/pkgs/development/interpreters/php/5.3-freetype-dirs.patch
@@ -0,0 +1,64 @@
+From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001
+From: Adam Harvey <aharvey@php.net>
+Date: Sat, 7 Dec 2013 19:39:40 -0800
+Subject: [PATCH] Switch to using freetype-config for freetype detection.
+
+This fixes GD compilation against libfreetype 2.5.1 and later after they made
+the rather interesting decision to change their include directory layout in a
+point release.
+
+The original suggestion in the bug was to use pkg-config, but my inclination is
+to use freetype-config instead: we should be able to get the same configuration
+information without actually needing pkg-config installed, since pkg-config is
+by no means guaranteed to exist on many Unices and distros, whereas
+freetype-config should always be present if a libfreetype build environment is
+installed. Let's try it out and see what happens.
+
+Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)).
+
+diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
+index 0e35ece..732e14c 100644
+--- a/ext/gd/config.m4
++++ b/ext/gd/config.m4
+@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[
+   if test "$PHP_FREETYPE_DIR" != "no"; then
+ 
+     for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+-      if test -f "$i/include/freetype2/freetype/freetype.h"; then
++      if test -f "$i/bin/freetype-config"; then
+         FREETYPE2_DIR=$i
+-        FREETYPE2_INC_DIR=$i/include/freetype2
++        FREETYPE2_CONFIG="$i/bin/freetype-config"
+         break
+       fi
+     done
+ 
+     if test -z "$FREETYPE2_DIR"; then
+-      AC_MSG_ERROR([freetype.h not found.])
++      AC_MSG_ERROR([freetype-config not found.])
+     fi
+ 
+-    PHP_CHECK_LIBRARY(freetype, FT_New_Face,
+-    [
+-      PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD)
+-      PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
+-      PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
+-      AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
+-      AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
+-      AC_DEFINE(ENABLE_GD_TTF,1,[ ])
+-    ],[
+-      AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.])
+-    ],[
+-      -L$FREETYPE2_DIR/$PHP_LIBDIR
+-    ])
++    FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags`
++    FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs`
++
++    PHP_EVAL_INCLINE($FREETYPE2_CFLAGS)
++    PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD)
++    AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
++    AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
++    AC_DEFINE(ENABLE_GD_TTF,1,[ ])
+   else
+     AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
+   fi
diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix
index 86782117097..ed5feeacf61 100644
--- a/pkgs/development/interpreters/php/5.3.nix
+++ b/pkgs/development/interpreters/php/5.3.nix
@@ -104,7 +104,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
       gd = {
         configureFlags = [
           "--with-gd=${gd}"
-          "--with-freetype-dir=${freetype}"
           "--with-png-dir=${libpng}"
           "--with-jpeg-dir=${libjpeg}"
         ];
@@ -241,6 +240,6 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed)
     platforms   = stdenv.lib.platforms.unix;
   };
 
-  patches = [./fix.patch];
+  patches = [ ./fix.patch ./5.3-freetype-dirs.patch ];
 
 })

From 10fe63c05a566edec7167fc4c5562756a6f674d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Jul 2014 20:44:49 +0200
Subject: [PATCH 35/61] pixman: bugfix update, remove withPNG option

The option seemed useless.
---
 pkgs/development/libraries/pixman/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index cb76a1b615f..d55a86c2908 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,16 +1,16 @@
-{ fetchurl, stdenv, pkgconfig, perl, withPNG ? true, libpng, glib /*just passthru*/ }:
+{ fetchurl, stdenv, pkgconfig, perl, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.32.4";
+  name = "pixman-0.32.6";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "113ycngcssbrps217dyajq96hm9xghsfch82h14yffla1r1fviw0";
+    sha256 = "0129g4zdrw5hif5783li7rzcr4vpbc2cfia91azxmsk0h0xx3zix";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];
 
-  buildInputs = stdenv.lib.optional withPNG [ libpng ]; # NOT in closure anyway
+  buildInputs = [ libpng ]; # NOT in closure anyway
 
   postInstall = glib.flattenInclude;
 

From 9a009383343a440bd0f9cda8dfde6142c69d5026 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Jul 2014 20:47:47 +0200
Subject: [PATCH 36/61] mesa: bugfix update

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index f3f7bd4befa..0960d431f4c 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 */
 
 let
-  version = "10.2.2";
+  version = "10.2.3";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "171rfxa5i4rhc373h0his60lji7v7iplysd1vb6qj3q0ch1s9i1q";
+    sha256 = "1ssap95gmbccqd5bcysq74ffd8mrlkfy9mm0mgb1g2y9f1hsk0p4";
   };
 
   prePatch = "patchShebangs .";

From 4b263946dd77aed9ec118aafc85fbd678397afe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Jul 2014 20:48:18 +0200
Subject: [PATCH 37/61] qt3, graphicsmagick137, fox, neverball: fix build

Broken after freetype propagating libpng, which hid the older ones.
Reordering is enough to ensure the older libpng gets picked.
---
 pkgs/applications/graphics/graphicsmagick/1.3.7.nix | 2 +-
 pkgs/development/libraries/fox/default.nix          | 2 +-
 pkgs/development/libraries/qt-3/default.nix         | 2 +-
 pkgs/games/neverball/default.nix                    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix
index 291d61d5f6f..8b780647dfa 100644
--- a/pkgs/applications/graphics/graphicsmagick/1.3.7.nix
+++ b/pkgs/applications/graphics/graphicsmagick/1.3.7.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   configureFlags = "--enable-shared";
 
   buildInputs =
-    [ bzip2 freetype ghostscript graphviz libjpeg libpng libtiff libX11 libxml2
+    [ libpng bzip2 freetype ghostscript graphviz libjpeg libtiff libX11 libxml2
       zlib libtool
     ];
 
diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix
index 87e47e1b046..985322790a9 100644
--- a/pkgs/development/libraries/fox/default.nix
+++ b/pkgs/development/libraries/fox/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     md5 = "b5897e9c664967f5042e57070037ff18";
   };
 
-  buildInputs = [ x11 libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
+  buildInputs = [ libpng x11 libjpeg libtiff zlib bzip2 libXcursor libXrandr libXft ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix
index 9b5cb0452d6..432b4358f7a 100644
--- a/pkgs/development/libraries/qt-3/default.nix
+++ b/pkgs/development/libraries/qt-3/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ which ];
-  propagatedBuildInputs = [x11 libXft libXrender zlib libjpeg libpng];
+  propagatedBuildInputs = [libpng x11 libXft libXrender zlib libjpeg];
 
   configureFlags = "
     -v
diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix
index 1ebb4b69b6e..2bec14a11c1 100644
--- a/pkgs/games/neverball/default.nix
+++ b/pkgs/games/neverball/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "19hdgdmv20y56xvbj4vk0zdmyaa8kv7df85advkchw7cdsgwlcga";
   };
 
-  buildInputs = [ SDL mesa libpng libjpeg SDL_ttf libvorbis gettext physfs];
+  buildInputs = [ libpng SDL mesa libjpeg SDL_ttf libvorbis gettext physfs];
 
   dontPatchElf = true;
 

From 73ad32e1d94f5c774e4f5e685a7efba51a997c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 9 Jul 2014 22:02:19 +0200
Subject: [PATCH 38/61] freetype: flatten include to fix several builds

I just wonder why freetype-2.5 needed to move headers around.
---
 pkgs/development/libraries/freetype/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 510e816f88c..a13e399ab0f 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -2,6 +2,7 @@
   # FreeType supports sub-pixel rendering.  This is patented by
   # Microsoft, so it is disabled by default.  This option allows it to
   # be enabled.  See http://www.freetype.org/patents.html.
+, glib/*passthru only*/
 , useEncumberedCode ? true
 }:
 
@@ -46,7 +47,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall = ''ln -s freetype2 "$out"/include/freetype''; # compat hack
+  # compat hacks
+  postInstall = glib.flattenInclude + ''
+    ln -s . "$out"/include/freetype
+  '';
 
   crossAttrs = {
     # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead

From edec3719a6ad227602f16ac10d2073a1b818ca7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Jul 2014 21:35:25 +0200
Subject: [PATCH 39/61] xorg: update a few modules

---
 pkgs/servers/x11/xorg/default.nix       | 18 +++++++++---------
 pkgs/servers/x11/xorg/tarballs-7.7.list |  6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 61e106a136b..f15664a8b38 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -720,11 +720,11 @@ let
   })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
-    name = "libXi-1.7.2";
+    name = "libXi-1.7.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2;
-      sha256 = "03mj9i6h0n8icjkx5a16wh1gyyhfiayj02ydc6sy4i9nqqfph96z";
+      url = mirror://xorg/individual/lib/libXi-1.7.3.tar.bz2;
+      sha256 = "0g4md74h8vnvni8qmvvrr5q629ygasvlpblnrkicci3vymwvhgbn";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
   })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
@@ -1470,11 +1470,11 @@ let
   })) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videoati = (stdenv.mkDerivation ((if overrides ? xf86videoati then overrides.xf86videoati else x: x) {
-    name = "xf86-video-ati-7.3.0";
+    name = "xf86-video-ati-7.4.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2;
-      sha256 = "1zj6401km2zgc32vhw7jfkaklsllsm9xpbs79zh9da8r94n0fz0h";
+      url = mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2;
+      sha256 = "1nbnvxlyn75bcf23m39p7yw80kilgdxmjdvzgcs3walshnlhq8wn";
     };
     buildInputs = [pkgconfig fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ];
   })) // {inherit fontsproto glamoregl libdrm udev libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
@@ -1580,11 +1580,11 @@ let
   })) // {inherit fontsproto libdrm libpciaccess randrproto renderproto videoproto xextproto xf86driproto xorgserver xproto ;};
 
   xf86videomodesetting = (stdenv.mkDerivation ((if overrides ? xf86videomodesetting then overrides.xf86videomodesetting else x: x) {
-    name = "xf86-video-modesetting-0.8.1";
+    name = "xf86-video-modesetting-0.9.0";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2;
-      sha256 = "1jhjhgji6169sj7489qahcnmi8cf7y22wvj8qsmrg537rgbxia1v";
+      url = mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2;
+      sha256 = "0p6pjn5bnd2wr3lmas4b12zcq12d9ilvssga93fzlg90fdahikwh";
     };
     buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ];
   })) // {inherit fontsproto libdrm udev libpciaccess randrproto libX11 xextproto xorgserver xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index fb159520fc2..ebf71fbced2 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -70,7 +70,7 @@ mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.2.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.3.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2
@@ -124,7 +124,7 @@ mirror://xorg/individual/driver/xf86-input-vmmouse-13.0.0.tar.bz2
 mirror://xorg/individual/driver/xf86-input-void-1.4.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ark-0.7.5.tar.bz2
 mirror://xorg/individual/driver/xf86-video-ast-0.98.0.tar.bz2
-mirror://xorg/individual/driver/xf86-video-ati-7.3.0.tar.bz2
+mirror://xorg/individual/driver/xf86-video-ati-7.4.0.tar.bz2
 mirror://xorg/individual/driver/glamor-egl-0.6.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nouveau-1.0.10.tar.bz2
 mirror://xorg/individual/driver/xf86-video-cirrus-1.5.2.tar.bz2
@@ -137,7 +137,7 @@ mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2
 mirror://xorg/individual/driver/xf86-video-intel-2.21.15.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2
-mirror://xorg/individual/driver/xf86-video-modesetting-0.8.1.tar.bz2
+mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2
 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2
 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2

From c56ca66341e8999e3671a3374ed374b06cf20a03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Jul 2014 21:41:21 +0200
Subject: [PATCH 40/61] harfbuzz: small update

---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index fba483cc78a..a2596568e27 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.29";
+  name = "harfbuzz-0.9.30";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "14739pvc6bvddnj4rplhjdgiqwfvyincchlhvmig637sqqwfl730";
+    sha256 = "11l5sm8mc3bwam5ccasd87bjk1ss7bhpai2jxdxlzbd5wjgkz1zs";
   };
 
   configureFlags = [

From 3ecbd8826957a68fe467462104f0a35e6e7c58bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 13 Jul 2014 21:55:19 +0200
Subject: [PATCH 41/61] poppler: update

---
 pkgs/development/libraries/poppler/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index b9412b37cba..fd507b3e540 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,14 +4,14 @@
 }:
 
 let
-  version = "0.24.5"; # even major numbers are stable
-  sha256 = "114zfm4771iq25wa4bsg4nc2gnr6waaj8936wd23r4hc2084jrd2";
+  version = "0.26.2"; # even major numbers are stable
+  sha256 = "09lm1mfpf0p6vzayl2nbwvsj5gl7sz8sfmwziix0p87bh8x9dn8x";
 
   qtcairo_patches =
     let qtcairo = fetchgit { # the version for poppler-0.24
       url = "git://github.com/giddie/poppler-qt4-cairo-backend.git";
-      rev = "c4578cde09834e0d70873f63b1c2a410f66bb4f9";
-      sha256 = "07bs2phmp7f4mqrwqz2bgyw2gw7s00mwsm548bsikyz1cbj7fl93";
+      rev = "7b9e1ea763b579e635ee7614b10970b9635841cf";
+      sha256 = "0cdq0qw1sm6mxnrhmah4lfsd9wjlcdx86iyikwmjpwdmrkjk85r2";
     }; in
       [ "${qtcairo}/0001-Cairo-backend-added-to-Qt4-wrapper.patch"
         "${qtcairo}/0002-Setting-default-Qt4-backend-to-Cairo.patch"

From 7e9a0b8ec25a5c4ca3d85b5ba46e6444f09ea590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 18 Jul 2014 11:07:10 +0200
Subject: [PATCH 42/61] inkscape: maintenance update

Needed to fix build with poppler-0.26.
---
 pkgs/applications/graphics/inkscape/default.nix       |  8 ++------
 .../graphics/inkscape/spuriouscomma.patch             | 11 -----------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/applications/graphics/inkscape/spuriouscomma.patch

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 478a0ff7e50..43a4d86b48d 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -4,19 +4,15 @@
 , gsl, python, pyxml, lxml, poppler, imagemagick, libwpg }:
 
 stdenv.mkDerivation rec {
-  name = "inkscape-0.48.4";
+  name = "inkscape-0.48.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/inkscape/${name}.tar.bz2";
-    sha256 = "17aiibgdwjqpjc38f0yr2sdlgwngg5ac9srlybjcx9aspf6ashc7";
+    sha256 = "0sfr7a1vr1066rrkkqbqvcqs3gawalj68ralnhd6k87jz62fcv1b";
   };
 
   patches = [ ./configure-python-libs.patch ];
 
-  postPatch = ''
-    patch -p0 < ${./spuriouscomma.patch}
-  '';
-
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
diff --git a/pkgs/applications/graphics/inkscape/spuriouscomma.patch b/pkgs/applications/graphics/inkscape/spuriouscomma.patch
deleted file mode 100644
index bc538068f9e..00000000000
--- a/pkgs/applications/graphics/inkscape/spuriouscomma.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/widgets/desktop-widget.h~	2011-07-08 13:25:09.000000000 -0500
-+++ src/widgets/desktop-widget.h	2013-02-15 16:04:45.806910365 -0600
-@@ -239,7 +239,7 @@
- private:
-     GtkWidget *tool_toolbox;
-     GtkWidget *aux_toolbox;
--    GtkWidget *commands_toolbox,;
-+    GtkWidget *commands_toolbox;
-     GtkWidget *snap_toolbox;
- 
-     static void init(SPDesktopWidget *widget);

From df99ec18dce556627fb01ce571e6fc3f2ae24c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 18 Jul 2014 11:54:10 +0200
Subject: [PATCH 43/61] inkscape: enableParallelBuilding, doCheck, add meta

---
 pkgs/applications/graphics/inkscape/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 43a4d86b48d..bc55b0ff680 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   patches = [ ./configure-python-libs.patch ];
 
+  postPatch = stdenv.lib.optionalString doCheck
+    ''sed -i 's:#include "../../src:#include "src:' src/cxxtests.cpp'';
+
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
@@ -27,6 +30,10 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-python";
 
+  enableParallelBuilding = true;
+  doCheck = true;
+  checkFlags = "-j1";
+
   postInstall = ''
     # Make sure PyXML modules can be found at run-time.
     for i in "$out/bin/"*
@@ -40,9 +47,11 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = "-lX11";
 
-  meta = {
+  meta = with stdenv.lib; {
     license = "GPL";
     homepage = http://www.inkscape.org;
+    description = "Vector graphics editor";
+    platforms = platforms.all;
     longDescription = ''
       Inkscape is a feature-rich vector graphics editor that edits
       files in the W3C SVG (Scalable Vector Graphics) file format.

From a1a6414b9bb67e48e3c2dc36cf8e473472055125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 18 Jul 2014 11:54:53 +0200
Subject: [PATCH 44/61] exult: fix build, same as 4b263946d

---
 pkgs/games/exult/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix
index e784cc109f5..b52109a8d9e 100644
--- a/pkgs/games/exult/default.nix
+++ b/pkgs/games/exult/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     ./64bits.patch
   ];
 
-  buildInputs = [SDL SDL_mixer zlib libpng unzip];
+  buildInputs = [libpng SDL SDL_mixer zlib unzip];
   
   NIX_CFLAGS_COMPILE = "-I${SDL_mixer}/include/SDL";
 

From f456abacb7b5ca2bf0866b5297f0967abdc3dd8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 20 Jul 2014 08:38:06 +0200
Subject: [PATCH 45/61] xorg.libXi: bugfix update

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index f15664a8b38..938f6564b52 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -720,11 +720,11 @@ let
   })) // {inherit fontconfig freetype libX11 xproto libXrender ;};
 
   libXi = (stdenv.mkDerivation ((if overrides ? libXi then overrides.libXi else x: x) {
-    name = "libXi-1.7.3";
+    name = "libXi-1.7.4";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXi-1.7.3.tar.bz2;
-      sha256 = "0g4md74h8vnvni8qmvvrr5q629ygasvlpblnrkicci3vymwvhgbn";
+      url = mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2;
+      sha256 = "0i12lj973grlp9fa79v0vh9cahk3nf9csdjnf81iip0qcrlc5zrc";
     };
     buildInputs = [pkgconfig inputproto libX11 libXext xextproto libXfixes xproto ];
   })) // {inherit inputproto libX11 libXext xextproto libXfixes xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index ebf71fbced2..2b17423bae2 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -70,7 +70,7 @@ mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2
-mirror://xorg/individual/lib/libXi-1.7.3.tar.bz2
+mirror://xorg/individual/lib/libXi-1.7.4.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.3.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libxkbfile-1.0.8.tar.bz2
 mirror://xorg/individual/lib/libXmu-1.1.2.tar.bz2

From 65aacd459cf3dcb0c917e4369947417b380fe02f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 20 Jul 2014 08:40:05 +0200
Subject: [PATCH 46/61] harfbuzz: small update

---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index a2596568e27..89c6b965161 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.30";
+  name = "harfbuzz-0.9.32";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "11l5sm8mc3bwam5ccasd87bjk1ss7bhpai2jxdxlzbd5wjgkz1zs";
+    sha256 = "1d4x9fcy2p9g67pb4nfzx6p4008dzn7g25lva9pv71rd9rs82323";
   };
 
   configureFlags = [

From 14953d7bc9fc611b832787aac014a6bfcd3273e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 20 Jul 2014 08:40:25 +0200
Subject: [PATCH 47/61] mesa: maintenance update 10.2.3 -> .4

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 0960d431f4c..5695967bc3d 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -24,7 +24,7 @@ else
 */
 
 let
-  version = "10.2.3";
+  version = "10.2.4";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
 
   src =  fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/${version}/MesaLib-${version}.tar.bz2";
-    sha256 = "1ssap95gmbccqd5bcysq74ffd8mrlkfy9mm0mgb1g2y9f1hsk0p4";
+    sha256 = "06l18j9vshq2xzhnp6zd6pw0dlfy0qg1cw4zyn1w51gb8h9398h6";
   };
 
   prePatch = "patchShebangs .";

From 6b4929373ffe726a860ecb1f26dcb5d1ec03f8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 20 Jul 2014 08:44:39 +0200
Subject: [PATCH 48/61] ffmpeg: major update 2.2.4 -> 2.3

It's claimed to be fully API-compatible update.
---
 pkgs/development/libraries/ffmpeg/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix
index a6be1aed8ff..7b40f48c8df 100644
--- a/pkgs/development/libraries/ffmpeg/2.x.nix
+++ b/pkgs/development/libraries/ffmpeg/2.x.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "ffmpeg-2.2.4";
+  name = "ffmpeg-2.3";
 
   src = fetchurl {
     url = "http://www.ffmpeg.org/releases/${name}.tar.bz2";
-    sha256 = "0gxph1mk7743fcz94zb4fhfc6khg1acrqf4qyn8j5jnssn2fa67z";
+    sha256 = "17l0bx95al6cjhz3pzfcbwg07sbfbwqbxg34zl5lhl89w9jbngbb";
   };
 
   subtitleSupport = config.ffmpeg.subtitle or true;

From f63fb3fda0200754958081d54cb3360bdc6676dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 21 Jul 2014 09:57:16 +0200
Subject: [PATCH 49/61] blender: fix parallel builds

---
 pkgs/applications/misc/blender/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index c6a6fa7861c..ffa399fa7fb 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, SDL, boost, cmake, ffmpeg, gettext, glew
+{ stdenv, lib, fetchurl, fetchpatch, SDL, boost, cmake, ffmpeg, gettext, glew
 , ilmbase, libXi, libjpeg, libpng, libsamplerate, libsndfile
 , libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg, python
 , zlib, fftw
@@ -26,6 +26,12 @@ stdenv.mkDerivation rec {
       substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
     '';
 
+  patches = [(fetchpatch {
+    url = https://developer.blender.org/file/data/vqqwcycgo66w3y3dm4zk/PHID-FILE-ijyw5kteba6nzpcbhv7a/D619.diff;
+    sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f";
+  })];
+  patchFlags = "-p0";
+
   cmakeFlags =
     [ "-DOPENEXR_INC=${openexr}/include/OpenEXR"
       "-DWITH_OPENCOLLADA=OFF"

From 34cade2c9ce2326e31de3722b1bc3e341e429f19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 21 Jul 2014 09:57:48 +0200
Subject: [PATCH 50/61] mplayer2: switch to libav to fix build

CC @viric. If someone has a better suggestion, do it.
IMHO the main problem is the lack of maintenance
from the side of mplayer2, e.g. latest release >3 years ago.
---
 pkgs/top-level/all-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 04c994bcf84..282e3371302 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9215,7 +9215,9 @@ let
     vdpauSupport = config.mplayer.vdpauSupport or false;
   };
 
-  mplayer2 = callPackage ../applications/video/mplayer2 { };
+  mplayer2 = callPackage ../applications/video/mplayer2 {
+    ffmpeg = libav_9; # see https://trac.macports.org/ticket/44386
+  };
 
   MPlayerPlugin = browser:
     import ../applications/networking/browsers/mozilla-plugins/mplayerplug-in {

From 923bf0a3ff291a77fb9715d4fdd53ea85d6f365a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 21 Jul 2014 10:05:50 +0200
Subject: [PATCH 51/61] mpv: major update, incl. build fix with new ffmpeg

CC @AndersonTorres. The real build fix is in previous minor updates,
but I see no reason not to have the major updates as well.
---
 pkgs/applications/video/mpv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index be796f8e0de..53136010c82 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -57,11 +57,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "mpv-${version}";
-  version = "0.3.8";
+  version = "0.4.1";
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz";
-    sha256 = "0k77rq17mslpvvgr4mvkj9bd5s1yhsigwvzym8blr1brxkj9pk3b";
+    sha256 = "0wqjyzw3kk854zj263k7jyykzfaz1g27z50aqrd26hylg8k135cn";
   };
 
   buildInputs = with stdenv.lib;

From 65ac375aa22f1bbcd01135193d8fc19a5d50bbbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 21 Jul 2014 10:09:38 +0200
Subject: [PATCH 52/61] Revert "qt4: try enableParallelBuilding again"

This reverts commit e8dc6258a1b5b11846fecf4a00c56a308dd22527.

It's unfortunate, but there still are occurrences of the missing ui_qtgradientview.h
on Hydra: http://hydra.nixos.org/build/12625390/nixlog/1/tail-reload
---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 0d6716243b8..1679b4953e7 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -121,7 +121,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl pkgconfig which ];
 
-  enableParallelBuilding = true;
+  # occasional build problems if one has too many cores (like on Hydra)
+  # @vcunat has been unable to find a *reliable* fix
+  enableParallelBuilding = false;
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin
     "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include";

From 4cbf520bfe20a55f22cd4226df952cce0367acf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 21 Jul 2014 15:06:44 +0200
Subject: [PATCH 53/61] e18.enlightenment: fix build by adding bzip2

I'm lazy to find how exatly the need propagated in x-updates.
---
 pkgs/desktops/e18/enlightenment.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/e18/enlightenment.nix b/pkgs/desktops/e18/enlightenment.nix
index fde939c146a..e51a61209e2 100644
--- a/pkgs/desktops/e18/enlightenment.nix
+++ b/pkgs/desktops/e18/enlightenment.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit }:
+{ stdenv, fetchurl, pkgconfig, e18, xlibs, libffi, pam, alsaLib, luajit, bzip2 }:
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
   version = "0.18.8";
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.gz";
     sha256 = "1fsigbrknkwy909p1gqwxag1bar3p413s4f6fq3qnbsd6gjbvj8l";
   };
-  buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit ];
+  buildInputs = [ pkgconfig e18.efl e18.elementary xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 ];
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="-I${e18.efl}/include/eo-1 -I${e18.efl}/include/ecore-imf-1 -I${e18.efl}/include/ethumb-client-1 -I${e18.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE"
   '';

From 644c9eb6f761468e05c58275d2e37d9795c8132e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 22 Jul 2014 17:48:14 +0200
Subject: [PATCH 54/61] Revert "Merge #3054: add kde 4.13.2"

This is due to breaking evaluation; see the PR discussion.

This reverts commit 6a77d5fd3e3eef8c9eafb53f70a9448c25d2f517, reversing
changes made to 07a09fbe63192de7b62468d38f7ed8b7981062a4.

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
---
 .../services/x11/desktop-managers/default.nix |   2 +-
 .../x11/desktop-managers/kde4_next.nix        | 163 -----
 pkgs/desktops/kde-4.13/applications/kate.nix  |  11 -
 .../kde-4.13/applications/konsole.nix         |  11 -
 pkgs/desktops/kde-4.13/default.nix            |  44 --
 .../files/kde-wallpapers-buildsystem.patch    |  17 -
 .../kde-4.13/files/polkit-install.patch       |  12 -
 pkgs/desktops/kde-4.13/kactivities.nix        |   9 -
 pkgs/desktops/kde-4.13/kde-base-artwork.nix   |  14 -
 .../kde-4.13/kde-baseapps/kde-baseapps.nix    |  11 -
 pkgs/desktops/kde-4.13/kde-package/4.13.2.nix | 625 ------------------
 .../desktops/kde-4.13/kde-package/default.nix | 131 ----
 .../kde-4.13/kde-package/kde-manifest.sh      | 173 -----
 .../kde-4.13/kde-package/kde-submodules.xslt  |  22 -
 pkgs/desktops/kde-4.13/kde-runtime.nix        |  24 -
 pkgs/desktops/kde-4.13/kde-wallpapers.nix     |  17 -
 pkgs/desktops/kde-4.13/kde-workspace.nix      |  38 --
 .../kde-4.13/kdeaccessibility/jovie.nix       |   9 -
 .../kde-4.13/kdeaccessibility/kaccessible.nix |   9 -
 .../kde-4.13/kdeaccessibility/kmag.nix        |  10 -
 .../kde-4.13/kdeaccessibility/kmousetool.nix  |   9 -
 .../kde-4.13/kdeaccessibility/kmouth.nix      |   9 -
 pkgs/desktops/kde-4.13/kdeadmin/kcron.nix     |   9 -
 .../desktops/kde-4.13/kdeadmin/ksystemlog.nix |   9 -
 pkgs/desktops/kde-4.13/kdeadmin/kuser.nix     |   9 -
 .../kde-4.13/kdeartwork/ColorSchemes.nix      |  11 -
 .../kdeartwork/FindXscreensaver.cmake         |  73 --
 .../kdeartwork/HighResolutionWallpapers.nix   |  11 -
 .../kde-4.13/kdeartwork/IconThemes.nix        |  13 -
 .../kde-4.13/kdeartwork/WeatherWallpapers.nix |  11 -
 .../kde-4.13/kdeartwork/desktopthemes.nix     |  11 -
 .../kde-4.13/kdeartwork/emoticons.nix         |  11 -
 .../kde-4.13/kdeartwork/kscreensaver.nix      |  15 -
 .../kde-4.13/kdeartwork/kwin-styles.nix       |   9 -
 pkgs/desktops/kde-4.13/kdeartwork/styles.nix  |  11 -
 .../kde-4.13/kdeartwork/wallpapers.nix        |  11 -
 pkgs/desktops/kde-4.13/kdebindings/perlqt.nix |  14 -
 pkgs/desktops/kde-4.13/kdebindings/pykde4.nix |  32 -
 .../kdebindings/qtruby-install-prefix.patch   |  15 -
 pkgs/desktops/kde-4.13/kdebindings/qtruby.nix |  20 -
 .../smokegen-CMakeLists.txt-nix.patch         |  13 -
 .../kde-4.13/kdebindings/smokegen-nix.patch   |  13 -
 .../kde-4.13/kdebindings/smokegen.nix         |  13 -
 .../kde-4.13/kdebindings/smokekde.nix         |  19 -
 .../desktops/kde-4.13/kdebindings/smokeqt.nix |  15 -
 pkgs/desktops/kde-4.13/kdeedu/analitza.nix    |   8 -
 pkgs/desktops/kde-4.13/kdeedu/artikulate.nix  |  11 -
 pkgs/desktops/kde-4.13/kdeedu/blinken.nix     |   8 -
 pkgs/desktops/kde-4.13/kdeedu/cantor.nix      |  13 -
 pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix    |   8 -
 pkgs/desktops/kde-4.13/kdeedu/kalzium.nix     |  13 -
 pkgs/desktops/kde-4.13/kdeedu/kanagram.nix    |   8 -
 pkgs/desktops/kde-4.13/kdeedu/kbruch.nix      |   8 -
 pkgs/desktops/kde-4.13/kdeedu/kgeography.nix  |   8 -
 pkgs/desktops/kde-4.13/kdeedu/khangman.nix    |   8 -
 pkgs/desktops/kde-4.13/kdeedu/kig.nix         |   9 -
 pkgs/desktops/kde-4.13/kdeedu/kiten.nix       |   9 -
 pkgs/desktops/kde-4.13/kdeedu/klettres.nix    |   9 -
 pkgs/desktops/kde-4.13/kdeedu/kmplot.nix      |   9 -
 .../kde-4.13/kdeedu/kqtquickcharts.nix        |   8 -
 pkgs/desktops/kde-4.13/kdeedu/kstars.nix      |  14 -
 pkgs/desktops/kde-4.13/kdeedu/ktouch.nix      |   9 -
 pkgs/desktops/kde-4.13/kdeedu/kturtle.nix     |   9 -
 pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix   |   9 -
 pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix   |   8 -
 pkgs/desktops/kde-4.13/kdeedu/marble.nix      |  12 -
 pkgs/desktops/kde-4.13/kdeedu/pairs.nix       |   9 -
 pkgs/desktops/kde-4.13/kdeedu/parley.nix      |   9 -
 pkgs/desktops/kde-4.13/kdeedu/rocs.nix        |  14 -
 pkgs/desktops/kde-4.13/kdeedu/step.nix        |  12 -
 pkgs/desktops/kde-4.13/kdegames/bomber.nix    |   7 -
 pkgs/desktops/kde-4.13/kdegames/bovo.nix      |   8 -
 pkgs/desktops/kde-4.13/kdegames/granatier.nix |   7 -
 pkgs/desktops/kde-4.13/kdegames/kajongg.nix   |  13 -
 pkgs/desktops/kde-4.13/kdegames/kapman.nix    |   7 -
 pkgs/desktops/kde-4.13/kdegames/katomic.nix   |   7 -
 pkgs/desktops/kde-4.13/kdegames/kblackbox.nix |   7 -
 pkgs/desktops/kde-4.13/kdegames/kblocks.nix   |   7 -
 pkgs/desktops/kde-4.13/kdegames/kbounce.nix   |   7 -
 pkgs/desktops/kde-4.13/kdegames/kbreakout.nix |   7 -
 pkgs/desktops/kde-4.13/kdegames/kdiamond.nix  |   7 -
 .../kde-4.13/kdegames/kfourinline.nix         |   7 -
 .../kde-4.13/kdegames/kgoldrunner.nix         |   7 -
 pkgs/desktops/kde-4.13/kdegames/kigo.nix      |   7 -
 pkgs/desktops/kde-4.13/kdegames/killbots.nix  |   7 -
 pkgs/desktops/kde-4.13/kdegames/kiriki.nix    |   7 -
 .../kde-4.13/kdegames/kjumpingcube.nix        |   7 -
 pkgs/desktops/kde-4.13/kdegames/klickety.nix  |   7 -
 pkgs/desktops/kde-4.13/kdegames/klines.nix    |   7 -
 pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix |   7 -
 pkgs/desktops/kde-4.13/kdegames/kmines.nix    |   7 -
 .../kde-4.13/kdegames/knavalbattle.nix        |   7 -
 pkgs/desktops/kde-4.13/kdegames/knetwalk.nix  |   7 -
 pkgs/desktops/kde-4.13/kdegames/kolf.nix      |   7 -
 pkgs/desktops/kde-4.13/kdegames/kollision.nix |   7 -
 pkgs/desktops/kde-4.13/kdegames/konquest.nix  |   7 -
 pkgs/desktops/kde-4.13/kdegames/kpat.nix      |   7 -
 pkgs/desktops/kde-4.13/kdegames/kreversi.nix  |   7 -
 pkgs/desktops/kde-4.13/kdegames/kshisen.nix   |   7 -
 pkgs/desktops/kde-4.13/kdegames/ksirk.nix     |   7 -
 .../desktops/kde-4.13/kdegames/ksnakeduel.nix |   7 -
 .../desktops/kde-4.13/kdegames/kspaceduel.nix |   7 -
 pkgs/desktops/kde-4.13/kdegames/ksquares.nix  |   7 -
 pkgs/desktops/kde-4.13/kdegames/ksudoku.nix   |   7 -
 .../desktops/kde-4.13/kdegames/ktuberling.nix |   7 -
 pkgs/desktops/kde-4.13/kdegames/kubrick.nix   |   7 -
 .../kde-4.13/kdegames/libkdegames.nix         |   7 -
 .../kde-4.13/kdegames/libkmahjongg.nix        |   7 -
 pkgs/desktops/kde-4.13/kdegames/lskat.nix     |   7 -
 pkgs/desktops/kde-4.13/kdegames/palapeli.nix  |  11 -
 pkgs/desktops/kde-4.13/kdegames/picmi.nix     |   7 -
 .../kde-4.13/kdegraphics/gwenview.nix         |  15 -
 pkgs/desktops/kde-4.13/kdegraphics/kamera.nix |  10 -
 .../kde-4.13/kdegraphics/kcolorchooser.nix    |  10 -
 .../kdegraphics/kdegraphics-mobipocket.nix    |  10 -
 .../kdegraphics-strigi-analyzer.nix           |  10 -
 .../kdegraphics/kdegraphics-thumbnailers.nix  |  13 -
 pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix |  10 -
 .../kde-4.13/kdegraphics/kolourpaint.nix      |  10 -
 pkgs/desktops/kde-4.13/kdegraphics/kruler.nix |  10 -
 .../kde-4.13/kdegraphics/ksaneplugin.nix      |  10 -
 .../kde-4.13/kdegraphics/ksnapshot.nix        |  10 -
 .../kde-4.13/kdegraphics/libkdcraw.nix        |  13 -
 .../kde-4.13/kdegraphics/libkexiv2.nix        |  10 -
 .../desktops/kde-4.13/kdegraphics/libkipi.nix |  10 -
 .../kde-4.13/kdegraphics/libksane.nix         |  10 -
 pkgs/desktops/kde-4.13/kdegraphics/okular.nix |  17 -
 .../desktops/kde-4.13/kdegraphics/svgpart.nix |  10 -
 .../kde-4.13/kdelibs/baloo-widgets.nix        |  11 -
 pkgs/desktops/kde-4.13/kdelibs/baloo.nix      |  15 -
 pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix    |  46 --
 .../kde-4.13/kdelibs/kfilemetadata.nix        |  12 -
 .../kde-4.13/kdelibs/nepomuk-core.nix         |  20 -
 .../kde-4.13/kdelibs/nepomuk-widgets.nix      |  11 -
 .../kde-4.13/kdemultimedia/audiocd-kio.nix    |   7 -
 .../kde-4.13/kdemultimedia/dragon.nix         |   7 -
 .../kde-4.13/kdemultimedia/ffmpegthumbs.nix   |   7 -
 pkgs/desktops/kde-4.13/kdemultimedia/juk.nix  |  10 -
 pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix |   7 -
 pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix |   7 -
 .../kde-4.13/kdemultimedia/libkcddb.nix       |   8 -
 .../kdemultimedia/libkcompactdisc.nix         |   7 -
 .../kde-4.13/kdemultimedia/mplayerthumbs.nix  |   7 -
 .../kdenetwork/kdenetwork-filesharing.nix     |   9 -
 .../kdenetwork-strigi-analyzers.nix           |   9 -
 pkgs/desktops/kde-4.13/kdenetwork/kget.nix    |  20 -
 pkgs/desktops/kde-4.13/kdenetwork/kopete.nix  |  26 -
 pkgs/desktops/kde-4.13/kdenetwork/kppp.nix    |   9 -
 pkgs/desktops/kde-4.13/kdenetwork/krdc.nix    |   9 -
 pkgs/desktops/kde-4.13/kdenetwork/krfb.nix    |   9 -
 .../kde-4.13/kdenetwork/zeroconf-ioslave.nix  |   9 -
 pkgs/desktops/kde-4.13/kdepim-runtime.nix     |  16 -
 pkgs/desktops/kde-4.13/kdepim.nix             |  28 -
 pkgs/desktops/kde-4.13/kdepimlibs.nix         |  19 -
 pkgs/desktops/kde-4.13/kdeplasma-addons.nix   |  23 -
 pkgs/desktops/kde-4.13/kdesdk/cervisia.nix    |   9 -
 .../kde-4.13/kdesdk/dolphin-plugins.nix       |  11 -
 .../desktops/kde-4.13/kdesdk/kapptemplate.nix |   9 -
 pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix |   9 -
 .../kde-4.13/kdesdk/kde-dev-scripts.nix       |   9 -
 .../kde-4.13/kdesdk/kde-dev-utils.nix         |  11 -
 .../kde-4.13/kdesdk/kdesdk-kioslaves.nix      |  12 -
 .../kdesdk/kdesdk-strigi-analyzers.nix        |   9 -
 .../kde-4.13/kdesdk/kdesdk-thumbnailers.nix   |  10 -
 pkgs/desktops/kde-4.13/kdesdk/kompare.nix     |   9 -
 .../kde-4.13/kdesdk/libkomparediff2.nix       |   9 -
 pkgs/desktops/kde-4.13/kdesdk/lokalize.nix    |  13 -
 pkgs/desktops/kde-4.13/kdesdk/okteta.nix      |  13 -
 pkgs/desktops/kde-4.13/kdesdk/poxml.nix       |   9 -
 pkgs/desktops/kde-4.13/kdesdk/umbrello.nix    |   9 -
 pkgs/desktops/kde-4.13/kdetoys/amor.nix       |   9 -
 pkgs/desktops/kde-4.13/kdetoys/kteatime.nix   |   9 -
 pkgs/desktops/kde-4.13/kdetoys/ktux.nix       |   9 -
 pkgs/desktops/kde-4.13/kdeutils/ark.nix       |  17 -
 pkgs/desktops/kde-4.13/kdeutils/filelight.nix |   9 -
 pkgs/desktops/kde-4.13/kdeutils/kcalc.nix     |   9 -
 .../kde-4.13/kdeutils/kcharselect.nix         |   9 -
 pkgs/desktops/kde-4.13/kdeutils/kdf.nix       |   9 -
 pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix   |   9 -
 pkgs/desktops/kde-4.13/kdeutils/kgpg.nix      |  10 -
 .../kde-4.13/kdeutils/kremotecontrol.nix      |   9 -
 pkgs/desktops/kde-4.13/kdeutils/ktimer.nix    |   9 -
 .../kde-4.13/kdeutils/kwalletmanager.nix      |   9 -
 .../kde-4.13/kdeutils/print-manager.nix       |  27 -
 .../kde-4.13/kdeutils/superkaramba.nix        |  11 -
 pkgs/desktops/kde-4.13/kdeutils/sweeper.nix   |   9 -
 .../kde-4.13/kdewebdev/kfilereplace.nix       |  10 -
 .../kde-4.13/kdewebdev/kimagemapeditor.nix    |  10 -
 .../kde-4.13/kdewebdev/klinkstatus.nix        |  13 -
 .../desktops/kde-4.13/kdewebdev/kommander.nix |   9 -
 pkgs/desktops/kde-4.13/l10n/default.nix       |  46 --
 pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh  |  33 -
 .../kde-4.13/l10n/manifest-4.13.2.nix         | 267 --------
 pkgs/desktops/kde-4.13/oxygen-icons.nix       |  15 -
 .../kde-4.13/support/akonadi/default.nix      |  25 -
 pkgs/top-level/all-packages.nix               |   9 +-
 196 files changed, 3 insertions(+), 3592 deletions(-)
 delete mode 100644 nixos/modules/services/x11/desktop-managers/kde4_next.nix
 delete mode 100644 pkgs/desktops/kde-4.13/applications/kate.nix
 delete mode 100644 pkgs/desktops/kde-4.13/applications/konsole.nix
 delete mode 100644 pkgs/desktops/kde-4.13/default.nix
 delete mode 100644 pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch
 delete mode 100644 pkgs/desktops/kde-4.13/files/polkit-install.patch
 delete mode 100644 pkgs/desktops/kde-4.13/kactivities.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kde-base-artwork.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kde-package/4.13.2.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kde-package/default.nix
 delete mode 100755 pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt
 delete mode 100644 pkgs/desktops/kde-4.13/kde-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kde-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kde-workspace.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeadmin/kcron.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeadmin/kuser.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/styles.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/perlqt.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/pykde4.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/qtruby.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokegen.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokekde.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/analitza.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/artikulate.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/blinken.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/cantor.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kanagram.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kbruch.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kgeography.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/khangman.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kig.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kiten.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/klettres.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kmplot.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kstars.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/ktouch.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kturtle.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/marble.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/pairs.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/parley.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/rocs.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeedu/step.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/bomber.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/bovo.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/granatier.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kajongg.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kapman.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/katomic.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kblackbox.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kblocks.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kbounce.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kbreakout.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kdiamond.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kfourinline.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kigo.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/killbots.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kiriki.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/klickety.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/klines.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kmines.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/knetwalk.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kolf.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kollision.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/konquest.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kpat.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kreversi.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kshisen.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/ksirk.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/ksquares.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/ksudoku.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/ktuberling.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/kubrick.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/libkdegames.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/lskat.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/palapeli.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegames/picmi.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kamera.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/kruler.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/libksane.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/okular.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdelibs/baloo.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/juk.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kget.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kopete.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/kppp.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/krdc.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/krfb.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdepim-runtime.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdepim.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdepimlibs.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/cervisia.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/kompare.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/lokalize.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/okteta.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/poxml.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdesdk/umbrello.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdetoys/amor.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdetoys/kteatime.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdetoys/ktux.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/ark.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/filelight.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/kdf.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/ktimer.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/print-manager.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdeutils/sweeper.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix
 delete mode 100644 pkgs/desktops/kde-4.13/kdewebdev/kommander.nix
 delete mode 100644 pkgs/desktops/kde-4.13/l10n/default.nix
 delete mode 100755 pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
 delete mode 100644 pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix
 delete mode 100644 pkgs/desktops/kde-4.13/oxygen-icons.nix
 delete mode 100644 pkgs/desktops/kde-4.13/support/akonadi/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 7ca3b3c8f7a..c62beca60d8 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -18,7 +18,7 @@ in
   # determines the default: later modules (if enabled) are preferred.
   # E.g., if KDE is enabled, it supersedes xterm.
   imports = [
-    ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix ./kde4_next.nix
+    ./none.nix ./xterm.nix ./xfce.nix ./kde4.nix
     ./e17.nix ./e18.nix ./gnome3.nix ./xbmc.nix
   ];
 
diff --git a/nixos/modules/services/x11/desktop-managers/kde4_next.nix b/nixos/modules/services/x11/desktop-managers/kde4_next.nix
deleted file mode 100644
index fc27c49e0de..00000000000
--- a/nixos/modules/services/x11/desktop-managers/kde4_next.nix
+++ /dev/null
@@ -1,163 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  xcfg = config.services.xserver;
-  cfg = xcfg.desktopManager.kde4_next;
-  xorg = pkgs.xorg;
-  kde = pkgs.kde4_next;
-
-  # Disable Nepomuk and Strigi by default.  As of KDE 4.7, they don't
-  # really work very well (e.g. searching files often fails to find
-  # files), segfault sometimes and consume significant resources.
-  # They can be re-enabled in the KDE System Settings under "Desktop
-  # Search".
-  nepomukConfig = pkgs.writeTextFile
-    { name = "nepomuk-config";
-      destination = "/share/config/nepomukserverrc";
-      text =
-        ''
-          [Basic Settings]
-          Start Nepomuk=false
-
-          [Service-nepomukstrigiservice]
-          autostart=false
-        '';
-    };
-
-  phononBackends = {
-    gstreamer = [
-      pkgs.phonon_backend_gstreamer
-      pkgs.gst_all.gstPluginsBase
-      pkgs.gst_all.gstPluginsGood
-      pkgs.gst_all.gstPluginsUgly
-      pkgs.gst_all.gstPluginsBad
-      pkgs.gst_all.gstFfmpeg # for mp3 playback
-      pkgs.gst_all.gstreamer # needed?
-    ];
-
-    vlc = [pkgs.phonon_backend_vlc];
-  };
-
-  phononBackendPackages = flip concatMap cfg.phononBackends
-    (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
-
-in
-
-{
-  options = {
-
-    services.xserver.desktopManager.kde4_next = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Enable the KDE 4 desktop environment.";
-      };
-
-      phononBackends = mkOption {
-        type = types.listOf types.str;
-        default = ["gstreamer"];
-        example = ["gstreamer" "vlc"];
-        description = "Which phonon multimedia backend kde should use";
-      };
-    };
-
-  };
-
-
-  config = mkIf (xcfg.enable && cfg.enable) {
-
-    # If KDE 4 is enabled, make it the default desktop manager (unless
-    # overridden by the user's configuration).
-    # !!! doesn't work yet ("Multiple definitions. Only one is allowed
-    # for this option.")
-    # services.xserver.desktopManager.default = mkOverride 900 "kde4_next";
-
-    services.xserver.desktopManager.session = singleton
-      { name = "kde4_next";
-        bgSupport = true;
-        start =
-          ''
-            # The KDE icon cache is supposed to update itself
-            # automatically, but it uses the timestamp on the icon
-            # theme directory as a trigger.  Since in Nix the
-            # timestamp is always the same, this doesn't work.  So as
-            # a workaround, nuke the icon cache on login.  This isn't
-            # perfect, since it may require logging out after
-            # installing new applications to update the cache.
-            # See http://lists-archives.com/kde-devel/26175-what-when-will-icon-cache-refresh.html
-            rm -fv $HOME/.kde/cache-*/icon-cache.kcache
-
-            # Qt writes a weird ‘libraryPath’ line to
-            # ~/.config/Trolltech.conf that causes the KDE plugin
-            # paths of previous KDE invocations to be searched.
-            # Obviously using mismatching KDE libraries is potentially
-            # disastrous, so here we nuke references to the Nix store
-            # in Trolltech.conf.  A better solution would be to stop
-            # Qt from doing this wackiness in the first place.
-            if [ -e $HOME/.config/Trolltech.conf ]; then
-                sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-            fi
-
-            # Start KDE.
-            exec ${kde.kdebase_workspace}/bin/startkde
-          '';
-      };
-
-    security.setuidOwners = singleton
-      { program = "kcheckpass";
-        source = "${kde.kdebase_workspace}/lib/kde4/libexec/kcheckpass";
-        owner = "root";
-        group = "root";
-        setuid = true;
-      };
-
-    environment.systemPackages =
-        [ kde.kdelibs
-
-          kde.kde_baseapps # Splitted kdebase
-          kde.kde_workspace
-          kde.kde_runtime
-          kde.konsole
-          kde.kate
-
-          kde.kde_wallpapers # contains kdm's default background
-          kde.oxygen_icons
-          pkgs.virtuoso # to enable Nepomuk to find Virtuoso
-
-          # Starts KDE's Polkit authentication agent.
-          kde.polkit_kde_agent
-
-          # Miscellaneous runtime dependencies.
-          kde.qt4 # needed for qdbus
-          pkgs.shared_mime_info
-          xorg.xmessage # so that startkde can show error messages
-          xorg.xset # used by startkde, non-essential
-          xorg.xauth # used by kdesu
-          pkgs.shared_desktop_ontologies # used by nepomuk
-          pkgs.strigi # used by nepomuk
-          pkgs.mysql # used by akonadi
-        ]
-       ++ lib.optional config.hardware.pulseaudio.enable kde.kmix  # Perhaps this should always be enabled
-       ++ lib.optional config.hardware.bluetooth.enable kde.bluedevil
-       ++ lib.optional config.networking.networkmanager.enable kde.networkmanagement
-      ++ [ nepomukConfig ] ++ phononBackendPackages;
-
-    environment.pathsToLink = [ "/share" ];
-
-    environment.etc = singleton
-      { source = "${pkgs.xkeyboard_config}/etc/X11/xkb";
-        target = "X11/xkb";
-      };
-
-    # Enable helpful DBus services.
-    services.udisks2.enable = true;
-    services.upower.enable = config.powerManagement.enable;
-
-    security.pam.services.kde = { allowNullPassword = true; };
-
-  };
-
-}
diff --git a/pkgs/desktops/kde-4.13/applications/kate.nix b/pkgs/desktops/kde-4.13/applications/kate.nix
deleted file mode 100644
index 63bfa12c4bb..00000000000
--- a/pkgs/desktops/kde-4.13/applications/kate.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}:
-
-kde {
-
-  buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/applications/konsole.nix b/pkgs/desktops/kde-4.13/applications/konsole.nix
deleted file mode 100644
index 0db47fb2d7c..00000000000
--- a/pkgs/desktops/kde-4.13/applications/konsole.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/default.nix b/pkgs/desktops/kde-4.13/default.nix
deleted file mode 100644
index 14861a8885f..00000000000
--- a/pkgs/desktops/kde-4.13/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.13.2" }:
-
-let
-  branch = "4.13";
-
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release branch ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # Doesn't work yet
-    kdeutils = [ "ksecrets" ];
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {};
-
-in
-
-kde.modules // kde.individual //
-{
-  inherit (kde) manifest modules individual splittedModuleList;
-
-  akonadi = callPackage ./support/akonadi { };
-
-  qt4 = qt48;
-
-  kdebase_workspace = kde.modules.kde_workspace;
-
-  inherit release;
-
-  full = stdenv.lib.attrValues kde.modules;
-
-  l10n = callPackage ./l10n {
-    inherit release branch;
-    inherit (kde.manifest) stable;
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch b/pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch
deleted file mode 100644
index 378cdb64694..00000000000
--- a/pkgs/desktops/kde-4.13/files/kde-wallpapers-buildsystem.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d3e247..f78db67 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,5 +1,10 @@
--find_package(KDE4 REQUIRED)
--include(KDE4Defaults)
-+project(kde-wallpapers NONE)
-+if( WALLPAPER_INSTALL_DIR )
-+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
-+else()
-+  find_package(KDE4 REQUIRED)
-+  include(KDE4Defaults)
-+endif()
- 
- install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
- 
diff --git a/pkgs/desktops/kde-4.13/files/polkit-install.patch b/pkgs/desktops/kde-4.13/files/polkit-install.patch
deleted file mode 100644
index d2ecac663ec..00000000000
--- a/pkgs/desktops/kde-4.13/files/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/kde-4.13/kactivities.nix b/pkgs/desktops/kde-4.13/kactivities.nix
deleted file mode 100644
index 06381bb13d7..00000000000
--- a/pkgs/desktops/kde-4.13/kactivities.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, nepomuk_core }:
-
-kde {
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "KDE activities library and daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kde-base-artwork.nix b/pkgs/desktops/kde-4.13/kde-base-artwork.nix
deleted file mode 100644
index 3f416cebddc..00000000000
--- a/pkgs/desktops/kde-4.13/kde-base-artwork.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Base artwork";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix
deleted file mode 100644
index c2a25664678..00000000000
--- a/pkgs/desktops/kde-4.13/kde-baseapps/kde-baseapps.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, htmlTidy, kactivities
-, nepomuk_core, nepomuk_widgets, libXt }:
-
-kde {
-  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kde-package/4.13.2.nix b/pkgs/desktops/kde-4.13/kde-package/4.13.2.nix
deleted file mode 100644
index de929376863..00000000000
--- a/pkgs/desktops/kde-4.13/kde-package/4.13.2.nix
+++ /dev/null
@@ -1,625 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="amor";value="0lrgvi8r2b4z3yp8xdjydf41gm84cxzr90flswb9a0vrsvshkkx1";}
-  {name="analitza";value="0gmhjhm366ddz0r8bapkbl62ghqnixiarqp3c12jg80fgl369raz";}
-  {name="ark";value="1x7bxcn8z863zir09dl0jrb863idz1g6m23va39ny7ks0cmj0vfc";}
-  {name="artikulate";value="04l1mz79zwkrsgawvn3rf7pg5qg4idfsz70g4hafxsl6d8p3lcip";}
-  {name="audiocd-kio";value="0f0gjxr4n6sgfq14vkylagipv6xpq9zb6z8scmf3h4kphcylcjah";}
-  {name="baloo";value="04zls6mxz0d8m9nmsrvd6ayld5610hwgcp0cxc5w87wkdqx3nd44";}
-  {name="baloo-widgets";value="1fl2rlrlx2ccmwqpl3knjjyca1dl1zzl8ifwaryklqm1yibg9yxq";}
-  {name="blinken";value="13p1c58gj477s9zr5hsxbd5nxfzaippx1qrlblzn2hf49an1gf9d";}
-  {name="bomber";value="090ii827nfnlx1bx9lnx74sid1b9crgw8jgwynywx3jw5dbqrih0";}
-  {name="bovo";value="1hys6lfp455kixlhzk0mf2x24p6b0n0i14fwid05anj3mzjycdwh";}
-  {name="cantor";value="1mdgrm1va8377c0hy5h4x1l5fvzb1wh2a3j2rbwfh2z1glwicpyw";}
-  {name="cervisia";value="1kig86y8lihxask4qlibrxc18w1dl0ljj93721ivwz1hl3ja1nwa";}
-  {name="dolphin-plugins";value="0rf450vn56fw3cmvr434crllc1fv0brb2cf5sk5q284pgmxg7jn2";}
-  {name="dragon";value="0b64bpyba85hfx6ai4m4zazilcj6sabphafnw87m51xa5bq8gz08";}
-  {name="ffmpegthumbs";value="1i3f15rfwizsaqqz0jn8ghpg55hx3zwxp049jaghgy9d4w2f0mbq";}
-  {name="filelight";value="1nrw06kpwyhvjicwikzg2b2pq5g2pwfv9s694wwigz58xp6mqqp1";}
-  {name="granatier";value="03zpgk8naidy044v2r5kimb5scmj0nvyw6w37nrb4sbqz2s0zjl6";}
-  {name="gwenview";value="090ij5yv6c8a6vf4q0fw2dskdbqd66anwk5p6c754kffzphy69k6";}
-  {name="jovie";value="1hppkv83i9qwpdd9j1bfqyjxqpjy318y1mk0fd2z5r00qxyfbr0f";}
-  {name="juk";value="1ifw1r3sbi9z265asm9gv8cs4sdc0l8w21fvbh8yish5m6riwxvx";}
-  {name="kaccessible";value="1w7m0cpxy9jl61bknx87g7i97lx2y28qljis4d7smpbvhyzk3sg6";}
-  {name="kactivities";value="11b3z1wkbykyv8frd9ssz1pb0qjczdnbn6zw2awhq0py94psrh62";}
-  {name="kajongg";value="1qf8y5d436cys9v2xcfr0zvl5gxml3gxjql3w7fdsa0bfa3czr2w";}
-  {name="kalgebra";value="19f91bb2a5l7hd0b0mcf690lgipdybdras1j2ggd775czijq10hc";}
-  {name="kalzium";value="0i0va37r73mcp9xk8jd203wxpky6bsswhgmi6w4qfz05ql0llyls";}
-  {name="kamera";value="1idazzg35a29kz6k1c5m5madkfyzp15vdkfcbjabc7gwj8dggn6c";}
-  {name="kanagram";value="1xm4cn9ypsqfrp1rqgl0bqzkp4vqjqwm1fr67lr64g4mwspp2m10";}
-  {name="kapman";value="053lrfvdryhyigrglqyxqbislwwc98n0hxrkxziakmw32k69lnlf";}
-  {name="kapptemplate";value="0b8dj3wildq80bxf8km19iahlz2cg5m5rdp0lz5shrz5b9sl7vg0";}
-  {name="kate";value="0pgxq0xlzbiag1w9am090bi30gq3gs2bxrdjpqwk4zwcllz94ym7";}
-  {name="katomic";value="10kcd0c586h96aggq7xg0h98bz65qf0dy1g0zk63z7jrqqmsaimr";}
-  {name="kblackbox";value="04m169inzbz19i120ybw3wlilsh6pdxfknhg2lxbm9gndjdyxghh";}
-  {name="kblocks";value="0vq1mxi05nb12a533fn940sz9mcpmz2qqzyspvdiijy1ff1h9ax9";}
-  {name="kbounce";value="0jhmbga21a9b6i2z52f0zgmxywq46sr5fy68hh9m1ka9khrrz6cx";}
-  {name="kbreakout";value="1vp1c3i3pwm1xysfm21c6dzxpxfiy44bwjqxhwskialir5q09c57";}
-  {name="kbruch";value="04q6pa60mrw58nk73is6fby03ppvafahhbmbq7kdzwa1k67hkrkd";}
-  {name="kcachegrind";value="0wrbr66lhpbxj064j1qx8lmks6s77j5w6qv3kpnx2mlzs48v424r";}
-  {name="kcalc";value="17psx2hwrpxx4w9wa70gy9y1b63cvc2yr9r3xm25nvx9x6mjak5p";}
-  {name="kcharselect";value="0b9cc2vjh1aslvj6a9pp4g2j65x5h915gnm3lz09p1bq1wnf3pn0";}
-  {name="kcolorchooser";value="1hr86adginxa1x15gkhf7y9210pl6gx4qnm4jz2vsggwi959i183";}
-  {name="kcron";value="1bzk3qs6mwl7djk98davwys1s8a8vsz8w8kfmmbql5mwzy3q0n6f";}
-  {name="kdeartwork";value="1qz9dlbx576vlbckdq9vyvyr4zlnbaxwgqlzagh5cqspmp1yq1jj";}
-  {name="kde-baseapps";value="0237i2d1nv3931af07bzf93sf4y500xdv079l97l21lbpavfacqa";}
-  {name="kde-base-artwork";value="1gv310n0ym5lb17mpfsb5679mh774rv4ahzk7x5vmlv53lh4zc4s";}
-  {name="kde-dev-scripts";value="1qbdw5kjks1l8aky1lpx2p14q3l5x45pk92xij259n2216ibq3qz";}
-  {name="kde-dev-utils";value="097i2lvanmdkws3id7f06m3brnixw43fqh6dhvxhz19xcdsckhzv";}
-  {name="kdegraphics-mobipocket";value="09c8d6jsy257hvr8s8qxpa3vrh70l2z1ykqfsdwgbic3nkqskg9j";}
-  {name="kdegraphics-strigi-analyzer";value="0xx2vjndsg2p1gawfd3azjax1045xqd95icif45v6x7cdjp4j47l";}
-  {name="kdegraphics-thumbnailers";value="0adqpj3gm959yvjvv3aas6b4zw4adk82sm91inp7rf88c44bjj2m";}
-  {name="kdelibs";value="03nsxwcxxpb861cd2dyl7hfbksxhk267xdjg384z23xq0b30k62m";}
-  {name="kdenetwork-filesharing";value="1v9n9jqk9dgnw73nizyqgjfk1h5sxw2rin39xraj1vpmw4pp6ylr";}
-  {name="kdenetwork-strigi-analyzers";value="1g1aap4pz8ifj4gxzfaw4bspnn8syd33l97hn1xn2vqqzim376c3";}
-  {name="kdepimlibs";value="1j5692msbnsp9xpm2gfqqkybck8pyagl86a6rdq7n2zp85jyy03a";}
-  {name="kdepim-runtime";value="19v729ijx42f86q0aw8rwv470hgrn0mnl8qa7ajrynswp0v820lx";}
-  {name="kdeplasma-addons";value="1bmp2wl8ya4mili8zv69hbpwasvda7r5b7z2i79rpfw4kcf7lgnv";}
-  {name="kde-runtime";value="11r06hkvkrlva7lhfdfd8p7b6q53fvjckixbsiavl259sdfl7hhy";}
-  {name="kdesdk-kioslaves";value="1iww0r61cmfpcs2v3jswh9c2ba54bbqnnwihnq9g2dlsy77138b1";}
-  {name="kdesdk-strigi-analyzers";value="0hm680sxgv7r51kyyhng00jnh6smki70cl7ms0gg07pyixhkjxqm";}
-  {name="kdesdk-thumbnailers";value="1zzhzpp6cmx6va1z2x2vq34wilh7sbinw0nqdhm4jra5qndx9j4h";}
-  {name="kde-wallpapers";value="0jsy9kdg6w241lf4zs693cgkc6mvlby9ligfqskf97529y4bjpkm";}
-  {name="kdewebdev";value="0vwx9vf59hmjypgzpmgdzxzxmkx758d5y69c101dmkjb52iadknp";}
-  {name="kde-workspace";value="11lfqfg646blm770xsblcvf48i126z956wv4yxqw9la39m21dlcr";}
-  {name="kdf";value="06dj0pqpk1h58zm5gncsddcss0b5n8wb6m1whsxp86al9xm1d5ck";}
-  {name="kdiamond";value="0z76p92zk548kimkzq5v7c145xwl5pzf69w48gkldgwi2amwhqc9";}
-  {name="kfilemetadata";value="1s2vs2lw9ml79ccl5vsik76ynk7nwqjsp8lm2xg91l8pn9laywgr";}
-  {name="kfloppy";value="1vnwi1rwgi1mrngdc69mm84159r933z54vdphcfyfjpngb5irk2n";}
-  {name="kfourinline";value="042n2jmps4z9l4w5vqixc2lx495839gfm58shdnzxxph5z29927v";}
-  {name="kgamma";value="0s5w37gr8c4cy0mv63x3qixkp7n2ayj4jmfnw25npxzd4phj21lz";}
-  {name="kgeography";value="0yv4bfk8fg0k9r2iiqhh52cfm4jpj5lpbhpq3ycngzi83mw71wv6";}
-  {name="kget";value="18mrvh22wfyz4k1jlvh8gd3szybixd1z8zzbd8dkykjis3yw1p5r";}
-  {name="kgoldrunner";value="17d6xmfjqkxyji7v2cv97gxrxp8a87vjw1yhz6blcg0vc6d9lq6j";}
-  {name="kgpg";value="0sngvdd8sfymi9wxivrzsgh3naf2hxv300a94pw1dalvvsrgxpxp";}
-  {name="khangman";value="0rbf3vz9ji0hyq9vj90pqpz0ch3bhqlqyj1030vbb0rvry2bb0h8";}
-  {name="kig";value="1y6kbq47zbhdm7v9x71nlzv0aa08nrm7g7g87ln0nbvxsn3v1xj3";}
-  {name="kigo";value="12awan4k2k6505i4bl3zyv4mr589q2m4grb4znh3d24qbgmk218l";}
-  {name="killbots";value="12wgnhiahgrzz5gxn77b0xqljdc22k4pw01fi3ixydx62a7a2402";}
-  {name="kimono";value="0dd3rjpwi7c1289i9vhcnmyqrhw0sx5dd6vmccyqb6krxw0iv3xr";}
-  {name="kiriki";value="1wr8za85qzaqsw7drlslvdqkmbbxhd4mlih6j862xk5rbfps1287";}
-  {name="kiten";value="1nppl5pqjbgmzshw1ahscb33lhfdmbid1ygdjjj5p9kdjx9p7yqn";}
-  {name="kjumpingcube";value="036j428grzcsphaq176c3ix8js59lss61m2nda7psk9jrkffyz22";}
-  {name="klettres";value="1pdldl7rxhbi4m98gb4an8k8z6djjamg7rwcl4pg0nj8k27idj3f";}
-  {name="klickety";value="02hghzi91raan0dqjskb4mann42pfz3c0frngdcnp23s616cqfg6";}
-  {name="klines";value="1z6v5nv6sq4kki9annpkb53bn8zcdcv3g70c7fddbiawq9kr0ai0";}
-  {name="kmag";value="1l1x1rprqf84wkiz09fyl1gvcx3bkk156mybh1gy7hdy114frgam";}
-  {name="kmahjongg";value="1wg09bdb5gaa28rdppafvvxc7h1gps3dv7ggy41pv9dm9fjw8zk2";}
-  {name="kmines";value="1ssw0vq0sxlp12wncnmcfdvglk45ds4hldinhdxbn9slfsc5vjg4";}
-  {name="kmix";value="13hdm8vg92mxm2v49x5r8r58614nbbd3ng0d6xj3h7v24g04h9db";}
-  {name="kmousetool";value="199f3wbf2yga1s0qjfnbmn1v80y2shsi4w5zhhrs8iscf8dzkyz0";}
-  {name="kmouth";value="13fshp58jk2bpk3z44krglr02bpl96s7ky2hz4lkghf0kgigh4wf";}
-  {name="kmplot";value="0syw06smr33ykjkgmf96iyfk7wmxbq6xvvfpasq0lyybjp9z62bv";}
-  {name="knavalbattle";value="171fgfc6g23nnzbmy1w1hm2v9780ihrw8cfz92xgars3ibfkjn6w";}
-  {name="knetwalk";value="0hi5bqg2dvrmkkcqiiylwvjmwdc22h76ndh5ym2d3kcmhmn3jmgp";}
-  {name="kolf";value="1y90lnci7bji47dkwa9p2b6fqj6k0qg53ng7hp430654xklv4k7m";}
-  {name="kollision";value="109a0zdv4mp7cd5qbf0yv0g0k6b698h2kssxndrmybaz5v2kj8kb";}
-  {name="kolourpaint";value="1ff6wzr28m6nlh1p6ggcxdjm03y8fsaffl929jkw9pqhhy2rhgd4";}
-  {name="kompare";value="03lgsfq1j6bxf31gaszxw65qxc9zcf021h6zd8wx5c6zmn72a4zz";}
-  {name="konquest";value="1zgs4hsff4wv5j49w327xjzsmya924iqwzygcxld9h4k4j78ypqc";}
-  {name="konsole";value="08sg90263916pihmp65s9lih3hjvbvk0sjybqqzxsbh310jwa12a";}
-  {name="kopete";value="1g4fcfq3g05hnbrm2fnsrxwiil2sj4jdr3szl96rsf2pgjy8wc84";}
-  {name="korundum";value="0chqsjc986dsm99zkm1ds9h292kpmnwd1hicmf1vg49zfchxkms4";}
-  {name="kpat";value="0visia7f6s6gs0kwspgkjg4lx0nm49glms2wqspsrli3bzjn415d";}
-  {name="kppp";value="1vmq3a83rb8rc54bf50jwk981mwr6i776wrbgmpq6pl7cpjmxnvm";}
-  {name="kqtquickcharts";value="0g0bn60j9bpfbxpy6fyfl504n5l1zafb3awkql9ld67h8946935p";}
-  {name="krdc";value="114bp80k1w01xv3y1kq38hdc7dnkhcgbiw89kpgn9wyscgrxd4kk";}
-  {name="kremotecontrol";value="1paxn1dd3fwagmiy7a772k4kdglvcszxw56lj3jqas3isdjhxm6a";}
-  {name="kreversi";value="0rsqpyaqw9blcl8hvbh4225xi3m7kmywc0i2m2hpv8ihqz30k2cb";}
-  {name="krfb";value="1qa6hvlwh55piw2hp4b5rpd8b7mp3wrlkh75p34l05fq55c60azw";}
-  {name="kross-interpreters";value="1j61fq2sl3lg4sy8vdm8spxcbv863icnx33y683ynrpcd8389jb4";}
-  {name="kruler";value="0b3hza24c11a6m12wi1am0wszi76405m5rpfna0pd94pl0mnp3ii";}
-  {name="ksaneplugin";value="0w16vxqanjs8faf8941wsz3bz8wg4pvk9h5ji78pf83kqnb0aj3g";}
-  {name="kscd";value="1k90wa4wndvyayms80ra0n93nmzcl5imgp0prx0kczfywvn9dm8l";}
-  {name="kshisen";value="1nbx9b2h06dr818zs7j1xq27ka8klgp4jpz55q2l2kqkgnyf5483";}
-  {name="ksirk";value="1z52hi8c0dgqs2zd8dmr11xf0ackg66w37d4qgz6iqfxhsb9j4mg";}
-  {name="ksnakeduel";value="108p8v3qirh6m8nbjrsnbxixmg3paar8853b69s54ssvwdl0in3c";}
-  {name="ksnapshot";value="0417qs7bb85vl3kp4saml27sl9yya1arzr8f2wlhkialwdlfxc5d";}
-  {name="kspaceduel";value="09mww9znxg4jzrfnvw3c2s3xjv6z5vflnmn61hdv1v9nqyxkxm6i";}
-  {name="ksquares";value="0zzap46yav1ddqd1nj8gmvmmrb3d6h4jvjzxn9793bbrrj001zq1";}
-  {name="kstars";value="1rfd5s366vzcs8zfa50rrmfp8xhqmm5gswsygxx2pr6xiny22g57";}
-  {name="ksudoku";value="0yfx3pwfzr8567h0zz0691wfv00444818cfr7qfy6s5p0520jaw4";}
-  {name="ksystemlog";value="0wc2cdyg4cj79lxzpxp73ag71w5z1wnpc4lfq8l9661hl0y1xwby";}
-  {name="kteatime";value="0587278b8wi5qk6gnqahw602nyaiflzbdpw7az4iwp0dy7s8ziiz";}
-  {name="ktimer";value="02i1lv916k1g0rgsfnx9qdzsk965l3p862g71zdfxnp8hsqxw3k8";}
-  {name="ktouch";value="06y1afrl7d67g4cw06k8kx63xa1bjdbsbg4v3fn6v8fgavkdkc70";}
-  {name="ktuberling";value="1z3gl2np2a03jfzhkcdakvibp0kihnqy9k6mfjwqpz5w0179sfyd";}
-  {name="kturtle";value="0a25y3cibxmdjyif4467a5yzsadpdciyaw99r47fpw8f1jdzz03f";}
-  {name="ktux";value="1sxggakp7vhkj0ygwnpangq4dyi1mykacdwyqlx08hj659w9ihdc";}
-  {name="kubrick";value="0ji5j9ai66fczx6mrfkjk2asnp5q5cq5qw5l75w0c0jnsfwg1qi4";}
-  {name="kuser";value="18lx93v9lka30gb16dk93svgq8rjgj0fa7la4w4b200zy01ci5ps";}
-  {name="kwalletmanager";value="1r55w4z2pa8b782b2apr0dy2lr7sw61z2vzzhjrip728sxd749ix";}
-  {name="kwordquiz";value="0afpd0gqprbs95lq4c68ybbdqsiz4n5b219156c5f1zv83lwn2l7";}
-  {name="libkcddb";value="1d56hnnfa8gwawfa0z0235b3ixjqcb96iybgcy2pdc2lh1ny9p74";}
-  {name="libkcompactdisc";value="1n470n7f16zb9zcrhfbhjsx7fhd8bi9zii6vk2rcmawwiw9x62ib";}
-  {name="libkdcraw";value="1n3g333px3vr61pmf158l57i1sqh26pbyzs20zvfzqyqhvbxmq02";}
-  {name="libkdeedu";value="1pyskpkaiz6ngya9adghq8xj835hgdjmjpkdc8dq3695k7fwdj4j";}
-  {name="libkdegames";value="0z1c2ybw3j97jx30yiq65lf72r0fllwsjl5mgclj9fp03m5225q6";}
-  {name="libkexiv2";value="0kgvx1a2qmsyagy10p4vypks557bivvajnggsaq2naya6kg8lwv6";}
-  {name="libkipi";value="05wflvasjmgglms4x2di5fs7lpx4wh3fqiqba376363r084drhdp";}
-  {name="libkmahjongg";value="1vkxcvhnhxhhq08pjr3r6wyckb8w2lpnhmkf4aiaspjspbvrfkgr";}
-  {name="libkomparediff2";value="0i7qxzpzsmxki8kk22z43jmm1z685lcsg03dzzsr6i49jbc59iid";}
-  {name="libksane";value="0wl20z4d84i3wb5h24nq92swirhyb4hiljrc7k6830g6i27lwm7m";}
-  {name="lokalize";value="1nw0jg4m2z3q6y7wrlv7lw7f0z2vwxd17zhmxy2cv5ckqlaj9rxg";}
-  {name="lskat";value="0qy04dgscazlxclqwipwla1cv27brjsp05lv1wbvpx0xg7m3cdsn";}
-  {name="marble";value="0h7jj3jfnyjkyw1882ak0275rr95j0qr65qkr6qjddy672q17xl5";}
-  {name="mplayerthumbs";value="1agr08ssdk50k73f7hyzh8j3j8l745qdwfa9brggv0hxmh6lk24k";}
-  {name="nepomuk-core";value="0z8mr47h1l1i5yzys39vfl7mylf9c72m1sakld633aryx4y94ch4";}
-  {name="nepomuk-widgets";value="1sblpfvpia6v28xanqh470hd7y24llqjbakr6xahz9wkb5bc837v";}
-  {name="okteta";value="1c50qa1v70j6wwc4d36v0dca1b88i18qky95vw1sd8cm2jmdc3ss";}
-  {name="okular";value="1k4wgkhz8kmixd2xdy1bmfz3qksniybmhwwwcbh1b8fzgw432ppw";}
-  {name="oxygen-icons";value="173hhnxxryl1fypgapgnni1yzh90sp8lsgdlyw7z35cqmppqvmbw";}
-  {name="pairs";value="1prg15q4jy83p5jxlpwrpa2fc6slqf9dw8jnznxbkdmm8f77dir3";}
-  {name="palapeli";value="1wzgik0wx3g6mdx8kmvjlmazw4i6rq8xlhqmnmz9vxcjpljz1vr3";}
-  {name="parley";value="1fd2wj9mb5if28qmd3a2ldd1vr0qkaky1r01vpyq82m6db035d7r";}
-  {name="perlkde";value="07qm9c06ff38l1bwbkxqrssnzz519wnzvglml4qs5b2kjlbzpjvi";}
-  {name="perlqt";value="0fynxqdkd7drxys96ifyd3nl21blbjrdr5fr9j7ws742lfgd32xc";}
-  {name="picmi";value="1v86rfc5clmccggyqdcv3k8amhr4hm1yds2v675pnj63gcg5qbnb";}
-  {name="poxml";value="1ihx6x1bhxywwy1gspbs85hr0lywnjrb33jj52sgcm6x8a2hg054";}
-  {name="print-manager";value="052m4a23nvafckq5zha3p6pbnilsrh5fwldf6i6jxwcaky7vjakv";}
-  {name="pykde4";value="06ip2al7ngpy0w20qd86ny7f2cdhjjqb99djk8p2rkkcm6gvl571";}
-  {name="qtruby";value="1r00k17x6g1x5cddvgvy450412kl63wwzc55dsa6ng6ywxk4qs7l";}
-  {name="qyoto";value="1f7rs1gnl5ircvnrgn6fjzhx383jyxiv53h3cjiqxg2mwf1iv2qn";}
-  {name="rocs";value="1af4np70xgzcfjzl8m18q5pn2zmjdm47p250f99gyrbmqmzamqfa";}
-  {name="smokegen";value="1grs9sysysv8n439ia52s25avx4ps74yw23gi8bjj8769f7hrjxj";}
-  {name="smokekde";value="1f3snr45charllv36cf24hy9c2wf58pfai7lv9kyc9xy1hyyfcbi";}
-  {name="smokeqt";value="01d4k0iqi50202d5c841vfv3518faalpgw6vzscbr32gprvffzj3";}
-  {name="step";value="0brpd13hjhvi9f7gra87d6chlizjvc4w9girlfxx26r70r2wf3mp";}
-  {name="superkaramba";value="1k14a8sy6vgi3h9jqfdmjsrkj5mi4rnqjnkb6p6j3yzi2ihni1mx";}
-  {name="svgpart";value="1g2j9advnvyxf0yv1yspycn33vsslq8yfxfa2y4nhn2qm10xsnyv";}
-  {name="sweeper";value="1dvw4gl18w9r07m3y2zqxvhlxspfal4zz9lhni1b4h3y0c021hz9";}
-  {name="umbrello";value="08g7j9frgp4956y0m3i0hsspw0c4j5kms03k1wlzj57vpgk3r1b0";}
-  {name="zeroconf-ioslave";value="0riyfnswq4gfjvd9fsfpc18sb3xxh36q1d9w50h7pyzsgdb7lisw";}
-];
-versions=builtins.listToAttrs[
-  {name="amor";value="4.13.2";}
-  {name="analitza";value="4.13.2";}
-  {name="ark";value="4.13.2";}
-  {name="artikulate";value="4.13.2";}
-  {name="audiocd-kio";value="4.13.2";}
-  {name="baloo";value="4.13.2";}
-  {name="baloo-widgets";value="4.13.2";}
-  {name="blinken";value="4.13.2";}
-  {name="bomber";value="4.13.2";}
-  {name="bovo";value="4.13.2";}
-  {name="cantor";value="4.13.2";}
-  {name="cervisia";value="4.13.2";}
-  {name="dolphin-plugins";value="4.13.2";}
-  {name="dragon";value="4.13.2";}
-  {name="ffmpegthumbs";value="4.13.2";}
-  {name="filelight";value="4.13.2";}
-  {name="granatier";value="4.13.2";}
-  {name="gwenview";value="4.13.2";}
-  {name="jovie";value="4.13.2";}
-  {name="juk";value="4.13.2";}
-  {name="kaccessible";value="4.13.2";}
-  {name="kactivities";value="4.13.2";}
-  {name="kajongg";value="4.13.2";}
-  {name="kalgebra";value="4.13.2";}
-  {name="kalzium";value="4.13.2";}
-  {name="kamera";value="4.13.2";}
-  {name="kanagram";value="4.13.2";}
-  {name="kapman";value="4.13.2";}
-  {name="kapptemplate";value="4.13.2";}
-  {name="kate";value="4.13.2";}
-  {name="katomic";value="4.13.2";}
-  {name="kblackbox";value="4.13.2";}
-  {name="kblocks";value="4.13.2";}
-  {name="kbounce";value="4.13.2";}
-  {name="kbreakout";value="4.13.2";}
-  {name="kbruch";value="4.13.2";}
-  {name="kcachegrind";value="4.13.2";}
-  {name="kcalc";value="4.13.2";}
-  {name="kcharselect";value="4.13.2";}
-  {name="kcolorchooser";value="4.13.2";}
-  {name="kcron";value="4.13.2";}
-  {name="kdeartwork";value="4.13.2";}
-  {name="kde-baseapps";value="4.13.2";}
-  {name="kde-base-artwork";value="4.13.2";}
-  {name="kde-dev-scripts";value="4.13.2";}
-  {name="kde-dev-utils";value="4.13.2";}
-  {name="kdegraphics-mobipocket";value="4.13.2";}
-  {name="kdegraphics-strigi-analyzer";value="4.13.2";}
-  {name="kdegraphics-thumbnailers";value="4.13.2";}
-  {name="kdelibs";value="4.13.2";}
-  {name="kdenetwork-filesharing";value="4.13.2";}
-  {name="kdenetwork-strigi-analyzers";value="4.13.2";}
-  {name="kdepimlibs";value="4.13.2";}
-  {name="kdepim-runtime";value="4.13.2";}
-  {name="kdeplasma-addons";value="4.13.2";}
-  {name="kde-runtime";value="4.13.2";}
-  {name="kdesdk-kioslaves";value="4.13.2";}
-  {name="kdesdk-strigi-analyzers";value="4.13.2";}
-  {name="kdesdk-thumbnailers";value="4.13.2";}
-  {name="kde-wallpapers";value="4.13.2";}
-  {name="kdewebdev";value="4.13.2";}
-  {name="kde-workspace";value="4.11.10";}
-  {name="kdf";value="4.13.2";}
-  {name="kdiamond";value="4.13.2";}
-  {name="kfilemetadata";value="4.13.2";}
-  {name="kfloppy";value="4.13.2";}
-  {name="kfourinline";value="4.13.2";}
-  {name="kgamma";value="4.13.2";}
-  {name="kgeography";value="4.13.2";}
-  {name="kget";value="4.13.2";}
-  {name="kgoldrunner";value="4.13.2";}
-  {name="kgpg";value="4.13.2";}
-  {name="khangman";value="4.13.2";}
-  {name="kig";value="4.13.2";}
-  {name="kigo";value="4.13.2";}
-  {name="killbots";value="4.13.2";}
-  {name="kimono";value="4.13.2";}
-  {name="kiriki";value="4.13.2";}
-  {name="kiten";value="4.13.2";}
-  {name="kjumpingcube";value="4.13.2";}
-  {name="klettres";value="4.13.2";}
-  {name="klickety";value="4.13.2";}
-  {name="klines";value="4.13.2";}
-  {name="kmag";value="4.13.2";}
-  {name="kmahjongg";value="4.13.2";}
-  {name="kmines";value="4.13.2";}
-  {name="kmix";value="4.13.2";}
-  {name="kmousetool";value="4.13.2";}
-  {name="kmouth";value="4.13.2";}
-  {name="kmplot";value="4.13.2";}
-  {name="knavalbattle";value="4.13.2";}
-  {name="knetwalk";value="4.13.2";}
-  {name="kolf";value="4.13.2";}
-  {name="kollision";value="4.13.2";}
-  {name="kolourpaint";value="4.13.2";}
-  {name="kompare";value="4.13.2";}
-  {name="konquest";value="4.13.2";}
-  {name="konsole";value="4.13.2";}
-  {name="kopete";value="4.13.2";}
-  {name="korundum";value="4.13.2";}
-  {name="kpat";value="4.13.2";}
-  {name="kppp";value="4.13.2";}
-  {name="kqtquickcharts";value="4.13.2";}
-  {name="krdc";value="4.13.2";}
-  {name="kremotecontrol";value="4.13.2";}
-  {name="kreversi";value="4.13.2";}
-  {name="krfb";value="4.13.2";}
-  {name="kross-interpreters";value="4.13.2";}
-  {name="kruler";value="4.13.2";}
-  {name="ksaneplugin";value="4.13.2";}
-  {name="kscd";value="4.13.2";}
-  {name="kshisen";value="4.13.2";}
-  {name="ksirk";value="4.13.2";}
-  {name="ksnakeduel";value="4.13.2";}
-  {name="ksnapshot";value="4.13.2";}
-  {name="kspaceduel";value="4.13.2";}
-  {name="ksquares";value="4.13.2";}
-  {name="kstars";value="4.13.2";}
-  {name="ksudoku";value="4.13.2";}
-  {name="ksystemlog";value="4.13.2";}
-  {name="kteatime";value="4.13.2";}
-  {name="ktimer";value="4.13.2";}
-  {name="ktouch";value="4.13.2";}
-  {name="ktuberling";value="4.13.2";}
-  {name="kturtle";value="4.13.2";}
-  {name="ktux";value="4.13.2";}
-  {name="kubrick";value="4.13.2";}
-  {name="kuser";value="4.13.2";}
-  {name="kwalletmanager";value="4.13.2";}
-  {name="kwordquiz";value="4.13.2";}
-  {name="libkcddb";value="4.13.2";}
-  {name="libkcompactdisc";value="4.13.2";}
-  {name="libkdcraw";value="4.13.2";}
-  {name="libkdeedu";value="4.13.2";}
-  {name="libkdegames";value="4.13.2";}
-  {name="libkexiv2";value="4.13.2";}
-  {name="libkipi";value="4.13.2";}
-  {name="libkmahjongg";value="4.13.2";}
-  {name="libkomparediff2";value="4.13.2";}
-  {name="libksane";value="4.13.2";}
-  {name="lokalize";value="4.13.2";}
-  {name="lskat";value="4.13.2";}
-  {name="marble";value="4.13.2";}
-  {name="mplayerthumbs";value="4.13.2";}
-  {name="nepomuk-core";value="4.13.2";}
-  {name="nepomuk-widgets";value="4.13.2";}
-  {name="okteta";value="4.13.2";}
-  {name="okular";value="4.13.2";}
-  {name="oxygen-icons";value="4.13.2";}
-  {name="pairs";value="4.13.2";}
-  {name="palapeli";value="4.13.2";}
-  {name="parley";value="4.13.2";}
-  {name="perlkde";value="4.13.2";}
-  {name="perlqt";value="4.13.2";}
-  {name="picmi";value="4.13.2";}
-  {name="poxml";value="4.13.2";}
-  {name="print-manager";value="4.13.2";}
-  {name="pykde4";value="4.13.2";}
-  {name="qtruby";value="4.13.2";}
-  {name="qyoto";value="4.13.2";}
-  {name="rocs";value="4.13.2";}
-  {name="smokegen";value="4.13.2";}
-  {name="smokekde";value="4.13.2";}
-  {name="smokeqt";value="4.13.2";}
-  {name="step";value="4.13.2";}
-  {name="superkaramba";value="4.13.2";}
-  {name="svgpart";value="4.13.2";}
-  {name="sweeper";value="4.13.2";}
-  {name="umbrello";value="4.13.2";}
-  {name="zeroconf-ioslave";value="4.13.2";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="audiocd-kio"; sane="audiocd_kio"; }
-    { name="dragon";  }
-    { name="ffmpegthumbs";  }
-    { name="juk";  }
-    { name="kmix";  }
-    { name="kscd";  }
-    { name="libkcddb";  }
-    { name="libkcompactdisc";  }
-    { name="mplayerthumbs";  }
-  ];
-}
-{
-  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="kdelibs";
-  split=true;
-  pkgs=[
-    { name="kdelibs";  }
-    { name="baloo";  }
-    { name="baloo-widgets"; sane="baloo_widgets"; }
-    { name="kfilemetadata";  }
-    { name="nepomuk-core"; sane="nepomuk_core"; }
-    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
-  ];
-}
-{
-  module="kdenetwork";
-  split=true;
-  pkgs=[
-    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
-    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
-    { name="kget";  }
-    { name="kopete";  }
-    { name="kppp";  }
-    { name="krdc";  }
-    { name="krfb";  }
-    { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; }
-  ];
-}
-{
-  module="kdeutils";
-  split=true;
-  pkgs=[
-    { name="ark";  }
-    { name="filelight";  }
-    { name="kcalc";  }
-    { name="kcharselect";  }
-    { name="kdf";  }
-    { name="kfloppy";  }
-    { name="kgpg";  }
-    { name="kremotecontrol";  }
-    { name="ktimer";  }
-    { name="kwalletmanager";  }
-    { name="print-manager"; sane="print_manager"; }
-    { name="superkaramba";  }
-    { name="sweeper";  }
-  ];
-}
-{
-  module="applications";
-  split=true;
-  pkgs=[
-    { name="kate";  }
-    { name="konsole";  }
-  ];
-}
-{
-  module="kdetoys";
-  split=true;
-  pkgs=[
-    { name="amor";  }
-    { name="kteatime";  }
-    { name="ktux";  }
-  ];
-}
-{
-  module="kdesdk";
-  split=true;
-  pkgs=[
-    { name="cervisia";  }
-    { name="dolphin-plugins"; sane="dolphin_plugins"; }
-    { name="kapptemplate";  }
-    { name="kcachegrind";  }
-    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
-    { name="kde-dev-utils"; sane="kde_dev_utils"; }
-    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
-    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
-    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
-    { name="kompare";  }
-    { name="libkomparediff2";  }
-    { name="lokalize";  }
-    { name="okteta";  }
-    { name="poxml";  }
-    { name="umbrello";  }
-  ];
-}
-{
-  module="kdegames";
-  split=true;
-  pkgs=[
-    { name="bomber";  }
-    { name="bovo";  }
-    { name="granatier";  }
-    { name="kajongg";  }
-    { name="kapman";  }
-    { name="katomic";  }
-    { name="kblackbox";  }
-    { name="kblocks";  }
-    { name="kbounce";  }
-    { name="kbreakout";  }
-    { name="kdiamond";  }
-    { name="kfourinline";  }
-    { name="kgoldrunner";  }
-    { name="kigo";  }
-    { name="killbots";  }
-    { name="kiriki";  }
-    { name="kjumpingcube";  }
-    { name="klickety";  }
-    { name="klines";  }
-    { name="kmahjongg";  }
-    { name="kmines";  }
-    { name="knavalbattle";  }
-    { name="knetwalk";  }
-    { name="kolf";  }
-    { name="kollision";  }
-    { name="konquest";  }
-    { name="kpat";  }
-    { name="kreversi";  }
-    { name="kshisen";  }
-    { name="ksirk";  }
-    { name="ksnakeduel";  }
-    { name="kspaceduel";  }
-    { name="ksquares";  }
-    { name="ksudoku";  }
-    { name="ktuberling";  }
-    { name="kubrick";  }
-    { name="libkdegames";  }
-    { name="libkmahjongg";  }
-    { name="lskat";  }
-    { name="palapeli";  }
-    { name="picmi";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="analitza";  }
-    { name="artikulate";  }
-    { 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="kqtquickcharts";  }
-    { name="kstars";  }
-    { name="ktouch";  }
-    { name="kturtle";  }
-    { name="kwordquiz";  }
-    { name="libkdeedu";  }
-    { name="marble";  }
-    { name="pairs";  }
-    { name="parley";  }
-    { name="rocs";  }
-    { name="step";  }
-  ];
-}
-{
-  module="kdeadmin";
-  split=true;
-  pkgs=[
-    { name="kcron";  }
-    { name="ksystemlog";  }
-    { name="kuser";  }
-  ];
-}
-{
-  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="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdeartwork";  split=false;
-  pkgs=[
-    { name="ColorSchemes"; }
-    { name="IconThemes"; }
-    { name="emoticons"; }
-    { name="kscreensaver"; }
-    { name="kwin-styles"; sane="kwin_styles";}
-    { name="styles"; }
-    { name="wallpapers"; }
-    { name="HighResolutionWallpapers"; }
-    { name="WeatherWallpapers"; }
-    { name="desktopthemes"; }
-  ];
-
-}
-{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
-{ module="kdelibs";  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="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.13/kde-package/default.nix b/pkgs/desktops/kde-4.13/kde-package/default.nix
deleted file mode 100644
index beb475889ad..00000000000
--- a/pkgs/desktops/kde-4.13/kde-package/default.nix
+++ /dev/null
@@ -1,131 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
-, release, branch, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: version: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${version}.tar.xz";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    inherit branch;
-    platforms = stdenv.lib.platforms.linux;
-    inherit (qt4.meta) maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name:
-    let n_ = name; v_ = getAttr name manifest.versions; in
-    a@{meta, name ? n_, version ? v_, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${version}";
-      src = kdesrc name version;
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; version_ = getAttr name manifest.versions; in
-    a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module version;
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = module.enableParallelBuilding or true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  modules = listToAttrs (map kdeModuleNV manifest.modules);
-
-  splittedModuleList =
-    let
-      splitted = filter (a: a ? pkgs) manifest.modules;
-      names = map ({module, sane ? module, ...}: sane) splitted;
-    in
-    map (m: m.projects) (stdenv.lib.attrVals names modules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}
diff --git a/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh b/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
deleted file mode 100755
index 1da7bc810c3..00000000000
--- a/pkgs/desktops/kde-4.13/kde-package/kde-manifest.sh
+++ /dev/null
@@ -1,173 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-
-if [[ -z $(type -p xsltproc) ]]; then
-  echo "Please provide libxslt" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.xz | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
-
-# Detect release number & whether it is a stable release
-if [[ $? -ne 0 || -z $release ]]; then
-  echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2
-  exit 1
-fi
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A version
-declare -A modules
-declare -a packages
-declare -a top_level
-
-if [[ ! -f ${dir}/kde_projects.xml ]]; then
-  if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then
-    echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2
-    exit 1
-  fi
-fi
-# xsltproc output declares -A module
-eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-unset module[kactivities]
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *.tar.xz`; do
-  package=${i%.tar.xz}
-  v=${package##*-}
-  package=${i%-*}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  version[$package]=$v
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_pkg_version() {
-  echo "  {name=\"${1}\";value=\"${version[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_versions(){
-  echo "versions=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_version "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  pkg=$(cd "$dir"; echo "$1"-*.tar.xz)
-  pkg="${pkg%.tar.xz}"
-  echo -n " split=false;"
-  cml="$pkg/CMakeLists.txt"
-  tar -xf "${dir}/$pkg.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
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir "$pkg"
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_versions
-print_modules
-echo "}"
diff --git a/pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt b/pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt
deleted file mode 100644
index 952a05a9d27..00000000000
--- a/pkgs/desktops/kde-4.13/kde-package/kde-submodules.xslt
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>
diff --git a/pkgs/desktops/kde-4.13/kde-runtime.nix b/pkgs/desktops/kde-4.13/kde-runtime.nix
deleted file mode 100644
index 1c9706f4f4b..00000000000
--- a/pkgs/desktops/kde-4.13/kde-runtime.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
-, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
-}:
-
-kde {
-  buildInputs = [
-    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba libcanberra pulseaudio gpgme
-    networkmanager kactivities kdepimlibs openexr
-#todo: add openslp
-#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-  passthru.propagatedUserEnvPackages = [ virtuoso ];
-
-  meta = {
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kde-wallpapers.nix b/pkgs/desktops/kde-4.13/kde-wallpapers.nix
deleted file mode 100644
index b74d38d433e..00000000000
--- a/pkgs/desktops/kde-4.13/kde-wallpapers.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
-
-  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1bhc4nrcwnlyhxff2h7v9aqvg2ipikzr5y2djfq2qnx8qk5cms37";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kde-workspace.nix b/pkgs/desktops/kde-4.13/kde-workspace.nix
deleted file mode 100644
index 0a8c960eeae..00000000000
--- a/pkgs/desktops/kde-4.13/kde-workspace.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
-, pciutils, libraw1394, libusb, python, libqalculate, akonadi
-, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
-, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
-}:
-
-kde {
-#todo: wayland, xmms, ckconnector
-  buildInputs =
-    [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg 
-      xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
-      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
-      xorg.libXdamage
-
-      python boost qjson lm_sensors gpsd libraw1394 pciutils udev
-      akonadi pam libusb libqalculate kdepimlibs  prison
-      kactivities
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  preConfigure =
-   ''
-     # Fix incorrect path to kde4-config.
-     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
-
-     # Fix the path to the keyboard configuration files.
-     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
-       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
-   '';
-
-  enableParallelBuilding = false; # frequent problems on Hydra
-
-  meta = {
-    description = "KDE workspace components such as Plasma, Kwin and System Settings";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix
deleted file mode 100644
index d38c80c4c36..00000000000
--- a/pkgs/desktops/kde-4.13/kdeaccessibility/jovie.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix
deleted file mode 100644
index 98fae7c983f..00000000000
--- a/pkgs/desktops/kde-4.13/kdeaccessibility/kaccessible.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix
deleted file mode 100644
index 606c61cddb6..00000000000
--- a/pkgs/desktops/kde-4.13/kdeaccessibility/kmag.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-#todo: package qaccessibilityclient
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix
deleted file mode 100644
index 8e0caa76ed9..00000000000
--- a/pkgs/desktops/kde-4.13/kdeaccessibility/kmousetool.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix b/pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix
deleted file mode 100644
index 4159501967c..00000000000
--- a/pkgs/desktops/kde-4.13/kdeaccessibility/kmouth.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeadmin/kcron.nix b/pkgs/desktops/kde-4.13/kdeadmin/kcron.nix
deleted file mode 100644
index f585461af38..00000000000
--- a/pkgs/desktops/kde-4.13/kdeadmin/kcron.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Configure and schedule tasks";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix b/pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix
deleted file mode 100644
index 88757a6b91c..00000000000
--- a/pkgs/desktops/kde-4.13/kdeadmin/ksystemlog.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "System log viewer tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeadmin/kuser.nix b/pkgs/desktops/kde-4.13/kdeadmin/kuser.nix
deleted file mode 100644
index 6118cf558bb..00000000000
--- a/pkgs/desktops/kde-4.13/kdeadmin/kuser.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "User management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix b/pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix
deleted file mode 100644
index acccf66976f..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/ColorSchemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake b/pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake
deleted file mode 100644
index 499ed75268e..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/FindXscreensaver.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-#Macro to find xscreensaver directory
-
-# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT XSCREENSAVER_FOUND)
-  FIND_PATH(XSCREENSAVER_DIR deco
-    HINTS
-      ${KDE4_INCLUDE_DIR}
-    PATHS
-      /usr
-      /usr/local
-      /opt/local
-      /usr/X11R6
-      /opt/kde
-      /opt/kde3
-      /usr/kde
-      /usr/local/kde
-      /usr/local/xscreensaver
-      /usr/openwin/lib/xscreensaver
-      /etc
-    PATH_SUFFIXES
-      lib${LIB_SUFFIX}/xscreensaver
-      lib${LIB_SUFFIX}/misc/xscreensaver
-      lib/xscreensaver
-      lib64/xscreensaver
-      lib/misc/xscreensaver
-      libexec/xscreensaver
-      bin/xscreensaver-hacks
-      hacks)
-  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
-
-  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
-    PATHS
-    ${KDE4_INCLUDE_DIR}
-    /usr/
-    /usr/local/
-    /opt/local/
-    /usr/X11R6/
-    /opt/kde/
-    /opt/kde3/
-    /usr/kde/
-    /usr/local/kde/
-    /usr/openwin/lib/xscreensaver/
-    /etc/
-    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
-  )
-  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-
-endif(NOT XSCREENSAVER_FOUND)
-
-#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
-#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
-
-# Need to fix hack
-if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-    set(XSCREENSAVER_FOUND TRUE)
-endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
-
-if (XSCREENSAVER_FOUND)
-  if (NOT Xscreensaver_FIND_QUIETLY)
-    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
-  endif (NOT Xscreensaver_FIND_QUIETLY)
-else (XSCREENSAVER_FOUND)
-  if (Xscreensaver_FIND_REQUIRED)
-    message(FATAL_ERROR "XScreenSaver not found")
-  endif (Xscreensaver_FIND_REQUIRED)
-endif (XSCREENSAVER_FOUND)
-
-
-MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix b/pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix
deleted file mode 100644
index edffca1562e..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/HighResolutionWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix b/pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix
deleted file mode 100644
index 43071e8bd14..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/IconThemes.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kdeartwork-icon-themes";
-
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE nuvola and mono icon themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix b/pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix
deleted file mode 100644
index 947e5e17ab0..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/WeatherWallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix b/pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix
deleted file mode 100644
index 93dd361af73..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/desktopthemes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix b/pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix
deleted file mode 100644
index 5ef9f78a719..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/emoticons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix b/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
deleted file mode 100644
index 6318232dd60..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/kscreensaver.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, xscreensaver, kde_workspace, eigen2, libkexiv2, libXt, pkgconfig }:
-
-kde {
-  buildInputs = [ kdelibs xscreensaver kde_workspace eigen2 libkexiv2 libXt ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-
-  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
-
-  meta = {
-    description = "KDE screensavers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix b/pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix
deleted file mode 100644
index b5d769b216d..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/kwin-styles.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/styles.nix b/pkgs/desktops/kde-4.13/kdeartwork/styles.nix
deleted file mode 100644
index 6a1306c3710..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/styles.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix b/pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix
deleted file mode 100644
index 7c9846fbf9e..00000000000
--- a/pkgs/desktops/kde-4.13/kdeartwork/wallpapers.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kdeartwork-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/perlqt.nix b/pkgs/desktops/kde-4.13/kdebindings/perlqt.nix
deleted file mode 100644
index 48eed141ce6..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/perlqt.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, cmake, smokeqt, perl }:
-
-kde {
-
-  # TODO: qscintilla2, qwt5
-
-  buildInputs = [ smokeqt perl ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Perl bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.13/kdebindings/pykde4.nix
deleted file mode 100644
index 64e196452e3..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/pykde4.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
-  polkit_qt_1, boost, lndir, pkgconfig }:
-
-let pydir = "lib/python${python.majorVersion}"; in
-
-kde {
-
-  # todo: polkit isn't found by the build system
-
-  buildInputs = [
-    python kdepimlibs shared_desktop_ontologies
-    boost polkit_qt_1
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  propagatedBuildInputs = [ pyqt4 sip ];
-
-  preConfigure =
-    ''
-      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
-      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
-      # needs to install a plugin.
-      mkdir -pv $out/${pydir}
-      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
-      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
-    '';
-
-  meta = {
-    description = "Python bindings for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch b/pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch
deleted file mode 100644
index bd95a0d8bd3..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/qtruby-install-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 33078b4..30aec0e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
-     return()
- endif (NOT COMPILE_RUBY)
- 
--SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
--SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
-+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
- 
- # compute an overall version number which can be compared at once
- MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
diff --git a/pkgs/desktops/kde-4.13/kdebindings/qtruby.nix b/pkgs/desktops/kde-4.13/kdebindings/qtruby.nix
deleted file mode 100644
index 03e9dc9a007..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/qtruby.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, cmake, smokeqt, ruby }:
-
-kde {
-
- # TODO: scintilla2, qwt5
-
-  buildInputs = [ smokeqt ruby ];
-
-  nativeBuildInputs = [ cmake ];
-
-  # The patch is not ready for upstream submmission.
-  # I should add an option() instead.
-  patches = [ ./qtruby-install-prefix.patch ];
-
-  cmakeFlags="-DRUBY_ROOT_DIR=${ruby}";
-
-  meta = {
-    description = "Ruby bindings for Qt library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch b/pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch
deleted file mode 100644
index f0811d335a7..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/smokegen-CMakeLists.txt-nix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
-@@ -36,6 +36,10 @@
- set (CMAKE_SKIP_BUILD_RPATH FALSE)
- set (CMAKE_SKIP_RPATH FALSE)
-
-+# add the automatically determined parts of the RPATH
-+# which point to directories outside the build tree to the install RPATH
-+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-+
- configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
-
- add_executable(smokegen ${generator_SRC})
\ No newline at end of file
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch b/pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch
deleted file mode 100644
index 53257e836e0..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/smokegen-nix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -urN smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in smokegen-4.10.5/cmake/SmokeConfig.cmake.in
---- smokegen-4.10.5.orig/cmake/SmokeConfig.cmake.in	2013-06-28 17:14:50.000000000 +0000
-+++ smokegen-4.10.5/cmake/SmokeConfig.cmake.in	2013-07-30 21:26:33.000000000 +0000
-@@ -80,8 +80,7 @@
- set(SMOKE_API_BIN "@SMOKE_API_BIN@")
- 
- find_library(SMOKE_BASE_LIBRARY smokebase 
--              PATHS "@SMOKE_LIBRARY_PREFIX@"
--              NO_DEFAULT_PATH)
-+              PATHS "@SMOKE_LIBRARY_PREFIX@")
- 
- if (NOT SMOKE_BASE_LIBRARY)
-     if (Smoke_FIND_REQUIRED)
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokegen.nix b/pkgs/desktops/kde-4.13/kdebindings/smokegen.nix
deleted file mode 100644
index a80574ff67a..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/smokegen.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, qt4, cmake }:
-
-kde {
-  buildInputs = [ qt4 ];
-  nativeBuildInputs = [ cmake ];
-
-  patches = [ ./smokegen-nix.patch ./smokegen-CMakeLists.txt-nix.patch ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokekde.nix b/pkgs/desktops/kde-4.13/kdebindings/smokekde.nix
deleted file mode 100644
index 4474c1d9731..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/smokekde.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, cmake, smokeqt, kdelibs, akonadi, kdepimlibs, okular
-, shared_desktop_ontologies, attica, pkgconfig }:
-
-kde {
-
-  # TODO: attica, akonadi and kdepimlibs are disabled due to smokegen crash
-  # okular is disabled because the code generated is broken
-  buildInputs = [
-    smokeqt kdelibs shared_desktop_ontologies
-  ];
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  LD_LIBRARY_PATH = "${smokeqt}/lib/";
-
-  meta = {
-    description = "SMOKE bindings for kdelibs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix b/pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix
deleted file mode 100644
index 72b267e43c5..00000000000
--- a/pkgs/desktops/kde-4.13/kdebindings/smokeqt.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, qt4, cmake, phonon, qimageblitz, smokegen }:
-
-kde {
-
-# TODO: Qwt5, QScintilla2
-
-  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
-  nativeBuildInputs = [ cmake ];
-  propagatedNativeBuildInputs = [ smokegen ];
-
-  meta = {
-    description = "C++ parser used to generate language bindings for Qt/KDE";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/analitza.nix b/pkgs/desktops/kde-4.13/kdeedu/analitza.nix
deleted file mode 100644
index 74c3a1ebb20..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/analitza.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, readline }:
-kde {
-  buildInputs = [ kdelibs readline ];
-
-  meta = {
-    description = "Library part of KAlgebra";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.13/kdeedu/artikulate.nix
deleted file mode 100644
index 3f418cc5920..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/artikulate.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, pkgconfig, qt_gstreamer }:
-kde {
-
-  buildInputs = [ kdelibs qt_gstreamer ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Pronunciation training";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/blinken.nix b/pkgs/desktops/kde-4.13/kdeedu/blinken.nix
deleted file mode 100644
index cdf9728833c..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/blinken.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/cantor.nix b/pkgs/desktops/kde-4.13/kdeedu/cantor.nix
deleted file mode 100644
index a8cd2e44957..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/cantor.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libspectre, analitza, R, pkgconfig, libqalculate, python }:
-kde {
-
-# TODO: R is not found
-
-  buildInputs = [ kdelibs libspectre analitza R libqalculate python ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Frontend to Mathematical Software";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix b/pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix
deleted file mode 100644
index 3675c3a225f..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kalgebra.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu, analitza }:
-kde {
-  buildInputs = [ kdelibs libkdeedu analitza ];
-
-  meta = {
-    description = "2D and 3D Graph Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix b/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
deleted file mode 100644
index 8cc4c0e388c..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kalzium.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, facile, ocaml, eigen2, openbabel, avogadro, pkgconfig }:
-kde {
-
-# TODO: chemical mime data
-
-  buildInputs = [ kdelibs facile ocaml eigen2 openbabel avogadro ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Periodic Table of Elements";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kanagram.nix b/pkgs/desktops/kde-4.13/kdeedu/kanagram.nix
deleted file mode 100644
index 8759c96d78c..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kanagram.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Letter Order Game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kbruch.nix b/pkgs/desktops/kde-4.13/kdeedu/kbruch.nix
deleted file mode 100644
index dc50f1e85a3..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kbruch.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Practice Fractions";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kgeography.nix b/pkgs/desktops/kde-4.13/kdeedu/kgeography.nix
deleted file mode 100644
index bd8d27c8d6e..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kgeography.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Geography Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/khangman.nix b/pkgs/desktops/kde-4.13/kdeedu/khangman.nix
deleted file mode 100644
index 997b50e906a..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/khangman.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE hangman game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kig.nix b/pkgs/desktops/kde-4.13/kdeedu/kig.nix
deleted file mode 100644
index 37906c32bcb..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kig.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, boost, python}:
-kde {
-  buildInputs = [ kdelibs boost python ];
-
-  cmakeFlags = "-DKIG_ENABLE_PYTHON_SCRIPTING=1";
-  meta = {
-    description = "KDE Interactive Geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kiten.nix b/pkgs/desktops/kde-4.13/kdeedu/kiten.nix
deleted file mode 100644
index 939b7a9f77a..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kiten.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Japanese Reference/Study Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/klettres.nix b/pkgs/desktops/kde-4.13/kdeedu/klettres.nix
deleted file mode 100644
index 7a0fa83078e..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/klettres.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kmplot.nix b/pkgs/desktops/kde-4.13/kdeedu/kmplot.nix
deleted file mode 100644
index fc7b0578c27..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kmplot.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE mathematical function plotter";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix b/pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix
deleted file mode 100644
index 04925c75e6f..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kqtquickcharts.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "KDE Qt Quick Charts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kstars.nix b/pkgs/desktops/kde-4.13/kdeedu/kstars.nix
deleted file mode 100644
index 6192fb3faf9..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kstars.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, eigen2, xplanet, indilib, pkgconfig }:
-
-kde {
-
-# TODO: wcslib, astrometry
-
-  buildInputs = [ kdelibs eigen2 xplanet indilib ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "A KDE graphical desktop planetarium";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/ktouch.nix b/pkgs/desktops/kde-4.13/kdeedu/ktouch.nix
deleted file mode 100644
index 9e606adde33..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/ktouch.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxkbfile }:
-
-kde {
-  buildInputs = [ kdelibs libxkbfile ];
-
-  meta = {
-    description = "Touch Typing Tutor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kturtle.nix b/pkgs/desktops/kde-4.13/kdeedu/kturtle.nix
deleted file mode 100644
index 1e1922b1410..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kturtle.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Educational Programming Environment";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix b/pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix
deleted file mode 100644
index 1b33ba2e469..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/kwordquiz.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu ];
-
-  meta = {
-    description = "Flash Card Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix b/pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix
deleted file mode 100644
index def6c85fefe..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/libkdeedu.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Libraries used by KDE Education applications";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/marble.nix b/pkgs/desktops/kde-4.13/kdeedu/marble.nix
deleted file mode 100644
index 2dc07d14a0d..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/marble.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-
-# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
-
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/pairs.nix b/pkgs/desktops/kde-4.13/kdeedu/pairs.nix
deleted file mode 100644
index 36c4aba9604..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/pairs.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A memory and pairs game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/parley.nix b/pkgs/desktops/kde-4.13/kdeedu/parley.nix
deleted file mode 100644
index f9f86dde150..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/parley.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkdeedu, attica }:
-
-kde {
-  buildInputs = [ kdelibs libkdeedu attica ];
-
-  meta = {
-    description = "Vocabulary Trainer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/rocs.nix b/pkgs/desktops/kde-4.13/kdeedu/rocs.nix
deleted file mode 100644
index ce30d11fda3..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/rocs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kde, kdelibs, boost, grantlee }:
-
-kde {
-  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) grantlee ];
-
-  NIX_CFLAGS_COMPILE = "-fexceptions";
-
-  meta = {
-    description = "A KDE graph theory viewer";
-    kde = {
-      name = "rocs";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeedu/step.nix b/pkgs/desktops/kde-4.13/kdeedu/step.nix
deleted file mode 100644
index 95e991e8481..00000000000
--- a/pkgs/desktops/kde-4.13/kdeedu/step.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, gsl, libqalculate, eigen2, pkgconfig }:
-
-kde {
-
-  buildInputs = [ kdelibs gsl libqalculate eigen2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/bomber.nix b/pkgs/desktops/kde-4.13/kdegames/bomber.nix
deleted file mode 100644
index 026227910f2..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/bomber.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player arcade game. The player is invading various cities in a plane that is decreasing in height";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/bovo.nix b/pkgs/desktops/kde-4.13/kdegames/bovo.nix
deleted file mode 100644
index b0e7d99c589..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/bovo.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Gomoku (from Japanese 五目並べ - lit. \"five points\") like game for two players, where the opponents alternate in placing their respective pictogram on the game board";
-  };
-
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/granatier.nix b/pkgs/desktops/kde-4.13/kdegames/granatier.nix
deleted file mode 100644
index 9f1ab005309..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/granatier.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a clone of the classic Bomberman game, inspired by the work of the Clanbomber clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kajongg.nix b/pkgs/desktops/kde-4.13/kdegames/kajongg.nix
deleted file mode 100644
index 9a6f5e83695..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kajongg.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkdegames, pythonPackages, sqlite,  pykde4 }:
-kde rec {
-
-  buildInputs = [ kdelibs libkdegames pythonPackages.python pythonPackages.wrapPython sqlite ] ++ pythonPath;
-
-  pythonPath = [ pythonPackages.twisted pykde4 ];
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "an ancient Chinese board game for 4 players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kapman.nix b/pkgs/desktops/kde-4.13/kdegames/kapman.nix
deleted file mode 100644
index f10e099da3c..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kapman.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a clone of the well known game Pac-Man";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/katomic.nix b/pkgs/desktops/kde-4.13/kdegames/katomic.nix
deleted file mode 100644
index a9936c04f0e..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/katomic.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a fun and educational puzzle game built around molecular geometry";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kblackbox.nix b/pkgs/desktops/kde-4.13/kdegames/kblackbox.nix
deleted file mode 100644
index 27eeff2f65b..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kblackbox.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game of hide and seek played on an grid of boxes, where the player shoots rays into the grid to deduce the positions of hidden objects";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kblocks.nix b/pkgs/desktops/kde-4.13/kdegames/kblocks.nix
deleted file mode 100644
index 98cf068de09..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kblocks.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a classic single player falling blocks puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kbounce.nix b/pkgs/desktops/kde-4.13/kdegames/kbounce.nix
deleted file mode 100644
index 77fa0db6352..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kbounce.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player arcade game with the elements of puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kbreakout.nix b/pkgs/desktops/kde-4.13/kdegames/kbreakout.nix
deleted file mode 100644
index 3a484d919bb..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kbreakout.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Breakout-like game. Its object is to destroy as many bricks as possible without losing the ball";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kdiamond.nix b/pkgs/desktops/kde-4.13/kdegames/kdiamond.nix
deleted file mode 100644
index 06dfcee5ac3..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kdiamond.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player puzzle game. The object of the game is to build lines of three similar diamonds";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kfourinline.nix b/pkgs/desktops/kde-4.13/kdegames/kfourinline.nix
deleted file mode 100644
index 11b8838e708..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kfourinline.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a board game for two players based on the Connect-Four game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix b/pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix
deleted file mode 100644
index 6217c47a806..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kgoldrunner.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an action game where the hero runs through a maze, climbs stairs, dig holes and dodges enemies in order to collect all the gold nuggets and escape to the next level";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kigo.nix b/pkgs/desktops/kde-4.13/kdegames/kigo.nix
deleted file mode 100644
index 32eee67cc1e..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kigo.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an open-source implementation of the popular Go game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/killbots.nix b/pkgs/desktops/kde-4.13/kdegames/killbots.nix
deleted file mode 100644
index d9c1472495e..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/killbots.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple game of evading killer robots";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kiriki.nix b/pkgs/desktops/kde-4.13/kdegames/kiriki.nix
deleted file mode 100644
index 72f7ab67501..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kiriki.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "an addictive and fun dice game, designed to be played by as many as six players";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix b/pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix
deleted file mode 100644
index a6d22cff51c..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kjumpingcube.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple dice driven tactical game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/klickety.nix b/pkgs/desktops/kde-4.13/kdegames/klickety.nix
deleted file mode 100644
index b592bc40641..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/klickety.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a puzzle game where the player removes groups of colored marbles to clear the board";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/klines.nix b/pkgs/desktops/kde-4.13/kdegames/klines.nix
deleted file mode 100644
index 90952fe91c0..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/klines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple but highly addictive one player game. The player has to move the colored balls around the game board, gathering them into the lines of the same color by five";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix b/pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix
deleted file mode 100644
index 946b531ff12..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "the tiles are scrambled and staked on top of each other to resemble a certain shape. The player is then expected to remove all the tiles off the game board by locating each tile's matching pair";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kmines.nix b/pkgs/desktops/kde-4.13/kdegames/kmines.nix
deleted file mode 100644
index 538454e9598..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kmines.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a classic Minesweeper game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix b/pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix
deleted file mode 100644
index 42ffd2fcb4d..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/knavalbattle.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a Battle Ship game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/knetwalk.nix b/pkgs/desktops/kde-4.13/kdegames/knetwalk.nix
deleted file mode 100644
index a16e578ce84..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/knetwalk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a small game where you have to build up a computer network by rotating the wires to connect the terminals to the server";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kolf.nix b/pkgs/desktops/kde-4.13/kdegames/kolf.nix
deleted file mode 100644
index 78815ee5799..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kolf.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a miniature golf game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kollision.nix b/pkgs/desktops/kde-4.13/kdegames/kollision.nix
deleted file mode 100644
index 3147c7305ea..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kollision.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple ball dodging game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/konquest.nix b/pkgs/desktops/kde-4.13/kdegames/konquest.nix
deleted file mode 100644
index 53ddd64928c..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/konquest.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "the KDE version of Gnu-Lactic Konquest";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kpat.nix b/pkgs/desktops/kde-4.13/kdegames/kpat.nix
deleted file mode 100644
index f8d9bad36dc..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kpat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a relaxing card sorting game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kreversi.nix b/pkgs/desktops/kde-4.13/kdegames/kreversi.nix
deleted file mode 100644
index 2aed981428e..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kreversi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple one player strategy game played against the computer. If a player's piece is captured by an opposing player, that piece is turned over to reveal the color of that player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kshisen.nix b/pkgs/desktops/kde-4.13/kdegames/kshisen.nix
deleted file mode 100644
index 9c888034038..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kshisen.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, libkmahjongg }:
-kde {
-  buildInputs = [ kdelibs libkdegames libkmahjongg ];
-  meta = {
-    description = "a solitaire-like game played using the standard set of Mahjong tiles";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksirk.nix b/pkgs/desktops/kde-4.13/kdegames/ksirk.nix
deleted file mode 100644
index 767eb67971a..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/ksirk.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames, qca2 }:
-kde {
-  buildInputs = [ kdelibs libkdegames qca2 ];
-  meta = {
-    description = "a computerized version of the well known strategic board game Risk";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix b/pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix
deleted file mode 100644
index ccf1fb551e9..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/ksnakeduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple Tron-Clone";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix b/pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix
deleted file mode 100644
index 5285f7916ca..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kspaceduel.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "each of two possible players control a satellite spaceship orbiting the sun. As the game progresses players have to eliminate the opponent's spacecraft with bullets or mines";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksquares.nix b/pkgs/desktops/kde-4.13/kdegames/ksquares.nix
deleted file mode 100644
index a17be2da632..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/ksquares.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game modeled after the well known pen and paper based game of Dots and Boxes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ksudoku.nix b/pkgs/desktops/kde-4.13/kdegames/ksudoku.nix
deleted file mode 100644
index ea4e13a5e4f..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/ksudoku.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a logic-based symbol placement puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/ktuberling.nix b/pkgs/desktops/kde-4.13/kdegames/ktuberling.nix
deleted file mode 100644
index 1a6ba9d653c..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/ktuberling.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a simple constructor game suitable for children and adults alike";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/kubrick.nix b/pkgs/desktops/kde-4.13/kdegames/kubrick.nix
deleted file mode 100644
index 9bdc6879db4..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/kubrick.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a game based on the Rubik's Cube™ puzzle";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/libkdegames.nix b/pkgs/desktops/kde-4.13/kdegames/libkdegames.nix
deleted file mode 100644
index 3819dcdc9ae..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/libkdegames.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, openal, libsndfile }:
-kde {
-  buildInputs = [ kdelibs openal libsndfile ];
-  meta = {
-    description = "KDE games library";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix b/pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix
deleted file mode 100644
index 383b347dc33..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/libkmahjongg.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a library for KMahjongg game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/lskat.nix b/pkgs/desktops/kde-4.13/kdegames/lskat.nix
deleted file mode 100644
index 2a5050cd667..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/lskat.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a fun and engaging card game for two players, where the second player is either live opponent, or a built in artificial intelligence";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/palapeli.nix b/pkgs/desktops/kde-4.13/kdegames/palapeli.nix
deleted file mode 100644
index 010dbd5d623..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/palapeli.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-
-# TODO: package qvoronoi
-
-  buildInputs = [ kdelibs libkdegames ];
-
-  meta = {
-    description = "a single-player jigsaw puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegames/picmi.nix b/pkgs/desktops/kde-4.13/kdegames/picmi.nix
deleted file mode 100644
index 165d7422f95..00000000000
--- a/pkgs/desktops/kde-4.13/kdegames/picmi.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkdegames }:
-kde {
-  buildInputs = [ kdelibs libkdegames ];
-  meta = {
-    description = "a single player logic-based puzzle game";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix b/pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix
deleted file mode 100644
index b6fd701ac12..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/gwenview.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, kdelibs, exiv2, kde_baseapps, libkipi, nepomuk_core
-, libjpeg, pkgconfig, kactivities, lcms2 }:
-
-kde {
-
-  buildInputs =
-    [ kdelibs exiv2 nepomuk_core kactivities kde_baseapps libkipi libjpeg lcms2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kamera.nix b/pkgs/desktops/kde-4.13/kdegraphics/kamera.nix
deleted file mode 100644
index 70904b17c23..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kamera.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libgphoto2 }:
-
-kde {
-  buildInputs = [ kdelibs libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix b/pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix
deleted file mode 100644
index 58528cb186b..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kcolorchooser.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A small utility to select a color";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix
deleted file mode 100644
index 2c2ba3796a2..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-mobipocket.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, okular }:
-
-kde {
-  buildInputs = [ kdelibs okular ];
-
-  meta = {
-    description = "A collection of plugins to handle mobipocket files";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix
deleted file mode 100644
index 35af39aa611..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-strigi-analyzer.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libtiff }:
-
-kde {
-  buildInputs = [ kdelibs libtiff ];
-
-  meta = {
-    description = "Strigi analyzers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix
deleted file mode 100644
index 18c6534eb5c..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libkexiv2, libkdcraw, pkgconfig }:
-
-kde {
-
-  buildInputs = [ kdelibs libkexiv2 libkdcraw ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Thumbnailers for various graphics file formats";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix b/pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix
deleted file mode 100644
index 28d9252187e..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kgamma.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libXxf86vm }:
-
-kde {
-  buildInputs = [ kdelibs libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix b/pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix
deleted file mode 100644
index 5276ec09f46..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kolourpaint.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, qimageblitz }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz ];
-
-  meta = {
-    description = "KDE paint program";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/kruler.nix b/pkgs/desktops/kde-4.13/kdegraphics/kruler.nix
deleted file mode 100644
index c5c2c6e05d7..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/kruler.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix b/pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix
deleted file mode 100644
index 1381ed7dd26..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/ksaneplugin.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libksane }:
-
-kde {
-  buildInputs = [ kdelibs libksane ];
-
-  meta = {
-    description = "A KScan plugin that implements the scanning through libksane";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix b/pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix
deleted file mode 100644
index f01a609e20d..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/ksnapshot.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, libkipi }:
-
-kde {
-  buildInputs = [ kdelibs libkipi ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix b/pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix
deleted file mode 100644
index e7c01f98a8c..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/libkdcraw.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, pkgconfig, libraw, lcms2 }:
-
-kde {
-
-  buildInputs = [ kdelibs libraw lcms2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix b/pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix
deleted file mode 100644
index 096b0a6e957..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/libkexiv2.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix b/pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix
deleted file mode 100644
index 6b16265e7a3..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/libkipi.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Interface library to kipi-plugins";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/libksane.nix b/pkgs/desktops/kde-4.13/kdegraphics/libksane.nix
deleted file mode 100644
index b539eab3899..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/libksane.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, saneBackends }:
-
-kde {
-  buildInputs = [ kdelibs saneBackends ];
-
-  meta = {
-    description = "An image scanning library that provides a QWidget that contains all the logic needed to interface a sacanner";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/okular.nix b/pkgs/desktops/kde-4.13/kdegraphics/okular.nix
deleted file mode 100644
index aca1691eace..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/okular.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, popplerQt4, qca2
-, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
-
-kde {
-
-# TODO: package activeapp, qmobipocket
-
-  buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre popplerQt4
-                  qca2 qimageblitz libtiff kactivities libkexiv2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix b/pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix
deleted file mode 100644
index a344cc4b4b4..00000000000
--- a/pkgs/desktops/kde-4.13/kdegraphics/svgpart.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix b/pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix
deleted file mode 100644
index b71c7bd1b6e..00000000000
--- a/pkgs/desktops/kde-4.13/kdelibs/baloo-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, baloo, kfilemetadata }:
-
-kde {
-
-  buildInputs = [ kdelibs baloo kfilemetadata ];
-
-  meta = {
-    description = "Baloo Widgets";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/baloo.nix b/pkgs/desktops/kde-4.13/kdelibs/baloo.nix
deleted file mode 100644
index ef627e38607..00000000000
--- a/pkgs/desktops/kde-4.13/kdelibs/baloo.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, pkgconfig, kdepimlibs, xapian, kfilemetadata, boost, akonadi, qjson }:
-
-kde {
-
-  buildInputs = [
-    kdepimlibs xapian kfilemetadata boost akonadi qjson
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Baloo file searcher";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix
deleted file mode 100644
index 396adf9ba75..00000000000
--- a/pkgs/desktops/kde-4.13/kdelibs/kdelibs.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ kde, gcc, cmake, perl
-, qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi
-, openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver
-, automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee
-, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst
-, udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt
-, pkgconfig
-}:
-
-kde {
-
-# TODO: media-player-info
-
-  buildInputs =
-    [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq
-      libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt
-      shared_desktop_ontologies xz udev libjpeg kerberos openexr
-      libXtst attr
-    ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
-
-  propagatedNativeBuildInputs = [ automoc4 cmake perl shared_mime_info ];
-
-  # TODO: make sonnet plugins (dictionaries) really work.
-  # There are a few hardcoded paths.
-  # Split plugins from libs?
-
-  patches = [ ../files/polkit-install.patch ];
-
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    "-DHUPNP_ENABLED=ON"
-    "-DWITH_SOLID_UDISKS2=ON"
-  ];
-
-  passthru.wantsUdisks2 = true;
-
-  meta = {
-    description = "KDE libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix b/pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix
deleted file mode 100644
index f8420a33a45..00000000000
--- a/pkgs/desktops/kde-4.13/kdelibs/kfilemetadata.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, ffmpeg, popplerQt4, exiv2, taglib }:
-
-kde {
-
-  # todo: qmobipocket, epub
-  buildInputs = [ kdelibs ffmpeg popplerQt4 exiv2 taglib ];
-
-  meta = {
-    description = "KDE file metadata something";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix b/pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix
deleted file mode 100644
index 7e29eebf3b7..00000000000
--- a/pkgs/desktops/kde-4.13/kdelibs/nepomuk-core.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, soprano, shared_desktop_ontologies, exiv2, ffmpeg, taglib, popplerQt4
-, pkgconfig, doxygen, ebook_tools
-}:
-
-kde {
-
-# TODO: qmobipocket
-
-  buildInputs = [
-    kdelibs soprano shared_desktop_ontologies taglib exiv2 ffmpeg
-    popplerQt4 ebook_tools
-  ];
-
-  nativeBuildInputs = [ pkgconfig doxygen ];
-
-  meta = {
-    description = "NEPOMUK core";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix b/pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix
deleted file mode 100644
index 0d29a4f97de..00000000000
--- a/pkgs/desktops/kde-4.13/kdelibs/nepomuk-widgets.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, nepomuk_core }:
-
-kde {
-
-  buildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "NEPOMUK Widgets";
-    license = "GPLv2";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix b/pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix
deleted file mode 100644
index 4c56e7529dd..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/audiocd-kio.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libkcompactdisc, cdparanoia, libkcddb, libvorbis, flac, lame }:
-kde {
-  buildInputs = [ kdelibs libkcompactdisc cdparanoia libkcddb libvorbis flac lame ];
-  meta = {
-    description = "transparent audio CD access for applications using the KDE Platform";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix b/pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix
deleted file mode 100644
index 006300742ec..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/dragon.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a multimedia player with the focus on simplicity";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix b/pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix
deleted file mode 100644
index 45f6c9abcb6..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/ffmpegthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, ffmpeg }:
-kde {
-  buildInputs = [ kdelibs ffmpeg ];
-  meta = {
-    description = "a video thumbnail generator for KDE file managers like Dolphin and Konqueror";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/juk.nix b/pkgs/desktops/kde-4.13/kdemultimedia/juk.nix
deleted file mode 100644
index 5d7b1db224e..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/juk.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, taglib, libtunepimp }:
-kde {
-
-# TODO: opusfile
-
-  buildInputs = [ kdelibs taglib libtunepimp ];
-  meta = {
-    description = "an audio jukebox application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix b/pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix
deleted file mode 100644
index 1dd8108166f..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/kmix.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libcanberra, pulseaudio }:
-kde {
-  buildInputs = [ kdelibs libcanberra pulseaudio ];
-  meta = {
-    description = "sound mixer, an application to allow you to change the volume of your sound card";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix b/pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix
deleted file mode 100644
index e99ae53935b..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/kscd.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs, libmusicbrainz }:
-kde {
-  buildInputs = [ kdelibs libmusicbrainz ];
-  meta = {
-    description = "KDE CD player";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix b/pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix
deleted file mode 100644
index 720b01d1861..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/libkcddb.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-#todo: libmusicbrainz5
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a library used to retrieve audio CD meta data from the internet";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix b/pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix
deleted file mode 100644
index 6ed08af89f3..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/libkcompactdisc.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "KDE library for playing & ripping CDs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix b/pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix
deleted file mode 100644
index c88ebcc2a5a..00000000000
--- a/pkgs/desktops/kde-4.13/kdemultimedia/mplayerthumbs.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "a video thumbnail generator for KDE";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix b/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix
deleted file mode 100644
index 0330511a258..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-filesharing.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE properties dialog plugin to share a directory with the local network";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix b/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix
deleted file mode 100644
index e838d84fc5e..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/kdenetwork-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, boost }:
-
-kde {
-  buildInputs = [ kdelibs boost ];
-
-  meta = {
-    description = "Strigi analyzers for various network protocols";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kget.nix b/pkgs/desktops/kde-4.13/kdenetwork/kget.nix
deleted file mode 100644
index f986da2de21..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/kget.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kde, kdelibs, libktorrent, kde_workspace, sqlite, boost
-, kde_baseapps, libmms, qca2, nepomuk_core, nepomuk_widgets
-, pkgconfig }:
-
-kde {
-
-# TODO: QGpgME
-
-  buildInputs =
-    [ kdelibs libktorrent nepomuk_core nepomuk_widgets sqlite qca2
-      libmms kde_baseapps kde_workspace boost ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  meta = {
-    description = "KDE download manager";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kopete.nix b/pkgs/desktops/kde-4.13/kdenetwork/kopete.nix
deleted file mode 100644
index 7d8aec21ce6..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/kopete.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ kde, kdelibs, libmsn, libotr, kdepimlibs, qimageblitz, libktorrent,
-  jasper, libidn, mediastreamer, pkgconfig, libxslt, giflib,
-  libgadu, boost, qca2, sqlite, jsoncpp,
-  ortp, srtp, libv4l }:
-
-kde {
-
-# TODO: libmeanwhile, xmms, jsoncpp(not found), kleopatra(from kdepim but doesn't install headers?),
-
-  buildInputs = [
-    kdelibs qca2 mediastreamer libgadu jsoncpp
-    kdepimlibs qimageblitz sqlite jasper libotr libmsn giflib
-    libidn libxslt boost
-    ortp srtp libv4l
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  KDEDIRS = libktorrent;
-
-  cmakeFlags = [ "-DBUILD_skypebuttons=TRUE" ];
-
-  meta = {
-    description = "A KDE multi-protocol IM client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/kppp.nix b/pkgs/desktops/kde-4.13/kdenetwork/kppp.nix
deleted file mode 100644
index 4c6bd65769f..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/kppp.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "PPP(Dial-Up) client tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/krdc.nix b/pkgs/desktops/kde-4.13/kdenetwork/krdc.nix
deleted file mode 100644
index 80557e827fe..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/krdc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libvncserver, freerdp, telepathy_qt }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver freerdp telepathy_qt ];
-
-  meta = {
-    description = "KDE remote desktop client";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/krfb.nix b/pkgs/desktops/kde-4.13/kdenetwork/krfb.nix
deleted file mode 100644
index cb4857965a3..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/krfb.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libvncserver, libXdamage, libXtst, libjpeg, telepathy_qt }:
-
-kde {
-  buildInputs = [ kdelibs libvncserver libXdamage libXtst libjpeg telepathy_qt ];
-
-  meta = {
-    description = "KDE desktop sharing";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix b/pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix
deleted file mode 100644
index f65960cc337..00000000000
--- a/pkgs/desktops/kde-4.13/kdenetwork/zeroconf-ioslave.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE tool that monitors the network for DNS-SD services";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdepim-runtime.nix b/pkgs/desktops/kde-4.13/kdepim-runtime.nix
deleted file mode 100644
index d92e2254820..00000000000
--- a/pkgs/desktops/kde-4.13/kdepim-runtime.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kde, libxslt, boost, kdepimlibs, akonadi, shared_desktop_ontologies }:
-
-kde {
-
-# TODO: libkgapi(2), LibKFbAPI,libkolab, libkolabxml
-
-  buildInputs = [
-    kdepimlibs akonadi boost shared_desktop_ontologies
-    libxslt
-  ];
-
-  meta = {
-    description = "KDE PIM runtime";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdepim.nix b/pkgs/desktops/kde-4.13/kdepim.nix
deleted file mode 100644
index 4f364648d23..00000000000
--- a/pkgs/desktops/kde-4.13/kdepim.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ kde, boost, gpgme, libassuan, libxslt, kdepimlibs, kdepim_runtime
-, akonadi, shared_desktop_ontologies, cyrus_sasl, grantlee, prison
-, nepomuk_widgets, kactivities, libXScrnSaver, qjson
-, pkgconfig }:
-
-kde {
-
-# TODO: LinkGrammar
-
-  buildInputs =
-    [ kdepimlibs boost shared_desktop_ontologies akonadi nepomuk_widgets
-      libxslt cyrus_sasl gpgme libassuan grantlee prison kactivities
-      libXScrnSaver qjson
-    ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  passthru.propagatedUserEnvPackages = [ akonadi kdepimlibs kdepim_runtime ];
-
-  meta = {
-    description = "KDE PIM tools";
-    longDescription = ''
-      Contains various personal information management tools for KDE, such as an organizer.
-    '';
-    license = "GPL";
-    homepage = http://pim.kde.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdepimlibs.nix b/pkgs/desktops/kde-4.13/kdepimlibs.nix
deleted file mode 100644
index ca0af9400b1..00000000000
--- a/pkgs/desktops/kde-4.13/kdepimlibs.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
-, kdelibs, akonadi, libxslt, nepomuk_core
-, shared_desktop_ontologies, qjson }:
-
-kde {
-  nativeBuildInputs = [ pkgconfig ];
-
-  buildInputs =
-    [ boost gpgme libical libxslt qjson prison
-      openldap cyrus_sasl akonadi shared_desktop_ontologies
-    ];
-
-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeplasma-addons.nix b/pkgs/desktops/kde-4.13/kdeplasma-addons.nix
deleted file mode 100644
index 1c7a71a5c64..00000000000
--- a/pkgs/desktops/kde-4.13/kdeplasma-addons.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kde, kdelibs, marble, shared_desktop_ontologies, pkgconfig
-, boost, eigen2, kde_workspace, attica, qca2, qimageblitz
-, kdepimlibs, libkexiv2, libqalculate, libXtst, libdbusmenu_qt
-, qjson, qoauth, ibus }:
-
-kde {
-
-# TODO: qwt, scim
-
-  KDEDIRS=marble;
-
-  buildInputs = [ kdelibs boost kde_workspace kdepimlibs attica qjson qoauth
-                  eigen2 qca2 libXtst qimageblitz libqalculate ibus
-                  shared_desktop_ontologies marble libkexiv2 libdbusmenu_qt
-  ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "KDE Plasma Addons";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/cervisia.nix b/pkgs/desktops/kde-4.13/kdesdk/cervisia.nix
deleted file mode 100644
index 1dabe46cd42..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/cervisia.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE CVS frontend";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix b/pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix
deleted file mode 100644
index ad8132a850e..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/dolphin-plugins.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  # Needs kdebase for libkonq
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Svn, mercurial, git and bazaar plugins for dolphin";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix b/pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix
deleted file mode 100644
index 391536248dd..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kapptemplate.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A KDE 4 project template generator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix b/pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix
deleted file mode 100644
index 65d410cca48..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kcachegrind.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Frontend for Callgrind/Cachegrind";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix b/pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix
deleted file mode 100644
index df81145e5d6..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kde-dev-scripts.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Various scripts to ease KDE development";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix b/pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix
deleted file mode 100644
index 215c0a3c613..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kde-dev-utils.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, gcc, libtool }:
-
-kde {
-  buildInputs = [ kdelibs libtool ];
-
-  preConfigure = "export CMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH:${gcc}:${gcc.gcc}";
-
-  meta = {
-    description = "various KDE development utilities";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix
deleted file mode 100644
index 98bbce35a97..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-kioslaves.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kde, kdelibs, subversionClient, apr, aprutil,perl }:
-
-kde {
-
-  buildInputs = [ kdelibs subversionClient apr aprutil perl ];
-
-  cmakeFlags = [ "-DBUILD_perldoc=ON" ];
-
-  meta = {
-    description = "Subversion and perldoc kioslaves";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix
deleted file mode 100644
index 4d579b88ba8..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-strigi-analyzers.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Strigi analyzers for diff, po and ts";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix b/pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix
deleted file mode 100644
index d707fe9038f..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kdesdk-thumbnailers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, gettext }:
-
-kde {
-
-  buildInputs = [ kdelibs gettext ];
-
-  meta = {
-    description = "PO file format thumbnailer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/kompare.nix b/pkgs/desktops/kde-4.13/kdesdk/kompare.nix
deleted file mode 100644
index 644c7c48dc9..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/kompare.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libkomparediff2 }:
-
-kde {
-  buildInputs = [ kdelibs libkomparediff2 ];
-
-  meta = {
-    description = "A program to view the differences between files and optionally generate a diff";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix b/pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix
deleted file mode 100644
index 5933682c70a..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/libkomparediff2.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A library to compare files and strings";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/lokalize.nix b/pkgs/desktops/kde-4.13/kdesdk/lokalize.nix
deleted file mode 100644
index 1565426eb1f..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/lokalize.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, hunspell }:
-
-kde {
-  buildInputs = [ kdelibs hunspell ];
-
-  meta = {
-    description = "KDE 4 Computer-aided translation system";
-    longDescription = ''
-      Computer-aided translation system.
-      Do not translate what had already been translated.
-    '';
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/okteta.nix b/pkgs/desktops/kde-4.13/kdesdk/okteta.nix
deleted file mode 100644
index 058636596ad..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/okteta.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, qca2 }:
-
-kde {
-  buildInputs = [ kdelibs qca2 ];
-
-# TODO: Look what does -DBUILD_mobile add
-
-  enableParallelBuilding = false;
-
-  meta = {
-    description = "KDE byte editor";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/poxml.nix b/pkgs/desktops/kde-4.13/kdesdk/poxml.nix
deleted file mode 100644
index 6e46c3e3ab4..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/poxml.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, antlr, gettext }:
-
-kde {
-  buildInputs = [ kdelibs antlr gettext ];
-
-  meta = {
-    description = "Po<->xml tools";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdesdk/umbrello.nix b/pkgs/desktops/kde-4.13/kdesdk/umbrello.nix
deleted file mode 100644
index e83a2d9a901..00000000000
--- a/pkgs/desktops/kde-4.13/kdesdk/umbrello.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, boost }:
-
-kde {
-  buildInputs = [ kdelibs libxml2 libxslt boost ];
-
-  meta = {
-    description = "Umbrello UML modeller";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdetoys/amor.nix b/pkgs/desktops/kde-4.13/kdetoys/amor.nix
deleted file mode 100644
index 936d63d544a..00000000000
--- a/pkgs/desktops/kde-4.13/kdetoys/amor.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE creature for your desktop";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdetoys/kteatime.nix b/pkgs/desktops/kde-4.13/kdetoys/kteatime.nix
deleted file mode 100644
index dacf54def4b..00000000000
--- a/pkgs/desktops/kde-4.13/kdetoys/kteatime.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE utility for making a fine cup of tea";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdetoys/ktux.nix b/pkgs/desktops/kde-4.13/kdetoys/ktux.nix
deleted file mode 100644
index 108f9be7c72..00000000000
--- a/pkgs/desktops/kde-4.13/kdetoys/ktux.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Tux Screen Saver";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/ark.nix b/pkgs/desktops/kde-4.13/kdeutils/ark.nix
deleted file mode 100644
index 99844b909fd..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/ark.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ makeWrapper, kde, kdelibs, libarchive, bzip2, kde_baseapps, lzma, qjson
-, unzip }:
-
-kde {
-  buildInputs = [
-    makeWrapper kdelibs kde_baseapps libarchive bzip2 lzma qjson
-  ];
-
-  postInstall = ''
-    wrapProgram $out/bin/ark \
-      --prefix PATH ":" "${unzip}/bin"
-  '';
-
-  meta = {
-    description = "KDE Archiving Tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/filelight.nix b/pkgs/desktops/kde-4.13/kdeutils/filelight.nix
deleted file mode 100644
index 25ecabed27c..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/filelight.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Tool to visualise file and directory sizes";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kcalc.nix b/pkgs/desktops/kde-4.13/kdeutils/kcalc.nix
deleted file mode 100644
index 08b202e8f0e..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/kcalc.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, gmp }:
-
-kde {
-  buildInputs = [ kdelibs gmp ];
-
-  meta = {
-    description = "KDE Calculator";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix b/pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix
deleted file mode 100644
index d4c9c06f483..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/kcharselect.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE character selection utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kdf.nix b/pkgs/desktops/kde-4.13/kdeutils/kdf.nix
deleted file mode 100644
index 3f9da58d0a6..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/kdf.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE free disk space utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix b/pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix
deleted file mode 100644
index 2434a4fa671..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/kfloppy.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Floppy disk formatting utility";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kgpg.nix b/pkgs/desktops/kde-4.13/kdeutils/kgpg.nix
deleted file mode 100644
index 3ff1a286ae5..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/kgpg.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs, kdepimlibs, boost }:
-
-kde {
-
-  buildInputs = [ kdelibs kdepimlibs boost ];
-
-  meta = {
-    description = "Simple KDE GUI for GPG";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix b/pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix
deleted file mode 100644
index 70311a789f9..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/kremotecontrol.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst }:
-
-kde {
-  buildInputs = [ kdelibs libXtst ];
-
-  meta = {
-    description = "KDE remote control";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/ktimer.nix b/pkgs/desktops/kde-4.13/kdeutils/ktimer.nix
deleted file mode 100644
index 5700977349e..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/ktimer.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Timer";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix b/pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix
deleted file mode 100644
index 9ec0e6c0396..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/kwalletmanager.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Wallet (password storage) management tool";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/print-manager.nix b/pkgs/desktops/kde-4.13/kdeutils/print-manager.nix
deleted file mode 100644
index ae72becd1e4..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/print-manager.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ kde, kdelibs
-, pythonPackages, cups, pyqt4, pykde4, pycups, system_config_printer }:
-
-let s_c_p = system_config_printer.override { withGUI = false; }; in
-
-kde rec {
-  buildInputs = [ kdelibs pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath = [ cups pyqt4 pykde4 pycups s_c_p ];
-
-  passthru.propagatedUserEnvPackages = [ s_c_p ];
-
-  postInstall =
-    ''
-      wrapPythonPrograms
-
-      # "system-config-printer" supplies some D-Bus policy that we need.
-      mkdir -p $out/nix-support
-      echo ${s_c_p} > $out/nix-support/propagated-user-env-packages
-    '';
-
-  meta = {
-    description = "KDE printer manager";
-    longDescription = "Applet to view current print jobs and configure new printers";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix b/pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix
deleted file mode 100644
index cbe7a285606..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/superkaramba.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kde, kdelibs, qimageblitz, python }:
-
-kde {
-  buildInputs = [ kdelibs qimageblitz python ];
-
-  cmakeFlags = [ "-DBUILD_icons=TRUE" "-DBUILD_plasma=TRUE" ];
-
-  meta = {
-    description = "A KDE Eye-candy Application";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdeutils/sweeper.nix b/pkgs/desktops/kde-4.13/kdeutils/sweeper.nix
deleted file mode 100644
index 78d56c7df30..00000000000
--- a/pkgs/desktops/kde-4.13/kdeutils/sweeper.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Helps clean unwanted traces the user leaves on the system";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix b/pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix
deleted file mode 100644
index 55e37809e07..00000000000
--- a/pkgs/desktops/kde-4.13/kdewebdev/kfilereplace.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Batch search and replace tool";
-    homepage = http://www.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix b/pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix
deleted file mode 100644
index 6d22f72461f..00000000000
--- a/pkgs/desktops/kde-4.13/kdewebdev/kimagemapeditor.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "An HTML imagemap editor";
-    homepage = http://www.nongnu.org/kimagemap/;
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix
deleted file mode 100644
index 918512e2b2d..00000000000
--- a/pkgs/desktops/kde-4.13/kdewebdev/klinkstatus.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }:
-
-kde {
-
-# todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old
-
-  buildInputs = [ kdelibs kdepimlibs htmlTidy boost ];
-
-  meta = {
-    description = "A KDE link checker";
-    homepage = http://klinkstatus.kdewebdev.org;
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/kdewebdev/kommander.nix b/pkgs/desktops/kde-4.13/kdewebdev/kommander.nix
deleted file mode 100644
index d5f4337f714..00000000000
--- a/pkgs/desktops/kde-4.13/kdewebdev/kommander.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A graphical editor of scripted dialogs";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/l10n/default.nix b/pkgs/desktops/kde-4.13/l10n/default.nix
deleted file mode 100644
index fa6406043b1..00000000000
--- a/pkgs/desktops/kde-4.13/l10n/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, kdelibs, gettext, release, branch, stable }:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      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.xz";
-        name = "${name}.tar.xz";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      cmakeFlags = "-Wno-dev";
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        inherit branch;
-        license = "GPL";
-        platforms = stdenv.lib.platforms.linux;
-        inherit (kdelibs.meta) maintainers homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease
diff --git a/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh b/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
deleted file mode 100755
index 5eb97638bf4..00000000000
--- a/pkgs/desktops/kde-4.13/l10n/l10n-manifest.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-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.xz`; do
-  lang=${i%-${release}.tar.xz}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  nix-store --add-fixed sha256 "${dir}/${i}" >&2
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"
diff --git a/pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix b/pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix
deleted file mode 100644
index c3cab65fbb0..00000000000
--- a/pkgs/desktops/kde-4.13/l10n/manifest-4.13.2.nix
+++ /dev/null
@@ -1,267 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "0hlaflf11h5j7lgklxvvmdjdd2bj6hdb65iszdlprz8i9y4xckaq";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "11r7m5c3qpsqgy92y0g3gkrvdzjp0bdpn4pb2ypqbcvqr2s10iz4";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "08j09rc0jhx8z4a5640902sbq1b4j2nj7054w9nlf20gbd2162qj";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "0bjwq3b0n4phyjxw5my40d77vqdff307smf5arsmnxdykk03wvyg";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "19acbawjl1qpvavw381n9b5vd0if4vs3xrnwcdn3cafd518s4agl";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0vy6vx8kj2lwr4rf5m6y1b4p47m6yrizsrp9zrjryh73w122w8lj";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1vqk5g78ngzl5c1clha05vjzl91j7gn2d6f2lgz0l2vim2abms56";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "0jyarxxkg67mbyd62c0c1vkhg0g3px01bsirmjaf8s3qb0vadpx8";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "05ksirpq0np9nzlnknfk92ab7hnvc2izbxxa92ccraq493v58sjw";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "1qzyp08rv73ij0kcyvwp592hi83v407adyhkd4xihygwxdq9kk0k";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "04qnv32wargq7nn12kzz0gvh5i64h6rnmcly3rn15nr02rvjhkp1";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "0v1i163g7wjy4n3w3y85dgnivd25zn2p6zrk7h6ksynqqv2lcvyj";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "1l6rv8pbg0wcvxfgpw13lkwk3h3b0skxj7fp6629ln977nm80jf9";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "1hrj2rif8pbfjj5cq50b6prgd4dy3z5wqibqpa9m7nfvqvhzd6lw";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "0w5pcbv3kdssrd3dybcp3grjlwl5sglyshf1427ydd3690n3cz42";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0249lkc52vs0hfjg8x86sjn3zk42m8c8zi14y90vjd1w1aikscwl";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "1h7m4wsh6b80gmn2miyjz84r5ydph8dnfj3kg3gvj0i365w4grd0";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "17acm31gskf5psrsg6vbnpkznsz82c0k0k68gi986c9n4hwi39r3";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "13swbmzav0ffvq231dxbgjjyscybwlmwhs70hxs2zlrvjiq2jka4";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1ycc0sbic9b2sa50f70qhvb02q7hi41drrhkksacbc9963hplzpg";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1qsr5l6bfrid7dk30m720f6nc3yaa5z69f77w1133x344nig532s";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1hcpk2nzljcd3z0dni05w0ykjsij5pnzmlmh8b6gpkn1w2pbd6xy";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "0iazqsc72q2hdggfimwqzk1m071ygvmhvx5bskqyyd7z34mc60s7";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "0rjcpw5s94x51fz7qnscy2d826rcr0df3gs8n05y8f7ajqzzrkjh";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1vyf5kq2ki3j44qqslav0arahbpadl0a0d7611zm2b60qh6d57wn";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "0l4n45lx85if8v5yq2j854lmymv9aibichpdc7ilsw8z54rgr942";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "1c1cb1x1kgzalmfmk2pv9x0as50grq6lpms8m55baaxymvm9k6d2";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "14gmnb4im6dhcqhr4ira3zmy0asgv1l1k4nqfrw1skkg4j94bvn6";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "0n5z9w86g1davyldpbl5xxp9n4zbfyl73fsr8y57xf19p9f6h0v4";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "1m79bh4z2hxzacbfbbddsyx6cwsqjj9b74in8cr5sqg41si8sd6c";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0nzbn4qvkgk4b10xq1i10cjvkard1qp37a0vlzw9b0sbphd21zsr";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "0jncd61c0z72v1m4j6kps2bm19d59hdczvdlnk4yw13v0s83404p";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "1fyhg5qj6z2vdbk7wrsr1sspgj01wk3rsv708xb640klmsxi86wp";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "1gzcbk4kdcwrwnhl5fs43hv0gi5v7ajd8yhzk87s6ri58qf1sgxs";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "1rn5c3v2p68ai6x03li7k48lygqykdxpmwm2cpnggp4l67f1nwqp";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "11n4kpfw0hf72m5h4aiv3pi0b6v4h0m0czziqsv3caxvg2fsawg0";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "0nhpiqww84sc2mxqghk9dsxyqff2p3a1ipd6g495a2qrj6iyl448";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "0wpjmz0k7rxh6b9dxgkay2n7nzlp95vlrkwszshmpgksp52j2m3v";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "06l2am1hfk2bbbwggvig062nllf0kn67fzwq5lrrqcbj3c7pigic";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "07i449awjcz40wna2016zamkgiq09b74j037y4557p9czws756nb";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "1mdz7j3scbi0b75dxx3zyvnf3c9qqs975y7xijk2xscybk3dbcpl";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1dhb2f8f5ypz74xf6vjzsmg3mp95plisf7nr7kcia1q62xm2cpsl";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "0cqcf4b3550yal9ldhyhdhwig9qj73q1hhgbh9656xzadx1z0i3q";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1jkw8yzigbdvhv03s9j7xfnwiy22xf3hdk7hrsnp8q571692v5ik";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0py22ysfrv54bipjdilcw719hvsksxirri6j810gvwi53pici5mn";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "118yfgqjp6q7q5kfn961bx8daqv02bp2q1fhdfksyh7d6zl5g1xr";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "1yy9j7rlcjsms7yh3iif9yr2vx2m4i8z7p42p9k86403vzsim674";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "00295fxgahhsssdprhv06jnrdc9759bfazs1fdzmfz274zbc590b";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "1j2phacx2lsax8ibsbpp13ixykcrxbnj5r2l2w141hzccl6afjw6";
-}
-{
-  lang = "vi";
-  saneName = "vi";
-  sha256 = "0han6vsrcabr6yzll39jqpkms1sfxjabyppb7vvb5safakdpp2fd";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "09235scll21ic4rv13wrcy8wlibnipmxmhmdipk3d4sl5h5ygdli";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "1afdx9b62hbkg1lg6lpmwjkmypz92jdlhch82010xkyfzv5m17gd";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "1pf6jjxgw62lzj9i38l4bzb4lip9cwlyy1vz9pbnznj5ic8whz3g";
-}
-]
diff --git a/pkgs/desktops/kde-4.13/oxygen-icons.nix b/pkgs/desktops/kde-4.13/oxygen-icons.nix
deleted file mode 100644
index f8b638d3f46..00000000000
--- a/pkgs/desktops/kde-4.13/oxygen-icons.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kde, cmake }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0lgpy1x844wq7dgd61v15byh5nnbqhfih5ps8bypa7hm7spkfi9l";
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "KDE Oxygen theme icons";
-    longDescription = "Icons for KDE's default theme";
-    license = "GPL";
-  };
-}
diff --git a/pkgs/desktops/kde-4.13/support/akonadi/default.nix b/pkgs/desktops/kde-4.13/support/akonadi/default.nix
deleted file mode 100644
index 30840ae1d77..00000000000
--- a/pkgs/desktops/kde-4.13/support/akonadi/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano
-, sqlite, mysql, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.12.1";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "0i9iv3lsqhkb51d4xnn6xaimignw8i64nbgkda1wznwbva7j4wx0";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost sqlite mysql ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = with maintainers; [ sander urkud phreedom wmertens ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b35b4b190e2..9bf6ec9670d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10517,7 +10517,7 @@ let
 
   kde4 = recurseIntoAttrs pkgs.kde412;
 
-  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde413 );
+  kde4_next = recurseIntoAttrs( lib.lowPrioSet pkgs.kde412 );
 
   kde412 = kdePackagesFor (pkgs.kde412 // {
       eigen = eigen2;
@@ -10525,10 +10525,6 @@ let
       libcanberra = libcanberra_kde;
     }) ../desktops/kde-4.12;
 
-  kde413 = kdePackagesFor (pkgs.kde413 // {
-      libcanberra = libcanberra_kde;
-    }) ../desktops/kde-4.13;
-
   kdePackagesFor = self: dir:
     let callPackageOrig = callPackage; in
     let
@@ -10564,8 +10560,7 @@ let
 
       k3b = callPackage ../applications/misc/k3b { };
 
-      # Broken phonon
-      #kadu = callPackage ../applications/networking/instant-messengers/kadu { };
+      kadu = callPackage ../applications/networking/instant-messengers/kadu { };
 
       kbibtex = callPackage ../applications/office/kbibtex { };
 

From 5fa61a29048115b213bbeb13f2892f469802eef6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 22 Jul 2014 18:06:42 +0200
Subject: [PATCH 55/61] blender: use permanent URL for the patch

No hash changes.
---
 pkgs/applications/misc/blender/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix
index ffa399fa7fb..7e4fffa98bf 100644
--- a/pkgs/applications/misc/blender/default.nix
+++ b/pkgs/applications/misc/blender/default.nix
@@ -26,9 +26,10 @@ stdenv.mkDerivation rec {
       substituteInPlace */doc/manpage/blender.1.py --replace /usr/bin/python ${python}/bin/python3
     '';
 
-  patches = [(fetchpatch {
-    url = https://developer.blender.org/file/data/vqqwcycgo66w3y3dm4zk/PHID-FILE-ijyw5kteba6nzpcbhv7a/D619.diff;
+  patches = [(fetchpatch { # fix parallel builds
+    url = "https://developer.blender.org/D619?download=true";
     sha256 = "18h4fqsbpwxzqz7qby18lrrbzqnyd5xnann3xcac5wddwv5wjb0f";
+    name = "D619.diff";
   })];
   patchFlags = "-p0";
 

From 27fe53e89c620bb7bb34274f4533bf3e17cd0200 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 21 Jul 2014 12:49:22 +0200
Subject: [PATCH 56/61] nss: minor update

I couldn't find any kind of news or changelog.
---
 pkgs/development/libraries/nss/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index a8c12fe4856..447030f5fcc 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.16.1";
+  version = "3.16.3";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_1_RTM/src/${name}.tar.gz";
-    sha1 = "450a88dde8c7e4533507ac8340dbf94be28a759b";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_16_3_RTM/src/${name}.tar.gz";
+    sha256 = "657711ff7a4058043b69019a66f44101d0234eae2b6b80ab900439dbf02add60";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From adc2edd5cf524239690b5cf49779a11fd2eb061b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 22 Jul 2014 22:18:24 +0200
Subject: [PATCH 57/61] thunderbird: major update 17.* -> 31.0

- To fix build problems, I refactored the build process
  according to Mozilla recommendations.
- 31.0 should become the next ESR branch (31 released today).

CC @nbp @edolstra
---
 .../mailreaders/thunderbird/default.nix       | 99 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 85dab3777ba..c0c11ff1f1c 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, pkgconfig, gtk, perl, python, zip, unzip
-, libIDL, dbus_glib, bzip2, alsaLib, nspr, yasm, mesa, nss
-, libnotify, cairo, pixman, fontconfig
-, libjpeg
-, pythonPackages
-
+{ stdenv, fetchurl, pkgconfig, m4, gtk, pango, perl, python, zip, libIDL
+, libjpeg, libpng, zlib, dbus, dbus_glib, bzip2, xlibs
+, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify
+, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite
+, hunspell, libevent, libstartup_notification, libvpx
+, cairo, gstreamer, gst_plugins_base, icu
+, debugBuild ? false
 , # If you want the resulting program to call itself "Thunderbird"
   # instead of "Shredder", enable this option.  However, those
   # binaries may not be distributed without permission from the
@@ -12,59 +13,75 @@
   enableOfficialBranding ? false
 }:
 
-let version = "17.0.11"; in
-let verName = "${version}esr"; in
+let version = "31.0"; in
+let verName = "${version}"; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "thunderbird-${verName}";
 
   src = fetchurl {
     url = "ftp://ftp.mozilla.org/pub/thunderbird/releases/${verName}/source/thunderbird-${verName}.source.tar.bz2";
-    sha256 = "1m2lph8x82kgxqzlyaxr1l1x7s4qnqfzfnqck4b777914mrv1mdp";
+    sha1 = "0fe6666fddd4db82ec2e389f30c5ea11d4f72be5";
   };
 
-  #enableParallelBuilding = true;
+  buildInputs = # from firefox30Pkgs.xulrunner, but without gstreamer and libvpx
+    [ pkgconfig libpng gtk perl zip libIDL libjpeg zlib bzip2
+      python dbus dbus_glib pango freetype fontconfig xlibs.libXi
+      xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file
+      alsaLib nspr nss libnotify xlibs.pixman yasm mesa
+      xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite
+      xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper
+      hunspell libevent libstartup_notification cairo icu
+    ] ++ [ m4 ];
 
-  buildInputs =
-    [ pkgconfig perl python zip unzip bzip2 gtk dbus_glib alsaLib libIDL nspr
-      libnotify cairo pixman fontconfig yasm mesa nss
-      libjpeg pythonPackages.sqlite3
-    ];
-
-  configureFlags =
-    [ "--enable-application=mail"
-      "--enable-optimize"
-      "--with-pthreads"
-      "--disable-debug"
-      "--enable-strip"
-      "--with-pthreads"
+  configureFlags = [ "--enable-application=mail" ]
+    # from firefox30Pkgs.commonConfigureFlags, but without gstreamer and libvpx
+    ++ [
       "--with-system-jpeg"
-      #"--with-system-png"
       "--with-system-zlib"
       "--with-system-bz2"
       "--with-system-nspr"
       "--with-system-nss"
-      # Broken: https://bugzilla.mozilla.org/show_bug.cgi?id=722975
-      #"--enable-system-cairo"
+      "--with-system-libevent"
+      #"--with-system-libvpx"
+      "--with-system-png"
+      "--with-system-icu"
+      "--enable-system-ffi"
+      "--enable-system-hunspell"
+      "--enable-system-pixman"
+      "--enable-system-sqlite"
+      "--enable-system-cairo"
+      "--disable-gstreamer"
+      "--enable-startup-notification"
+      # "--enable-content-sandbox"            # available since 26.0, but not much info available
+      # "--enable-content-sandbox-reporter"   # keeping disabled for now
       "--disable-crashreporter"
-      "--disable-necko-wifi"
-      "--disable-webm"
       "--disable-tests"
-      "--enable-calendar"
-      "--disable-ogg"
+      "--disable-necko-wifi" # maybe we want to enable this at some point
+      "--disable-installer"
+      "--disable-updater"
+      "--disable-pulseaudio"
+    ] ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"]
+                        else [ "--disable-debug" "--enable-release"
+                               "--enable-optimize" "--enable-strip" ])
+    ++ [
+      "--disable-javaxpcom"
+      "--enable-stdcxx-compat" # Avoid dependency on libstdc++ 4.7
     ]
     ++ stdenv.lib.optional enableOfficialBranding "--enable-official-branding";
 
-  # The Thunderbird Makefiles refer to the variables LIBXUL_DIST,
-  # prefix, and PREFIX in some places where they are not set.  In
-  # particular, there are some linker flags like
-  # `-rpath-link=$(LIBXUL_DIST)/bin'.  Since this expands to
-  # `-rpath-link=/bin', the build fails due to the purity checks in
-  # the ld wrapper.  So disable the purity check for now.
-  preBuild = "NIX_ENFORCE_PURITY=0";
+  configurePhase = ''
+    patchShebangs .
 
-  # This doesn't work:
-  #makeFlags = "LIBXUL_DIST=$(out) prefix=$(out) PREFIX=$(out)";
+    echo '${stdenv.lib.concatMapStrings (s : "ac_add_options ${s}\n") configureFlags}' > .mozconfig
+    echo "ac_add_options --prefix='$out'" >> .mozconfig
+    echo "mk_add_options MOZ_MAKE_FLAGS='-j$NIX_BUILD_CORES'" >> .mozconfig
+
+    make ${makeFlags} configure
+  '';
+
+  makeFlags = "-f client.mk";
+  buildFlags = "build";
 
   postInstall =
     ''
@@ -84,7 +101,7 @@ stdenv.mkDerivation {
     '';
 
   meta = with stdenv.lib; {
-    description = "Mozilla Thunderbird, a full-featured email client";
+    description = "A full-featured e-mail client";
     homepage = http://www.mozilla.org/thunderbird/;
     license =
       # Official branding implies thunderbird name and logo cannot be reuse,
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9bf6ec9670d..5d7c2173e21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9732,6 +9732,8 @@ let
 
   thunderbird = callPackage ../applications/networking/mailreaders/thunderbird {
     inherit (gnome) libIDL;
+    inherit (pythonPackages) pysqlite;
+    libpng = libpng_apng;
   };
 
   thunderbird-bin = callPackage ../applications/networking/mailreaders/thunderbird-bin {

From f681a7683cde7a5c3725523898b7ca20d13bfa8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Aug 2014 04:31:26 +0200
Subject: [PATCH 58/61] poppler: maintenance update

---
 pkgs/development/libraries/poppler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index fd507b3e540..1345ce37e77 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -4,8 +4,8 @@
 }:
 
 let
-  version = "0.26.2"; # even major numbers are stable
-  sha256 = "09lm1mfpf0p6vzayl2nbwvsj5gl7sz8sfmwziix0p87bh8x9dn8x";
+  version = "0.26.3"; # even major numbers are stable
+  sha256 = "1ca2lrwvhxzq0g4blbvq099vyydfjyz839jki301p1jgazrimjw8";
 
   qtcairo_patches =
     let qtcairo = fetchgit { # the version for poppler-0.24

From 3a6135a907bd8de3c29925dc92c441161bc992b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Aug 2014 04:31:51 +0200
Subject: [PATCH 59/61] harfbuzz: small update

---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index 89c6b965161..8340660e392 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,11 +8,11 @@
 # (icu is a ~30 MB dependency, the rest is very small in comparison)
 
 stdenv.mkDerivation rec {
-  name = "harfbuzz-0.9.32";
+  name = "harfbuzz-0.9.33";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2";
-    sha256 = "1d4x9fcy2p9g67pb4nfzx6p4008dzn7g25lva9pv71rd9rs82323";
+    sha256 = "1iql2ghlndqgx9q6p098xf253rjz5rnrv5qniwgd1b5q0jzwa4yk";
   };
 
   configureFlags = [

From 9fcd3c2825ad0bea017dd6e95f49c616a13eef2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Aug 2014 04:43:11 +0200
Subject: [PATCH 60/61] libdrm: update

---
 pkgs/development/libraries/libdrm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 69d09fe9fae..d7a6f8d5443 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, udev }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.54";
+  name = "libdrm-2.4.56";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "1sg45y9yiz9yyp6dkyilqz8rhii9azgy53i2s4iia3p8zgmh2h6r";
+    sha256 = "0c20wpfa94d8kww0f2xinmm4axsl4nhq921xj4i88yhpjbhbn3z2";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 91b53aaebc0ca2e80d073459324515879e300f34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 2 Aug 2014 04:43:19 +0200
Subject: [PATCH 61/61] xorg.libXext: minor update

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 938f6564b52..2f18a4e1020 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -680,11 +680,11 @@ let
   })) // {inherit xproto ;};
 
   libXext = (stdenv.mkDerivation ((if overrides ? libXext then overrides.libXext else x: x) {
-    name = "libXext-1.3.2";
+    name = "libXext-1.3.3";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2;
-      sha256 = "1q1j0kjyhmy24wqr6mdkrrciffyqhmc8vn95za2w1ka6qrdhfagq";
+      url = mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2;
+      sha256 = "0dbfn5bznnrhqzvkrcmw4c44yvvpwdcsrvzxf4rk27r36b9x865m";
     };
     buildInputs = [pkgconfig libX11 xextproto xproto ];
   })) // {inherit libX11 xextproto xproto ;};
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index 2b17423bae2..417d12ddadc 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -66,7 +66,7 @@ mirror://xorg/individual/lib/libXcomposite-0.4.4.tar.bz2
 mirror://xorg/individual/lib/libXcursor-1.1.14.tar.bz2
 mirror://xorg/individual/lib/libXdamage-1.1.4.tar.bz2
 mirror://xorg/X11R7.7/src/everything/libXdmcp-1.1.1.tar.bz2
-mirror://xorg/individual/lib/libXext-1.3.2.tar.bz2
+mirror://xorg/individual/lib/libXext-1.3.3.tar.bz2
 mirror://xorg/individual/lib/libXfixes-5.0.1.tar.bz2
 mirror://xorg/individual/lib/libXfont-1.4.8.tar.bz2
 mirror://xorg/individual/lib/libXft-2.3.2.tar.bz2