Merge pull request #22977 from ttuegel/triage-kde4

Remove KDE 4 desktop packages
2017-02-25 12:21:44 -06:00 · 2017-02-25 12:21:44 -06:00 · 0ed156a216
commit 0ed156a216
parent a1431f35db fbf12d9f70
267 changed files with 529 additions and 5054 deletions
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
 , qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
-, taglib_extras, loudmouth , kdelibs , qca2, libmtp, liblastfm, libgpod
+, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod
 , phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
 , lz4, lzo, snappy, libaio, pcre
 }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {

  buildInputs = [
    qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
-    taglib taglib_extras loudmouth kdelibs phonon strigi soprano qca2
+    taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2
    libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
    lz4 lzo snappy libaio pcre
  ];
@ -43,6 +43,6 @@ stdenv.mkDerivation rec {
    description = "Popular music player for KDE";
    license = "GPL";
    homepage = http://amarok.kde.org;
-    inherit (kdelibs.meta) platforms maintainers;
+    inherit (kdelibs4.meta) platforms;
  };
 }
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@ -2,10 +2,6 @@
 , withQt4 ? false, qt4
 , withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper

-# I'm unable to make KDE work here, crashes at runtime so I simply
-# make Qt4 the default until someone who wants KDE can figure it out.
-, withKDE4 ? false, kde4
-
 # Cantata doesn't build with cdparanoia enabled so we disable that
 # default for now until I (or someone else) figure it out.
 , withCdda ? false, cdparanoia
@ -24,10 +20,9 @@
 }:

 # One and only one front-end.
-assert withQt5 -> withQt4 == false && withKDE4 == false;
-assert withQt4 -> withQt5 == false && withKDE4 == false;
-assert withKDE4 -> withQt4 == false && withQt5 == false;
-assert withQt4 || withQt5 || withKDE4;
+assert withQt5 -> withQt4 == false;
+assert withQt4 -> withQt5 == false;
+assert withQt4 || withQt5;

 # Inter-dependencies.
 assert withCddb -> withCdda && withTaglib;
@ -58,7 +53,6 @@ stdenv.mkDerivation rec {
    [ cmake ]
    ++ stdenv.lib.optional withQt4 qt4
    ++ stdenv.lib.optionals withQt5 [ qtbase qtsvg qttools ]
-    ++ stdenv.lib.optional withKDE4 kde4.kdelibs
    ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
    ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
    ++ stdenv.lib.optional withCdda cdparanoia
@ -66,16 +60,14 @@ stdenv.mkDerivation rec {
    ++ stdenv.lib.optional withLame lame
    ++ stdenv.lib.optional withMtp libmtp
    ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
-    ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2;
+    ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;

  nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;

  unpackPhase = "tar -xvf $src";
  sourceRoot = "${name}";

-  # Qt4 is implicit when KDE is switched off.
  cmakeFlags = stdenv.lib.flatten [
-    (fstats withKDE4 [ "KDE" "KWALLET" ])
    (fstat withQt5 "QT5")
    (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
    (fstats withReplaygain [ "FFMPEG" "MPG123" "SPEEXDSP" ])
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/applications/audio/jackmix/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgs, jack ? pkgs.libjack2 }:
+{ stdenv, fetchurl, pkgconfig, scons, qt4, lash, libjack2, jack ? libjack2 }:

 stdenv.mkDerivation rec {
  name = "jackmix-0.5.2";
@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
  };

  buildInputs = [
-    pkgs.pkgconfig
-    pkgs.scons
-    pkgs.kde4.qt4
-    pkgs.lash
+    pkgconfig
+    scons
+    qt4
+    lash
    jack
  ];

--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@ -3,12 +3,12 @@
 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper

 , enableXMPP      ? true,  libjreen     ? null
-, enableKDE       ? false, kdelibs      ? null
+, enableKDE       ? false, kdelibs4     ? null
 , enableTelepathy ? false, telepathy_qt ? null
 }:

 assert enableXMPP      -> libjreen     != null;
-assert enableKDE       -> kdelibs      != null;
+assert enableKDE       -> kdelibs4     != null;
 assert enableTelepathy -> telepathy_qt != null;

 stdenv.mkDerivation rec {
@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
    qca2 qjson qt4 qtkeychain quazip sparsehash taglib websocketpp
    makeWrapper
  ] ++ stdenv.lib.optional enableXMPP      libjreen
-    ++ stdenv.lib.optional enableKDE       kdelibs
+    ++ stdenv.lib.optional enableKDE       kdelibs4
    ++ stdenv.lib.optional enableTelepathy telepathy_qt;

  postInstall = let
--- a/pkgs/applications/editors/kdevelop/default.nix
+++ b/pkgs/applications/editors/kdevelop/default.nix
@ -1,38 +0,0 @@
-{ stdenv, fetchurl, kdevplatform, cmake, pkgconfig, automoc4, shared_mime_info,
-  kdebase_workspace, gettext, perl, okteta, qjson, kate, konsole, kde_runtime, oxygen_icons }:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-  version = "4.7.3";
-  pname = "kdevelop";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "9db388d1c8274da7d168c13db612c7e94ece7815757b945b0aa0371620a06b35";
-  };
-
-  buildInputs = [ kdevplatform kdebase_workspace okteta qjson ];
-
-  nativeBuildInputs = [ cmake pkgconfig automoc4 shared_mime_info gettext perl ];
-
-  propagatedUserEnvPkgs = [ kdevplatform kate konsole kde_runtime oxygen_icons ];
-
-  patches = [ ./gettext.patch ];
-
-  NIX_CFLAGS_COMPILE = "-I${okteta}/include/KDE";
-
-  meta = with stdenv.lib; {
-    maintainers = [ maintainers.urkud ];
-    platforms = platforms.linux;
-    description = "KDE official IDE";
-    longDescription =
-      ''
-        A free, opensource IDE (Integrated Development Environment)
-        for MS Windows, Mac OsX, Linux, Solaris and FreeBSD. It is a
-        feature-full, plugin extendable IDE for C/C++ and other
-        programing languages. It is based on KDevPlatform, KDE and Qt
-        libraries and is under development since 1998.
-      '';
-    homepage = https://www.kdevelop.org;
-  };
-}
--- a/pkgs/applications/editors/kdevelop/gettext.patch
+++ b/pkgs/applications/editors/kdevelop/gettext.patch
@ -1,8 +0,0 @@
-diff -urN kdevelop-4.7.3.orig/po/CMakeLists.txt kdevelop-4.7.3/po/CMakeLists.txt
--- kdevelop-4.7.3.orig/po/CMakeLists.txt	2016-03-04 23:29:09.411886565 +0100
-+++ kdevelop-4.7.3/po/CMakeLists.txt	2016-03-04 23:28:35.108451713 +0100
-@@ -1,3 +1,4 @@
-+cmake_policy(SET CMP0002 OLD)
- find_package(Gettext REQUIRED)
- if (NOT GETTEXT_MSGMERGE_EXECUTABLE)
- MESSAGE(FATAL_ERROR "Please install msgmerge binary")
--- a/pkgs/applications/graphics/digikam/5.nix
+++ b/pkgs/applications/graphics/digikam/5.nix
@ -1,122 +0,0 @@
-{ stdenv, fetchurl, cmake, ecm, makeQtWrapper
-
-# For `digitaglinktree`
-, perl, sqlite
-
-, qtbase
-, qtxmlpatterns
-, qtsvg
-, qtwebkit
-
-, kconfigwidgets
-, kcoreaddons
-, kdoctools
-, kfilemetadata
-, knotifications
-, knotifyconfig
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-
-, bison
-, boost
-, eigen
-, exiv2
-, flex
-, jasper
-, lcms2
-, lensfun
-, libgphoto2
-, libkipi
-, liblqr1
-, libusb1
-, marble
-, mysql
-, opencv
-, threadweaver
-
-# For panorama and focus stacking
-, enblend-enfuse
-, hugin
-, gnumake
-
-, oxygen
-}:
-
-stdenv.mkDerivation rec {
-  name    = "digikam-${version}";
-  version = "5.4.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
-    sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
-  };
-
-  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
-
-  patches = [ ./0001-Disable-fno-operator-names.patch ];
-
-  buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qtsvg
-    qtwebkit
-
-    kconfigwidgets
-    kcoreaddons
-    kdoctools
-    kfilemetadata
-    knotifications
-    knotifyconfig
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-
-    bison
-    boost
-    eigen
-    exiv2
-    flex
-    jasper
-    lcms2
-    lensfun
-    libgphoto2
-    libkipi
-    liblqr1
-    libusb1
-    marble.unwrapped
-    mysql
-    opencv
-    threadweaver
-
-    oxygen
-  ];
-
-  enableParallelBuilding = true;
-
-  cmakeFlags = [
-    "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
-    "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
-    "-DENABLE_MYSQLSUPPORT=1"
-    "-DENABLE_INTERNALMYSQL=1"
-  ];
-
-  fixupPhase = ''
-    substituteInPlace $out/bin/digitaglinktree \
-      --replace "/usr/bin/perl" "${perl}/bin/perl" \
-      --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
-
-    wrapQtProgram $out/bin/digikam \
-      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
-
-    wrapQtProgram $out/bin/showfoto
-  '';
-
-  meta = {
-    description = "Photo Management Program";
-    license = stdenv.lib.licenses.gpl2;
-    homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@ -1,235 +1,122 @@
-{ stdenv, fetchurl, fetchpatch, automoc4, boost, shared_desktop_ontologies
-, cmake, eigen, lcms, gettext, jasper, kdelibs, kdepimlibs, lensfun
-, libgphoto2, libjpeg, libkdcraw, libkexiv2, libkipi, libpgf, libtiff
-, libusb1, liblqr1, marble, mysql, opencv, perl, phonon, pkgconfig
-, qca2, qimageblitz, qjson, qt4, soprano
+{ stdenv, fetchurl, cmake, ecm, makeQtWrapper

-# Optional build time dependencies
-, baloo, doxygen, kfilemetadata
+# For `digitaglinktree`
+, perl, sqlite
+
+, qtbase
+, qtxmlpatterns
+, qtsvg
+, qtwebkit
+
+, kconfigwidgets
+, kcoreaddons
+, kdoctools
+, kfilemetadata
+, knotifications
+, knotifyconfig
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+
+, bison
+, boost
+, eigen
+, exiv2
+, flex
+, jasper
 , lcms2
-, kfaceSupport ? true, libkface ? null
-, kgeomapSupport ? true, libkgeomap ? null
-, libxslt
+, lensfun
+, libgphoto2
+, libkipi
+, liblqr1
+, libusb1
+, marble
+, mysql
+, opencv
+, threadweaver

-# Plugins optional build time dependencies
-, gdk_pixbuf, imagemagick
-, libgpod, libksane, libkvkontakte
-, qt_gstreamer1 /*qt_soap, <https://github.com/commontk/QtSOAP>  herqq <http://www.herqq.org> -> is missing its av part.*/
-  /*qt_koauth <http://gitorious.org/kqoauth>*/
+# For panorama and focus stacking
+, enblend-enfuse
+, hugin
+, gnumake

-# Supplementary packages required only by the wrapper.
-, bash, kde_runtime, kde_baseapps, makeWrapper, oxygen_icons
-, phonon-backend-vlc /*phonon-backend-gstreamer,*/
-, ffmpegthumbs /*mplayerthumbs*/
-, runCommand, shared_mime_info, writeScriptBin
+, oxygen
 }:

-let 
-  version = "4.12.0";
-  pName = "digikam-${version}";
+stdenv.mkDerivation rec {
+  name    = "digikam-${version}";
+  version = "5.4.0";

-  build = stdenv.mkDerivation rec {
-    name = "digikam-build-${version}";
-
-    src = fetchurl {
-      url = "http://download.kde.org/stable/digikam/${pName}.tar.bz2";
-      sha256 = "081ldsaf3frf5khznjd3sxkjmi4dyp6w6nqnc2a0agkk0kxkl10m";
-    };
-
-    patches = [
-      (fetchpatch {
-        # Fix compilation against Lensfun 0.3.2
-        url = "http://cgit.kde.org/digikam.git/patch/?id=0f159981176faa6da701f112bfe557b79804d468";
-        sha256 = "1c8bg7s84vg4v620gbs16cjcbpml749018gy5dpvfacx5vl24wza";
-      })
-    ];
-
-    patchFlags = ["-p1" "-dcore"];
-
-    nativeBuildInputs = [ 
-      automoc4 cmake gettext perl pkgconfig
-    ] ++ [
-      # Optional
-      doxygen 
-    ];
-
-    buildInputs = [
-      boost eigen jasper kdelibs kdepimlibs lcms lensfun
-      libgphoto2 libjpeg libkdcraw libkexiv2 libkipi liblqr1 libpgf
-      libtiff marble mysql.lib opencv phonon qca2 qimageblitz qjson qt4
-      shared_desktop_ontologies soprano ]
-    # Optional build time dependencies
-    ++ [
-      baloo 
-      kfilemetadata 
-      lcms2 ] 
-    ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ]
-    ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] ++ 
-    [ libxslt ]
-    # Plugins optional build time dependencies
-    ++ [
-      gdk_pixbuf imagemagick libgpod libksane
-      libkvkontakte
-      qt_gstreamer1 ];
-
-    # Make digikam find some FindXXXX.cmake
-    KDEDIRS="${marble}:${qjson}";
-
-    # Find kdepimlibs's upper case headers under `include/KDE`.
-    NIX_CFLAGS_COMPILE = "-I${kdepimlibs}/include/KDE";
-
-    # Help digiKam find libusb, otherwise gphoto2 support is disabled
-    cmakeFlags = [
-      "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
-      "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
-      "-DENABLE_BALOOSUPPORT=ON"
-      "-DENABLE_KDEPIMLIBSSUPPORT=ON"
-      "-DENABLE_LCMS2=ON" ] 
-    ++ stdenv.lib.optional (kfaceSupport && null == libkface) [ "-DDIGIKAMSC_COMPILE_LIBKFACE=ON" ]
-    ++ stdenv.lib.optional (kgeomapSupport && null == libkgeomap) [ "-DDIGIKAMSC_COMPILE_LIBKGEOMAP=ON" ];
-
-    enableParallelBuilding = true;
-
-    meta = {
-      description = "Photo Management Program";
-      license = stdenv.lib.licenses.gpl2;
-      homepage = http://www.digikam.org;
-      maintainers = with stdenv.lib.maintainers; [ goibhniu viric urkud ];
-      inherit (kdelibs.meta) platforms;
-    };
+  src = fetchurl {
+    url = "http://download.kde.org/stable/digikam/${name}.tar.xz";
+    sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
  };

+  nativeBuildInputs = [ cmake ecm makeQtWrapper ];

-  kdePkgs = [
-    build # digikam's own build
-    kdelibs kdepimlibs kde_runtime kde_baseapps libkdcraw oxygen_icons
-    /*phonon-backend-gstreamer*/ phonon-backend-vlc
-    ffmpegthumbs /*mplayerthumbs*/ shared_mime_info ]
-  # Optional build time dependencies
-  ++ [
+  patches = [ ./0001-Disable-fno-operator-names.patch ];

-    baloo kfilemetadata ] 
-  ++ stdenv.lib.optional (kfaceSupport && null != libkface) [ libkface ]
-  ++ stdenv.lib.optional (kgeomapSupport && null != libkgeomap) [ libkgeomap ] 
-  ++ [ 
-    libkipi ] 
-  # Plugins optional build time dependencies
-  ++ [
-    libksane libkvkontakte
+  buildInputs = [
+    qtbase
+    qtxmlpatterns
+    qtsvg
+    qtwebkit
+
+    kconfigwidgets
+    kcoreaddons
+    kdoctools
+    kfilemetadata
+    knotifications
+    knotifyconfig
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+
+    bison
+    boost
+    eigen
+    exiv2
+    flex
+    jasper
+    lcms2
+    lensfun
+    libgphoto2
+    libkipi
+    liblqr1
+    libusb1
+    marble.unwrapped
+    mysql
+    opencv
+    threadweaver
+
+    oxygen
  ];

+  enableParallelBuilding = true;

-  # TODO: It should be the responsability of these packages to add themselves to `KDEDIRS`. See
-  # <https://github.com/ttuegel/nixpkgs/commit/a0efeacc0ef2cf63bbb768bfb172a483307d080b> for
-  # a practical example.
-  # IMPORTANT: Note that using `XDG_DATA_DIRS` here instead of `KDEDIRS` won't work properly.
-  KDEDIRS = with stdenv.lib; concatStrings (intersperse ":" (map (x: "${x}") kdePkgs));
+  cmakeFlags = [
+    "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
+    "-DLIBUSB_INCLUDE_DIR=${libusb1.dev}/include/libusb-1.0"
+    "-DENABLE_MYSQLSUPPORT=1"
+    "-DENABLE_INTERNALMYSQL=1"
+  ];

-  sycocaDirRelPath = "var/lib/kdesycoca";
-  sycocaFileRelPath = "${sycocaDirRelPath}/${pName}.sycoca";
+  fixupPhase = ''
+    substituteInPlace $out/bin/digitaglinktree \
+      --replace "/usr/bin/perl" "${perl}/bin/perl" \
+      --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"

-  sycoca = runCommand "${pName}" {
+    wrapQtProgram $out/bin/digikam \
+      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"

-    name = "digikam-sycoca-${version}";
-
-    nativeBuildInputs = [ kdelibs ];
-
-    dontPatchELF = true;
-    dontStrip = true;
-
-  } ''
-    # Make sure kbuildsycoca4 does not attempt to write to user home directory.
-    export HOME=$PWD
-
-    export KDESYCOCA="$out/${sycocaFileRelPath}"
-
-    mkdir -p $out/${sycocaDirRelPath}
-    export XDG_DATA_DIRS=""
-    export KDEDIRS="${KDEDIRS}"
-    kbuildsycoca4 --noincremental --nosignal
+    wrapQtProgram $out/bin/showfoto
  '';

-
-  replaceExeListWithWrapped = 
-    let f = exeName: ''
-        rm -f "$out/bin/${exeName}"
-        makeWrapper "${build}/bin/${exeName}" "$out/bin/${exeName}" \
-          --set XDG_DATA_DIRS "" \
-          --set KDEDIRS "${KDEDIRS}" \
-          --set KDESYCOCA "${sycoca}/${sycocaFileRelPath}"
-      '';
-    in 
-      with stdenv.lib; exeNameList: concatStrings (intersperse "\n" (map f exeNameList));
-
-in
-
-
-with stdenv.lib;
-
-/*
-  Final derivation
-  ----------------
-
-   -  Create symlinks to our original build derivation items.
-   -  Wrap specific executables so that they know of the appropriate
-      sycoca database, `KDEDIRS` to use and block any interference
-      from `XDG_DATA_DIRS` (only `dnginfo` is not wrapped).
-*/
-runCommand "${pName}" {
-  inherit build;
-  inherit sycoca;
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildInputs = kdePkgs;
-
-  dontPatchELF = true;
-  dontStrip = true;
-
  meta = {
    description = "Photo Management Program";
    license = stdenv.lib.licenses.gpl2;
    homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ /*jraygauthier*/ ];
-    inherit (kdelibs.meta) platforms;
-    broken = true;
+    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
+    platforms = stdenv.lib.platforms.linux;
  };
-
-} ''
-  pushd $build > /dev/null
-  for d in `find . -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
-    mkdir -p $out/$d
-    for f in `find $d -maxdepth 1 -name "*" -printf "%f\n" | tail -n+2`; do
-        ln -s "$build/$d/$f" "$out/$d/$f"
-    done
-  done
-  popd > /dev/null
-  
-  ${replaceExeListWithWrapped [ "cleanup_digikamdb" "digitaglinktree" "digikam" "dngconverter" 
-                                "expoblending" "photolayoutseditor" "scangui" "showfoto" ]}
-''
-
-/*
-  
-TODO
----
-
-### Useful ###
-
- -  Per lib `KDELIBS` environment variable export. See above in-code TODO comment.
- -  Missing optional `qt_soap` or `herqq` (av + normal package) dependencies. Those are not
-    yet (or not fully) packaged in nix. Mainly required for upnp export.
- -  Possibility to use the `phonon-backend-gstreamer` with its own user specified set of backend.
- -  Allow user to disable optional features or dependencies reacting properly.
- -  Compile `kipiplugins` as a separate package (so that it can be used by other kde packages
-    and so that this package's build time is reduced).
-
-### Not so useful ###
-
- -  Missing optional `qt_koauth` (not packaged in nix).
- -  Missing optional `libmediawiki` (not packaged in nix)..
- -  For some reason the cmake build does not detect `libkvkontakte`. Fix this.
- -  Possibility to use `mplayerthumbs` thumbnail creator backend. In digikam dev docs,
-    it is however suggested to use `ffmpegthumbs`. Maybe we should stick to it.
-
-*/
+}
--- a/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/pkgs/applications/graphics/kgraphviewer/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, boost, graphviz
+, kdelibs4, boost, graphviz
 }:

 stdenv.mkDerivation rec {
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
    sha256 = "13zhjs57xavzrj4nrlqs35n35ihvzij7hgbszf5fhlp2a4d4rrqs";
  };

-  buildInputs = [ kdelibs boost graphviz ];
+  buildInputs = [ kdelibs4 boost graphviz ];
  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];

  meta = with stdenv.lib; {
--- a/pkgs/applications/graphics/kipi-plugins/5.x.nix
+++ b/pkgs/applications/graphics/kipi-plugins/5.x.nix
@ -1,34 +0,0 @@
-{
-  stdenv, fetchurl,
-  ecm,
-  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
-  libkipi, qtbase, qtsvg, qtxmlpatterns
-}:
-
-stdenv.mkDerivation rec {
-  name    = "kipi-plugins-${version}";
-  version = "5.2.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
-    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
-  };
-
-  prePatch = ''
-    cd extra/kipi-plugins
-  '';
-
-  nativeBuildInputs = [ ecm ];
-  buildInputs = [
-    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
-    qtbase qtsvg qtxmlpatterns
-  ];
-
-  meta = {
-    description = "Plugins for KDE-based image applications";
-    license = stdenv.lib.licenses.gpl2;
-    homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/applications/graphics/kipi-plugins/default.nix
+++ b/pkgs/applications/graphics/kipi-plugins/default.nix
@ -1,30 +1,34 @@
-{ stdenv, fetchurl, kdelibs, qimageblitz, qca2, kdepimlibs, libxml2, libxslt
-, gettext, opencv, libgpod, gdk_pixbuf , qjson, pkgconfig
-, cmake, automoc4
-, kdegraphics, libkexiv2 ? kdegraphics, libkdcraw ? kdegraphics
-, libkipi ? kdegraphics, libksane ? kdegraphics }:
+{
+  stdenv, fetchurl,
+  ecm,
+  karchive, kconfig, ki18n, kiconthemes, kio, kservice, kwindowsystem, kxmlgui,
+  libkipi, qtbase, qtsvg, qtxmlpatterns
+}:

 stdenv.mkDerivation rec {
-  name = "kipi-plugins-1.9.0";
+  name    = "kipi-plugins-${version}";
+  version = "5.2.0";

  src = fetchurl {
-    url = "mirror://sourceforge/kipi/${name}.tar.bz2";
-    sha256 = "0k4k9v1rj7129n0s0i5pvv4rabx0prxqs6sca642fj95cxc6c96m";
+    url = "http://download.kde.org/stable/digikam/digikam-${version}.tar.xz";
+    sha256 = "0q4j7iv20cxgfsr14qwzx05wbp2zkgc7cg2pi7ibcnwba70ky96g";
  };

-  buildInputs =
-    [ kdelibs libkexiv2 libkdcraw libkipi qimageblitz qca2 kdepimlibs libxml2
-      libksane libxslt gettext opencv libgpod gdk_pixbuf qjson
-    ];
+  prePatch = ''
+    cd extra/kipi-plugins
+  '';

-  nativeBuildInputs = [ pkgconfig cmake automoc4 ];
+  nativeBuildInputs = [ ecm ];
+  buildInputs = [
+    karchive kconfig ki18n kiconthemes kio kservice kwindowsystem kxmlgui libkipi
+    qtbase qtsvg qtxmlpatterns
+  ];

  meta = {
-    description = "Photo Management Program";
-    license = "GPL";
-    homepage = http://www.kipi-plugins.org;
-    inherit (kdelibs.meta) platforms;
-    maintainers = with stdenv.lib.maintainers; [ viric urkud ];
-    broken = true; # it should be built from digikam sources, perhaps together
+    description = "Plugins for KDE-based image applications";
+    license = stdenv.lib.licenses.gpl2;
+    homepage = http://www.digikam.org;
+    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/applications/graphics/kuickshow/default.nix
+++ b/pkgs/applications/graphics/kuickshow/default.nix
@ -1,14 +0,0 @@
-{ stdenv, fetchurl, automoc4, kdelibs, imlib, cmake, pkgconfig, gettext }:
-
-stdenv.mkDerivation rec {
-  name = "kuickshow-0.9.1";
-
-  src = fetchurl {
-    url = "http://hosti.leonde.de/~gis/${name}.tar.bz2";
-    sha256 = "0l488a6p0ligbhv6p1lnx5k2d00x9bkkvms30winifa8rmisa9wl";
-  };
-
-  buildInputs = [ kdelibs imlib ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext pkgconfig ];
-}
--- a/pkgs/applications/misc/dfilemanager/default.nix
+++ b/pkgs/applications/misc/dfilemanager/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation {

  meta = {
    homepage = "http://dfilemanager.sourceforge.net/";
-    description = "File manager written in Qt/C++, it does use one library from kdelibs, the solid lib for easy device handling";
+    description = "File manager written in Qt/C++";
    license = stdenv.lib.licenses.gpl2;
    platforms = stdenv.lib.platforms.unix;
    maintainers = [ stdenv.lib.maintainers.eduarrrd ];
--- a/pkgs/applications/misc/k3b/default.nix
+++ b/pkgs/applications/misc/k3b/default.nix
@ -1,8 +1,8 @@
 { stdenv, lib, fetchurl, makeWrapper, automoc4, cmake, perl, pkgconfig
 , shared_mime_info, libvorbis, taglib, flac, libsamplerate
 , libdvdread, lame, libsndfile, libmad, gettext , transcode, cdrdao
-, dvdplusrwtools, vcdimager, cdparanoia, kdelibs, libdvdcss, ffmpeg
-, kdemultimedia, phonon, libkcddb ? null
+, dvdplusrwtools, vcdimager, cdparanoia, kdelibs4, libdvdcss, ffmpeg
+, libkcddb, phonon
 }:

 let
@ -24,8 +24,8 @@ in stdenv.mkDerivation rec {

  buildInputs = [
    shared_mime_info libvorbis taglib flac libsamplerate libdvdread
-    lame libsndfile libmad stdenv.cc.libc kdelibs
-    kdemultimedia phonon libkcddb makeWrapper cdparanoia
+    lame libsndfile libmad stdenv.cc.libc kdelibs4
+    phonon libkcddb makeWrapper cdparanoia
    libdvdcss ffmpeg
  ];

--- a/pkgs/applications/misc/kde-wacomtablet/default.nix
+++ b/pkgs/applications/misc/kde-wacomtablet/default.nix
@ -1,23 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, xf86_input_wacom }:
-
-stdenv.mkDerivation rec {
-  name = "wacomtablet-2.1.0";
-
-  src = fetchurl {
-    url = "http://kde-apps.org/CONTENT/content-files/114856-wacomtablet-2.1.0.tar.xz";
-    sha256 = "17n1p5v2yx517hkqd13pyl3wnrdnh6pfzwf2y2csrfckyndhwk8w";
-  };
-
-  buildInputs = [ kdelibs xf86_input_wacom ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "KDE Wacom graphic tablet configuration tool";
-    license = licenses.gpl2Plus;
-    homepage = http://kde-apps.org/content/show.php/wacom+tablet?content=114856;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu maintainers.urkud ];
-  };
-}
--- a/pkgs/applications/misc/kdeconnect/0.7.nix
+++ b/pkgs/applications/misc/kdeconnect/0.7.nix
@ -1,36 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson
-}:
-
-stdenv.mkDerivation rec {
-  name = "kdeconnect-${version}";
-  version = "0.7.3";
-
-  src = fetchurl {
-    url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
-    sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
-  };
-
-  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  meta = with stdenv.lib; {
-    description = "A tool to connect and sync your devices with KDE";
-    longDescription = ''
-        The corresponding Android app, "KDE Connect", is available in
-        F-Droid and Google play and has the following features:
-
-        - Share files and URLs to KDE from any app
-        - Clipboard share: copy from or to your desktop
-        - Notifications sync (4.3+): Read your Android notifications from KDE
-        - Multimedia remote control: Use your phone as a remote control
-        - WiFi connection: no usb wire or bluetooth needed
-        - RSA Encryption: your information is safe 
-    '';
-    license = licenses.gpl2;
-    homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
--- a/pkgs/applications/misc/kgocode/default.nix
+++ b/pkgs/applications/misc/kgocode/default.nix
@ -1,9 +1,9 @@
-{ fetchgit, stdenv, cmake, kdelibs, automoc4 } :
+{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } :

 stdenv.mkDerivation rec {
  name = "kgocode-0.0.1";

-  buildInputs = [ cmake kdelibs automoc4 ];
+  buildInputs = [ cmake kdelibs4 automoc4 ];

  src = fetchgit {
    url = https://bitbucket.org/lucashnegri/kgocode.git;
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
--- a/pkgs/applications/misc/krename/kde4.nix
+++ b/pkgs/applications/misc/krename/kde4.nix
@ -1,22 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, taglib, exiv2, podofo, qt4, phonon
-}:
-
-stdenv.mkDerivation rec {
-  name = "krename-4.0.9";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/krename/${name}.tar.bz2";
-    sha256 = "11bdg5vdcs393n0aibhm3jh3wxlk5kz78jhkwf7cj9086qkg9wds";
-  };
-
-  buildInputs = [ kdelibs taglib exiv2 podofo qt4 phonon ];
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    homepage = http://www.krename.net;
-    description = "A powerful batch renamer for KDE";
-    inherit (kdelibs.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
-}
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kde_baseapps
+, kdelibs4, kde_baseapps
 }:

 stdenv.mkDerivation rec {
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
    url = "mirror://sourceforge/krusader/${name}.tar.bz2";
    sha256 = "1q1m4cjzz2m41pdpxnwrsiczc7990785b700lv64midjjgjnr7j6";
  };
-  buildInputs = [ kdelibs kde_baseapps ];
+  buildInputs = [ kdelibs4 kde_baseapps ];
  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
  NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions
  meta = {
@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
    license = "GPL";
    homepage = http://www.krusader.org;
    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
  };
 }
--- a/pkgs/applications/misc/rsibreak/default.nix
+++ b/pkgs/applications/misc/rsibreak/default.nix
@ -1,23 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kdebase_workspace }:
-
-let version = "0.11";
-in
-stdenv.mkDerivation rec {
-  name = "rsibreak-${version}";
-
-  src = fetchurl {
-    url = "mirror://debian/pool/main/r/rsibreak/rsibreak_${version}.orig.tar.gz";
-    sha256 = "0g27aswh8iz5v67v1wkjny4p100vs2gm0lw0qzfkg6sw1pb4i519";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  buildInputs = [ kdelibs kdebase_workspace ];
-
-  meta = {
-    homepage = http://userbase.kde.org/RSIBreak; # http://www.rsibreak.org/ is down since 2011
-    description = "Utility to help prevent repetitive strain injury for KDE 4";
-    inherit (kdelibs.meta) platforms maintainers;
-  };
-}
--- a/pkgs/applications/misc/semnotes/default.nix
+++ b/pkgs/applications/misc/semnotes/default.nix
@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, kdelibs, soprano, automoc4, phonon, shared_desktop_ontologies }:
-stdenv.mkDerivation {
-  name = "semnotes-0.4.0-1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
-    sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m";
-  };
-
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon soprano shared_desktop_ontologies ];
-
-  meta = with stdenv.lib; {
-    description = "Semantic note-taking tool for KDE based on Nepomuk-KDE";
-    longDescription = ''
-      SemNotes links notes to the data that is available on the user's desktop.
-      The data stored about a note consists of: a title, content, tags, creation
-      and last modification time. The notes and all the information about them
-      are stored as RDF resources in the Nepomuk repository. They are
-      automatically linked to the resources they reference.
-    '';
-    license = "GPL";
-    homepage = http://smile.deri.ie/projects/semn;
-    maintainers = [ maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/applications/misc/yakuake/3.0.nix
+++ b/pkgs/applications/misc/yakuake/3.0.nix
@ -1,63 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchurl
-, kdoctools
-, kdeWrapper
-, ecm
-, karchive
-, kcrash
-, kdbusaddons
-, ki18n
-, kiconthemes
-, knewstuff
-, knotifications
-, knotifyconfig
-, konsole
-, kparts
-, kwindowsystem
-}:
-
-let
-  unwrapped = let
-    pname = "yakuake";
-    version = "3.0.2";
-  in kdeDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5";
-    };
-
-    buildInputs = [
-      karchive
-      kcrash
-      kdbusaddons
-      ki18n
-      kiconthemes
-      knewstuff
-      knotifications
-      knotifyconfig
-      kparts
-      kwindowsystem
-    ];
-
-    nativeBuildInputs = [
-      ecm kdoctools
-    ];
-
-    meta = {
-      homepage = https://yakuake.kde.org;
-      description = "Quad-style terminal emulator for KDE";
-      maintainers = with lib.maintainers; [ fridh ];
-    };
-  };
-
-
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/yakuake" ];
-  paths = [ konsole.unwrapped ];
-}
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@ -1,28 +1,63 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, konsole }:
+{ kdeDerivation
+, lib
+, fetchurl
+, kdoctools
+, kdeWrapper
+, ecm
+, karchive
+, kcrash
+, kdbusaddons
+, ki18n
+, kiconthemes
+, knewstuff
+, knotifications
+, knotifyconfig
+, konsole
+, kparts
+, kwindowsystem
+}:

 let
-  pname = "yakuake";
-  version = "2.9.9";
+  unwrapped = let
+    pname = "yakuake";
+    version = "3.0.2";
+  in kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchurl {
+      url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5";
+    };
+
+    buildInputs = [
+      karchive
+      kcrash
+      kdbusaddons
+      ki18n
+      kiconthemes
+      knewstuff
+      knotifications
+      knotifyconfig
+      kparts
+      kwindowsystem
+    ];
+
+    nativeBuildInputs = [
+      ecm kdoctools
+    ];
+
+    meta = {
+      homepage = https://yakuake.kde.org;
+      description = "Quad-style terminal emulator for KDE";
+      maintainers = with lib.maintainers; [ fridh ];
+    };
+  };
+
+
 in
-stdenv.mkDerivation {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce";
-  };
-
-  buildInputs = [ kdelibs ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  propagatedUserEnvPkgs = [ konsole ];
-
-  meta = {
-    homepage = http://yakuake.kde.org;
-    description = "Quad-style terminal emulator for KDE";
-    inherit (kdelibs.meta) platforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
+kdeWrapper
+{
+  inherit unwrapped;
+  targets = [ "bin/yakuake" ];
+  paths = [ konsole.unwrapped ];
 }
--- a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
+++ b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff
@ -1,33 +0,0 @@
--- a/src/webpage.cpp
-+++ b/src/webpage.cpp
-@@ -226,23 +226,26 @@
-     doc += QL1S( "<h3>" );
-     doc += i18n( "Details of the Request:" );
-     doc += QL1S( "</h3><ul><li>" );
-    doc += i18n( "URL: %1", reqUrl.url() );
-+    // escape URL twice: once for i18n, and once for HTML.
-+    doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) );
-     doc += QL1S( "</li><li>" );
- 
-     const QString protocol (reqUrl.protocol());
-     if ( !protocol.isNull() ) {
-        doc += i18n( "Protocol: %1", protocol );
-+        // escape protocol twice: once for i18n, and once for HTML.
-+        doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) );
-         doc += QL1S( "</li><li>" );
-     }
- 
-     doc += i18n( "Date and Time: %1",
-                  KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) );
-     doc += QL1S( "</li><li>" );
-    doc += i18n( "Additional Information: %1" ,  text );
-+    // escape text twice: once for i18n, and once for HTML.
-+    doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) );
-     doc += QL1S( "</li></ul><h3>" );
-     doc += i18n( "Description:" );
-     doc += QL1S( "</h3><p>" );
-    doc += description;
-+    doc += Qt::escape( description );
-     doc += QL1S( "</p>" );
- 
-     if ( causes.count() ) {
--- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix
+++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix
@ -1,25 +0,0 @@
-{ stdenv, fetchgit, automoc4, cmake, perl, pkgconfig, kdelibs }:
-
-stdenv.mkDerivation rec {
-  name = "kwebkitpart-${version}";
-  version = "1.3.3";
-
-  src = fetchgit {
-    url = git://anongit.kde.org/kwebkitpart;
-    rev = "refs/tags/v${version}";
-    sha256 = "13vfv88njml7x67a37ymmlv9qs30fkmvkq0278lp7llmvp5qnxcj";
-  };
-
-  patches = [ ./CVE-2014-8600.diff ];
-
-  buildInputs = [ kdelibs ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.phreedom ];
-    description = "A WebKit KPart for Konqueror, Akregator and other KDE applications";
-    homepage = https://projects.kde.org/projects/extragear/base/kwebkitpart;
-  };
-}
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@ -1,26 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kde4, shared_desktop_ontologies, qca2, qoauth }:
-
-assert builtins.compareVersions "4.8.3" kde4.release != 1; # https://bugs.kde.org/show_bug.cgi?id=306077
-
-stdenv.mkDerivation rec {
-  name = "rekonq-2.4.2"; # >=1.80 need kde >=4.9.0
-
-  src = fetchurl {
-    url = "mirror://sourceforge/rekonq/${name}.tar.xz";
-    sha256 = "09jihyf4xl7bwfwahwwbx6f11h3zqljccchnpl4mijljylr5p079";
-  };
-
-  buildInputs = [ kde4.kdelibs qca2 qoauth ];
-
-  nativeBuildInputs = [
-    automoc4 cmake gettext perl pkgconfig shared_desktop_ontologies
-  ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = [ maintainers.urkud ];
-    description = "KDE Webkit browser";
-    homepage = https://rekonq.kde.org/;
-  };
-}
--- a/pkgs/applications/networking/instant-messengers/choqok/default.nix
+++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix
@ -1,26 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, pkgconfig, phonon, qca2, qjson, qoauth }:
-
-let
-  pn = "choqok";
-  v = "1.5";
-in
-
-stdenv.mkDerivation rec {
-  name = "${pn}-${v}";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz";
-    sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4";
-  };
-
-  buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
-    automoc4 pkgconfig phonon qca2 qjson qoauth ];
-
-  meta = with stdenv.lib; {
-    description = "A KDE microblogging client";
-    repositories.git = git://anongit.kde.org/choqok;
-    license = "GPL";
-    inherit (kdelibs.meta) maintainers platforms;
-  };
-}
--- a/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/kde/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, automoc4, cmake, gettext, perl, pkgconfig
-, telepathy_qt, kdelibs, kde_workspace, dbus_glib, dbus_libs, farstream
+, telepathy_qt, kdelibs4, kde_workspace, dbus_glib, dbus_libs, farstream
 , qt_gstreamer1, telepathy_glib, telepathy_logger
 , qjson, flex, bison, qca2 }:

@ -48,12 +48,12 @@ let
        nativeBuildInputs =
          [ automoc4 cmake gettext perl pkgconfig ]
          ++ (stdenv.lib.attrByPath [ key ] [] extraNativeBuildInputs);
-        buildInputs = [ kdelibs telepathy_qt ]
+        buildInputs = [ kdelibs4 telepathy_qt ]
          ++ stdenv.lib.optional (name != "ktp-common-internals") ktp.common_internals
          ++ (stdenv.lib.attrByPath [ key ] [] extraBuildInputs);

        meta = {
-          inherit (kdelibs.meta) platforms;
+          inherit (kdelibs4.meta) platforms;
          maintainers = [ stdenv.lib.maintainers.urkud ];
        };
      }
--- a/pkgs/applications/networking/irc/konversation/1.6.nix
+++ b/pkgs/applications/networking/irc/konversation/1.6.nix
@ -1,82 +0,0 @@
-{ kdeDerivation
-, lib
-, fetchurl
-, ecm
-, kbookmarks
-, karchive
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdbusaddons
-, kdeWrapper
-, kdoctools
-, kemoticons
-, kglobalaccel
-, ki18n
-, kiconthemes
-, kidletime
-, kitemviews
-, knotifications
-, knotifyconfig
-, kio
-, kparts
-, kwallet
-, makeQtWrapper
-, solid
-, sonnet
-, phonon
-}:
-
-let
-  unwrapped = let
-    pname = "konversation";
-    version = "1.6.2";
-  in kdeDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
-    };
-
-    buildInputs = [
-      kbookmarks
-      karchive
-      kconfig
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdoctools
-      kemoticons
-      kglobalaccel
-      ki18n
-      kiconthemes
-      kidletime
-      kitemviews
-      knotifications
-      knotifyconfig
-      kio
-      kparts
-      kwallet
-      solid
-      sonnet
-      phonon
-    ];
-
-    nativeBuildInputs = [
-      ecm
-      kdoctools
-    ];
-
-    meta = {
-      description = "Integrated IRC client for KDE";
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ fridh ];
-      homepage = https://konversation.kde.org;
-    };
-  };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konversation" ];
-}
-
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@ -1,26 +1,82 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, libXScrnSaver
-, kdelibs, kdepimlibs, automoc4, phonon, qca2}:
+{ kdeDerivation
+, lib
+, fetchurl
+, ecm
+, kbookmarks
+, karchive
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdeWrapper
+, kdoctools
+, kemoticons
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kidletime
+, kitemviews
+, knotifications
+, knotifyconfig
+, kio
+, kparts
+, kwallet
+, makeQtWrapper
+, solid
+, sonnet
+, phonon
+}:

 let
-  pn = "konversation";
-  v = "1.5.1";
-in
+  unwrapped = let
+    pname = "konversation";
+    version = "1.6.2";
+  in kdeDerivation rec {
+    name = "${pname}-${version}";

-stdenv.mkDerivation rec {
-  name = "${pn}-${v}";
+    src = fetchurl {
+      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
+    };

-  src = fetchurl {
-    url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
-    sha256 = "11hrjrq4r6v1v14ybx9llgzmrl3a45z26n292nb0q887rg1qv0wp";
-  };
-
-  buildInputs = [ cmake qt4 perl gettext libXScrnSaver kdelibs kdepimlibs
-    automoc4 phonon qca2 ];
-
-  meta = with stdenv.lib; {
-    description = "Integrated IRC client for KDE";
-    repositories.git = git://anongit.kde.org/konversation;
-    license = "GPL";
-    inherit (kdelibs.meta) maintainers platforms;
+    buildInputs = [
+      kbookmarks
+      karchive
+      kconfig
+      kconfigwidgets
+      kcoreaddons
+      kdbusaddons
+      kdoctools
+      kemoticons
+      kglobalaccel
+      ki18n
+      kiconthemes
+      kidletime
+      kitemviews
+      knotifications
+      knotifyconfig
+      kio
+      kparts
+      kwallet
+      solid
+      sonnet
+      phonon
+    ];
+
+    nativeBuildInputs = [
+      ecm
+      kdoctools
+    ];
+
+    meta = {
+      description = "Integrated IRC client for KDE";
+      license = with lib.licenses; [ gpl2 ];
+      maintainers = with lib.maintainers; [ fridh ];
+      homepage = https://konversation.kde.org;
+    };
  };
+in kdeWrapper {
+  inherit unwrapped;
+  targets = [ "bin/konversation" ];
 }
+
--- a/pkgs/applications/networking/irc/kvirc/default.nix
+++ b/pkgs/applications/networking/irc/kvirc/default.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, perl, gettext, kdelibs, openssl, zlib}:
-
-let
-  pn = "kvirc";
-  v = "4.2.0";
-in
-
-stdenv.mkDerivation {
-  name = "${pn}-${v}";
-
-  src = fetchurl {
-    url = "ftp://ftp.kvirc.de/pub/${pn}/${v}/source/${pn}-${v}.tar.bz2";
-    sha256 = "9a547d52d804e39c9635c8dc58bccaf4d34341ef16a9a652a5eb5568d4d762cb";
-  };
-
-  buildInputs = [ cmake qt4 perl gettext kdelibs openssl zlib ];
-
-  meta = with stdenv.lib; {
-    description = "Graphic IRC client with Qt";
-    license = licenses.gpl3;
-    homepage = http://www.kvirc.net/;
-    platforms   = platforms.linux;
-  };
-}
--- a/pkgs/applications/networking/irc/quassel/default.nix
+++ b/pkgs/applications/networking/irc/quassel/default.nix
@ -1,15 +1,26 @@
 { monolithic ? true # build monolithic Quassel
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
-, previews ? false # enable webpage previews on hovering over URLs
 , tag ? "" # tag added to the package name
-, withKDE ? stdenv.isLinux # enable KDE integration
-, kdelibs ? null
 , static ? false # link statically

-, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }:
+, stdenv, fetchurl, cmake, makeWrapper, dconf
+, qtbase, qtscript
+, phonon, libdbusmenu, qca-qt5

-let buildClient = monolithic || client;
+, withKDE ? stdenv.isLinux # enable KDE integration
+, extra-cmake-modules
+, kconfigwidgets
+, kcoreaddons
+, knotifications
+, knotifyconfig
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+}:
+
+let
+    buildClient = monolithic || client;
    buildCore = monolithic || daemon;
 in

@ -17,7 +28,6 @@ assert stdenv.isLinux;

 assert monolithic -> !client && !daemon;
 assert client || daemon -> !monolithic;
-assert withKDE -> kdelibs != null;
 assert !buildClient -> !withKDE; # KDE is used by the client only

 let
@ -31,21 +41,28 @@ in with stdenv; mkDerivation rec {

  enableParallelBuilding = true;

-  buildInputs =
-       [ cmake makeWrapper qt ]
-    ++ lib.optionals buildCore [qca2]
-    ++ lib.optionals withKDE [automoc4 kdelibs phonon];
+  # Prevent ``undefined reference to `qt_version_tag''' in SSL check
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];

-  NIX_CFLAGS_COMPILE = "-fPIC";
+  buildInputs =
+       [ cmake makeWrapper qtbase ]
+    ++ lib.optionals buildCore [qtscript qca-qt5]
+    ++ lib.optionals buildClient [libdbusmenu phonon]
+    ++ lib.optionals (buildClient && withKDE) [
+      extra-cmake-modules kconfigwidgets kcoreaddons
+      knotifications knotifyconfig ktextwidgets kwidgetsaddons
+      kxmlgui
+    ];

  cmakeFlags = [
-    "-DEMBED_DATA=OFF" ]
+    "-DEMBED_DATA=OFF"
+    "-DUSE_QT5=ON"
+  ]
    ++ edf static "STATIC"
    ++ edf monolithic "WANT_MONO"
    ++ edf daemon "WANT_CORE"
    ++ edf client "WANT_QTCLIENT"
-    ++ edf withKDE "WITH_KDE"
-    ++ edf previews "WITH_WEBKIT";
+    ++ edf withKDE "WITH_KDE";

  preFixup =
    lib.optionalString buildClient ''
@ -66,6 +83,6 @@ in with stdenv; mkDerivation rec {
    license = stdenv.lib.licenses.gpl3;
    maintainers = with maintainers; [ phreedom ttuegel ];
    repositories.git = https://github.com/quassel/quassel.git;
-    inherit (qt.meta) platforms;
+    inherit (qtbase.meta) platforms;
  };
 }
--- a/pkgs/applications/networking/irc/quassel/qt-5.nix
+++ b/pkgs/applications/networking/irc/quassel/qt-5.nix
@ -1,88 +0,0 @@
-{ monolithic ? true # build monolithic Quassel
-, daemon ? false # build Quassel daemon
-, client ? false # build Quassel client
-, tag ? "" # tag added to the package name
-, static ? false # link statically
-
-, stdenv, fetchurl, cmake, makeWrapper, dconf
-, qtbase, qtscript
-, phonon, libdbusmenu, qca-qt5
-
-, withKDE ? stdenv.isLinux # enable KDE integration
-, extra-cmake-modules
-, kconfigwidgets
-, kcoreaddons
-, knotifications
-, knotifyconfig
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-}:
-
-let
-    buildClient = monolithic || client;
-    buildCore = monolithic || daemon;
-in
-
-assert stdenv.isLinux;
-
-assert monolithic -> !client && !daemon;
-assert client || daemon -> !monolithic;
-assert !buildClient -> !withKDE; # KDE is used by the client only
-
-let
-  edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
-  source = import ./source.nix { inherit fetchurl; };
-
-in with stdenv; mkDerivation rec {
-  inherit (source) src version;
-
-  name = "quassel${tag}-${version}";
-
-  enableParallelBuilding = true;
-
-  # Prevent ``undefined reference to `qt_version_tag''' in SSL check
-  NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];
-
-  buildInputs =
-       [ cmake makeWrapper qtbase ]
-    ++ lib.optionals buildCore [qtscript qca-qt5]
-    ++ lib.optionals buildClient [libdbusmenu phonon]
-    ++ lib.optionals (buildClient && withKDE) [
-      extra-cmake-modules kconfigwidgets kcoreaddons
-      knotifications knotifyconfig ktextwidgets kwidgetsaddons
-      kxmlgui
-    ];
-
-  cmakeFlags = [
-    "-DEMBED_DATA=OFF"
-    "-DUSE_QT5=ON"
-  ]
-    ++ edf static "STATIC"
-    ++ edf monolithic "WANT_MONO"
-    ++ edf daemon "WANT_CORE"
-    ++ edf client "WANT_QTCLIENT"
-    ++ edf withKDE "WITH_KDE";
-
-  preFixup =
-    lib.optionalString buildClient ''
-        wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \
-          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = http://quassel-irc.org/;
-    description = "Qt/KDE distributed IRC client suppporting a remote daemon";
-    longDescription = ''
-      Quassel IRC is a cross-platform, distributed IRC client,
-      meaning that one (or multiple) client(s) can attach to
-      and detach from a central core -- much like the popular
-      combination of screen and a text-based IRC client such
-      as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5).
-    '';
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = with maintainers; [ phreedom ttuegel ];
-    repositories.git = https://github.com/quassel/quassel.git;
-    inherit (qtbase.meta) platforms;
-  };
-}
--- a/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch
+++ b/pkgs/applications/networking/newsreaders/kwooty/0001-search-paths.patch
@ -1,33 +0,0 @@
-From 6b5730e729d72c8d9242163e7061b956abee61f5 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 12 Sep 2015 16:14:10 -0500
-Subject: [PATCH] search paths
-
---
- src/utilities/utility.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/utilities/utility.cpp b/src/utilities/utility.cpp
-index 2e322aa..2e9e4d2 100644
--- a/src/utilities/utility.cpp
-+++ b/src/utilities/utility.cpp
-@@ -299,6 +299,7 @@ QString Utility::searchExternalPrograms(const QString& programToSearch, bool& pr
- 
-     QString programPathName;
-     QStringList searchPathList = Settings::searchPathList();
-+    searchPathList << "/usr/bin/unpar" << "/usr/bin/unrar" << "/usr/bin/7z";
- 
-     QStringList programsWithDifferentNames = programToSearch.split(";");
- 
-@@ -368,7 +369,7 @@ QStringList Utility::buildPriorityArgument(const int& processPriority, const int
-     QStringList niceProcessArgs;
- 
-     // look for 'nice' location :
-    QString nicePath = KStandardDirs::findExe("nice");
-+    QString nicePath = QString("/usr/bin/nice");
-     niceProcessArgs.append(nicePath);
-     niceProcessArgs.append("-n");
- 
-- 
-2.5.0
-
--- a/pkgs/applications/networking/newsreaders/kwooty/default.nix
+++ b/pkgs/applications/networking/newsreaders/kwooty/default.nix
@ -1,39 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, gettext
-, kdelibs, kdebase_workspace, perl
-, openssl, phonon, automoc4
-, libX11, libXext, libXft
-, unrar, p7zip, par2cmdline, coreutils
-}:
-
-let version = "1.1.0";
-    name = "kwooty-${version}";
-in stdenv.mkDerivation {
-  inherit name;
-
-  src = fetchurl {
-    url = "https://dl.opendesktop.org/api/files/download/id/1466631747/114385-${name}.tar.gz";
-    sha256 = "10a9asjv6ja1xdjli2399dyka2rbia3qdm5bdpmcng6xdsbhx3ap";
-  };
-
-  patches = [ ./0001-search-paths.patch ];
-
-  postPatch = ''
-    echo "Changing paths to archive utilities to the nix store";
-    substituteInPlace "src/utility.cpp" \
-      --replace "/usr/bin/unrar" "${unrar}/bin" \
-      --replace "/usr/bin/unpar" "${par2cmdline}/bin" \
-      --replace "/usr/bin/7z" "${p7zip}/bin" \
-      --replace "/usr/bin/nice" "${coreutils}/bin/nice"
-  '';
-
-  buildInputs =
-    [ stdenv perl cmake qt4 gettext automoc4 openssl
-      kdelibs kdebase_workspace phonon
-      libX11 libXext libXft
-    ];
-
-  meta = {
-    description = "Binary news reader of KDE";
-    broken = true;
-  };
-}
--- a/pkgs/applications/networking/p2p/ktorrent/5.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/5.nix
@ -1,41 +0,0 @@
-{ stdenv, fetchurl, cmake
-, ecm, qtbase, qtscript
-, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
-, libktorrent, boost, taglib
-}:
-
-stdenv.mkDerivation rec {
-  name = pname + "-" + version;
-
-  pname = "ktorrent";
-  version = "5.0.1";
-
-  src = fetchurl {
-    url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
-    sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
-  };
-
-  patches =
-    [ (fetchurl {
-        url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
-        sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
-      })
-    ];
-
-  nativeBuildInputs = [ kdoctools ecm ];
-
-  buildInputs =
-    [ cmake qtbase qtscript
-      ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
-      libktorrent taglib
-    ];
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "KDE integrated BtTorrent client";
-    homepage = https://www.kde.org/applications/internet/ktorrent/;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
--- a/pkgs/applications/networking/p2p/ktorrent/default.nix
+++ b/pkgs/applications/networking/p2p/ktorrent/default.nix
@ -1,32 +1,41 @@
-{ stdenv, fetchurl, cmake, automoc4, libktorrent, taglib, kdepimlibs, boost
-, gettext, kdebase_workspace, qt4, kdelibs, phonon }:
+{ stdenv, fetchurl, cmake
+, ecm, qtbase, qtscript
+, ki18n, kio, knotifications, knotifyconfig, kdoctools, kross, kcmutils, kdelibs4support
+, libktorrent, boost, taglib
+}:

 stdenv.mkDerivation rec {
  name = pname + "-" + version;

  pname = "ktorrent";
-  version = "4.3.1";
+  version = "5.0.1";

  src = fetchurl {
-    url = "${meta.homepage}/downloads/${version}/${name}.tar.bz2";
-    sha256 = "66094f6833347afb0c49e332f0ec15ec48db652cbe66476840846ffd5ca0e4a1";
+    url = http://download.kde.org/stable/ktorrent/5.0/ktorrent-5.0.1.tar.xz;
+    sha256 = "1rbr932djmn1la6vs2sy1zdf39fmla8vwzfn76h7csncbp5fw3yh";
  };

-  patches = [ ./find-workspace.diff ];
+  patches =
+    [ (fetchurl {
+        url = https://cgit.kde.org/ktorrent.git/patch/?id=f48acc22f0105ce6bac63294d248873ae231c6cc;
+        sha256 = "0jm4y35w2ypbjzf165rnjr224nq4w651ydnpd9zdn3inxh8r4s0v";
+      })
+    ];

-  KDEDIRS = libktorrent;
+  nativeBuildInputs = [ kdoctools ecm ];

  buildInputs =
-    [ cmake qt4 kdelibs automoc4 phonon libktorrent boost taglib kdepimlibs
-      gettext kdebase_workspace
+    [ cmake qtbase qtscript
+      ki18n kio knotifications knotifyconfig kross kcmutils kdelibs4support
+      libktorrent taglib
    ];

  enableParallelBuilding = true;

  meta = {
    description = "KDE integrated BtTorrent client";
-    homepage = http://ktorrent.pwsp.net;
-    maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-    inherit (libktorrent.meta) platforms;
+    homepage = https://www.kde.org/applications/internet/ktorrent/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
  };
 }
--- a/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
+++ b/pkgs/applications/networking/p2p/ktorrent/find-workspace.diff
@ -1,29 +0,0 @@
-Fix finding kworkspace.h
-diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt
-index 59e5470..5b932ff 100644
--- a/plugins/shutdown/CMakeLists.txt
-+++ b/plugins/shutdown/CMakeLists.txt
-@@ -1,6 +1,8 @@
- set(KWORKSPACE_FOUND FALSE)
-FIND_PATH(KWORKSPACE_INCLUDE_DIR NAMES kworkspace.h  PATHS ${KDE4_INCLUDE_DIR}/kworkspace ${INCLUDE_INSTALL_DIR}/kworkspace.h)
-FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
-+FIND_PATH(KWORKSPACE_INCLUDE_DIR
-+	NAMES kworkspace/kworkspace.h
-+	HINTS ${KDE4_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR})
-+FIND_LIBRARY(KWORKSPACE_LIBRARY NAMES kworkspace HINTS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR})
- 
- if(KWORKSPACE_INCLUDE_DIR AND KWORKSPACE_LIBRARY)
- 	set(KWORKSPACE_FOUND TRUE)
-diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
-index e233353..1efc20b 100644
--- a/plugins/shutdown/shutdownplugin.cpp
-+++ b/plugins/shutdown/shutdownplugin.cpp
-@@ -19,7 +19,7 @@
- ***************************************************************************/
- #include <kjob.h>
- #include <kgenericfactory.h>
-#include <kworkspace.h>
-+#include <kworkspace/kworkspace.h>
- #include <ktoggleaction.h>
- #include <kactioncollection.h>
- #include <kmessagebox.h>
--- a/pkgs/applications/office/basket/default.nix
+++ b/pkgs/applications/office/basket/default.nix
@ -1,25 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, qimageblitz, kdepimlibs, gpgme
-}:
-
-stdenv.mkDerivation rec {
-  name = "basket-1.81";
-
-  src = fetchurl {
-    url = "http://basket.kde.org/downloads/${name}.tar.bz2";
-    sha256 = "10zxlgz96iwmqz30sw6f20pzjmnjvqhx7b5ihfwz47agyfdb98v0";
-  };
-
-  KDEDIRS = kdepimlibs;
-
-  buildInputs = [ kdelibs qimageblitz kdepimlibs gpgme ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    description = "A multi-purpose note-taking application";
-    homepage = http://basket.kde.org/;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
-  };
-}
--- a/pkgs/applications/office/calligra/default.nix
+++ b/pkgs/applications/office/calligra/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs, lcms2, libpng, eigen
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig, kdelibs4, lcms2, libpng, eigen
 , exiv2, boost, sqlite, icu, vc, shared_mime_info, librevenge, libodfgen, libwpg
 , libwpd, poppler_qt4, ilmbase, gsl, qca2, marble, libvisio, libmysql, postgresql
 , freetds, fftw, glew, libkdcraw, pstoedit, opencolorio, kdepimlibs
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];

  buildInputs = [
-    kdelibs lcms2 libpng eigen
+    kdelibs4 lcms2 libpng eigen
    exiv2 boost sqlite icu vc shared_mime_info librevenge libodfgen libwpg
    libwpd poppler_qt4 ilmbase gsl qca2 marble libvisio libmysql postgresql
    freetds fftw glew libkdcraw opencolorio kdepimlibs
@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
    '';
    homepage = http://calligra.org;
    maintainers = with maintainers; [ urkud phreedom ebzzry ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
    license = licenses.gpl2;
  };
 }
--- a/pkgs/applications/office/eventlist/default.nix
+++ b/pkgs/applications/office/eventlist/default.nix
@ -1,30 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, kdelibs, kdepimlibs, akonadi, boost }:
-
-stdenv.mkDerivation rec {
-  name = "plasmoid-eventlist-0.6.96";
-
-  src = fetchurl {
-    url = "http://kde-look.org/CONTENT/content-files/107779-plasmoid-eventlist-0.6.96.tar.bz2";
-    sha256 = "26cc7bd1c465bf1379fd0ba1fa8592eaa62f2553734d1b283e17359103908eea";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-  buildInputs = [ kdelibs kdepimlibs akonadi boost ];
-
-  meta = {
-    inherit (kdelibs.meta) platforms;
-    description = "KDE Plasmoid to show events and todos on the desktop";
-    longDescription = ''
-      This is a plasmoid to show the events and todos from Akonadi resources (KOrganizer, Birthdays etc.).
-      With a google resource also Google calendar items can be shown.
-      Also possible with a CalDAV resource.
-      A facebook resource is also available.
-
-      Incidences can be filtered, added, edited, deleted via context menu.
-    '';
-    homepage = "http://kde-look.org/content/show.php/Eventlist?content=107779";
-    license = stdenv.lib.licenses.gpl3Plus;
-
-	  };
-}
--- a/pkgs/applications/office/kbibtex/default.nix
+++ b/pkgs/applications/office/kbibtex/default.nix
@ -1,21 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, libxslt, poppler_qt4
-}:
-
-stdenv.mkDerivation rec {
-  pname = "kbibtex";
-  version = "0.4";
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://download.gna.org/${pname}/${version}/${name}.tar.bz2";
-    sha256 = "1hq0az0dp96195z26wjfwj9ynd57pfv13f1xcl5vbsswcjfrczws";
-  };
-
-  patchPhase = ''
-    sed -e '25i#include <QModelIndex>' -i src/gui/preferences/settingsabstractwidget.h
-    '';
-
-  buildInputs = [ kdelibs libxslt poppler_qt4 ];
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-}
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@ -1,34 +0,0 @@
-{ stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
-, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
-, doxygen, aqbanking, gwenhywfar }:
-
-stdenv.mkDerivation rec {
-  name = "kmymoney-${version}";
-  version = "4.8.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kmymoney/${version}/src/${name}.tar.xz";
-    sha256 = "1hlayhcmdfayma4hchv2bfyg82ry0h74hg4095d959mg19qkb9n2";
-  };
-
-  cmakeFlags = [
-    "-DENABLE_KBANKING='true'"
-  ];
-
-  buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
-                  doxygen aqbanking gwenhywfar ];
-  nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];
-
-  KDEDIRS = libalkimia;
-
-  patches = [
-    ./qgpgme.patch
-    ./seqaccessmgrtest.patch
-  ];
-
-  meta = {
-    homepage = http://kmymoney2.sourceforge.net/;
-    description = "KDE personal money manager";
-    inherit (kdelibs.meta) platforms maintainers;
-  };
-}
--- a/pkgs/applications/office/kmymoney/qgpgme.patch
+++ b/pkgs/applications/office/kmymoney/qgpgme.patch
@ -1,17 +0,0 @@
-KMymoney tries to find qgpgme before kdepimlibs. This is wrong because
-FindQGpgme is installed by kdepimlibs, thus can be invisible until kdepimlibs
-found.
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f6d7305..88bac67 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,8 +59,8 @@ else (WIN32)
-   find_package(Boost "1.33.1" COMPONENTS graph)
- endif (WIN32)
- # needed by libkgpgfile
-find_package(QGpgme REQUIRED)
- find_package(KdepimLibs REQUIRED)
-+find_package(QGpgme REQUIRED)
- find_package(SharedMimeInfo REQUIRED)
- 
- add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} ${KDEPIM_DEFINITIONS})
--- a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch
+++ b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch
@ -1,26 +0,0 @@
-Fix tests for 32bit builds until we can bring these upstream
-diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-index dcb4b4a..e803203 100644
--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-+++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
-@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor()
-   QCOMPARE(m->m_nextPayeeID, 0ul);
-   QCOMPARE(m->m_nextScheduleID, 0ul);
-   QCOMPARE(m->m_nextReportID, 0ul);
-  QCOMPARE(m->m_institutionList.count(), 0ul);
-  QCOMPARE(m->m_accountList.count(), 5ul);
-  QCOMPARE(m->m_transactionList.count(), 0ul);
-  QCOMPARE(m->m_transactionKeys.count(), 0ul);
-  QCOMPARE(m->m_payeeList.count(), 0ul);
-  QCOMPARE(m->m_tagList.count(), 0ul);
-  QCOMPARE(m->m_scheduleList.count(), 0ul);
-+  QCOMPARE(m->m_institutionList.count(), (size_t)0);
-+  QCOMPARE(m->m_accountList.count(), (size_t)5);
-+  QCOMPARE(m->m_transactionList.count(), (size_t)0);
-+  QCOMPARE(m->m_transactionKeys.count(), (size_t)0);
-+  QCOMPARE(m->m_payeeList.count(), (size_t)0);
-+  QCOMPARE(m->m_tagList.count(), (size_t)0);
-+  QCOMPARE(m->m_scheduleList.count(), (size_t)0);
- 
-   QCOMPARE(m->m_dirty, false);
-   QCOMPARE(m->m_creationDate, QDate::currentDate());
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf
@ -252,7 +252,7 @@ in stdenv.mkDerivation rec {
      libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
      gdb
    ]
-    ++ lib.optional kdeIntegration kde4.kdelibs;
+    ++ lib.optional kdeIntegration kdelibs4;

  passthru = {
    inherit srcs;
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kde4, clucene_core, libcdr, lcms, vigra
+, libwpg, dbus_glib, glibc, qt4, kdelibs4, clucene_core, libcdr, lcms, vigra
 , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
@ -247,7 +247,7 @@ in stdenv.mkDerivation rec {
      librevenge libe-book libmwaw glm glew ncurses
      libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
    ]
-    ++ lib.optional kdeIntegration kde4.kdelibs;
+    ++ lib.optional kdeIntegration kdelibs4;

  passthru = {
    inherit srcs;
--- a/pkgs/applications/office/skrooge/2.nix
+++ b/pkgs/applications/office/skrooge/2.nix
@ -1,35 +0,0 @@
-{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee,
-  kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
-  kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
-  knotifyconfig, krunner, libofx }:
-
-stdenv.mkDerivation rec {
-  name = "skrooge-${version}";
-  version = "2.7.0";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
-  };
-
-  nativeBuildInputs = [ cmake ecm makeQtWrapper ];
-
-  buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
-    kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
-    kdelibs4support kactivities knotifyconfig krunner libofx
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/skrooge"
-    wrapQtProgram "$out/bin/skroogeconvert"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A personal finances manager, powered by KDE";
-    license = with licenses; [ gpl3 ];
-    maintainers = with maintainers; [ joko ];
-    homepage = https://skrooge.org/;
-  };
-}
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@ -1,22 +1,35 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig, shared_mime_info
-, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, boost }:
+{ stdenv, fetchurl, cmake, ecm, makeQtWrapper, qtwebkit, qtscript, grantlee,
+  kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
+  kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
+  knotifyconfig, krunner, libofx }:

 stdenv.mkDerivation rec {
-  name = "skrooge-1.12.5";
+  name = "skrooge-${version}";
+  version = "2.7.0";

  src = fetchurl {
    url = "http://download.kde.org/stable/skrooge/${name}.tar.xz";
-    sha256 = "1mnkm0367knh0a65gifr20p42ql9zndw7d6kmbvfshvpfsmghl40";
+    sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
  };

-  buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ];
+  nativeBuildInputs = [ cmake ecm makeQtWrapper ];

-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig shared_mime_info ];
+  buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
+    kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
+    kdelibs4support kactivities knotifyconfig krunner libofx
+  ];

-  meta = {
-    inherit (kdelibs.meta) platforms;
-    description = "A personal finance manager for KDE";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    license = stdenv.lib.licenses.gpl3;
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/skrooge"
+    wrapQtProgram "$out/bin/skroogeconvert"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A personal finances manager, powered by KDE";
+    license = with licenses; [ gpl3 ];
+    maintainers = with maintainers; [ joko ];
+    homepage = https://skrooge.org/;
  };
 }
--- a/pkgs/applications/office/zanshin/default.nix
+++ b/pkgs/applications/office/zanshin/default.nix
@ -1,5 +1,5 @@
 { stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, kdepimlibs, boost, baloo }:
+, kdelibs4, kdepimlibs, boost, baloo }:

 stdenv.mkDerivation rec {
  name = "zanshin-0.3.1";
@ -11,11 +11,11 @@ stdenv.mkDerivation rec {

  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];

-  buildInputs = [ kdelibs kdepimlibs boost baloo ];
+  buildInputs = [ kdelibs4 kdepimlibs boost baloo ];

  meta = {
    description = "GTD for KDE";
    maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (kdelibs.meta) platforms;
+    inherit (kdelibs4.meta) platforms;
  };
 }
--- a/pkgs/applications/science/robotics/gazebo/default.nix
+++ b/pkgs/applications/science/robotics/gazebo/default.nix
@ -5,7 +5,7 @@
  , pythonPackages, utillinux

  # these deps are hidden; cmake doesn't catch them
-  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, kde4, x11
+  , gazeboSimulator, sdformat ? gazeboSimulator.sdformat, curl, tinyxml, qt4, x11
  , withIgnitionTransport ? true
  , libav, withLibAvSupport ? true
  , openal, withAudioSupport ? false
@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
    curl
    tinyxml
    x11
-    kde4.qt4
+    qt4
  ] ++ optional stdenv.isLinux utillinux # on Linux needs uuid/uuid.h
    ++ optional withDocs doxygen
    ++ optional withLibAvSupport libav  #TODO: package rubygem-ronn and put it here
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@ -1,30 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, gettext, perl, pkgconfig
-, apr, aprutil, subversion, db, kdelibs, expat
-}:
-
-# the homepage mentions this is the final release.
-# from now on, kdesvn will be part of the official kde software distribution
-stdenv.mkDerivation rec {
-  name = "kdesvn-1.6.0";
-
-  src = fetchurl rec {
-    url = "http://pkgs.fedoraproject.org/repo/pkgs/kdesvn/${name}.tar.bz2/7e6adc98ff4777a06d5752d3f2b58fa3/${name}.tar.bz2";
-    sha256 = "15hg6xyx5rqldfhi1yhq5ss15y6crm2is3zqm680z0bndcj6ys05";
-  };
-
-  prePatch = ''
-    sed -i -e "s|/usr|${subversion.dev}|g" src/svnqt/cmakemodules/FindSubversion.cmake
-  '';
-
-  buildInputs = [ apr aprutil subversion db kdelibs expat ];
-
-  nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
-
-  meta = {
-    description = "KDE SVN front-end";
-    license = "GPL";
-    homepage = http://kdesvn.alwins-world.de;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-    inherit (kdelibs.meta) platforms;
-  };
-}
--- a/pkgs/applications/video/bangarang/default.nix
+++ b/pkgs/applications/video/bangarang/default.nix
@ -1,34 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, phonon, soprano, shared_desktop_ontologies
-, kdemultimedia, taglib, glibc, gettext
-}:
-
-stdenv.mkDerivation rec {
-  name = "bangarang-2.1";
-
-  src = fetchurl {
-    url = "http://bangarangissuetracking.googlecode.com/files/${name}.tar.gz";
-    sha256 = "1g4pap79k8qaqi0py34xqvisxln1nc5hbvph692ah3af06n6cly1";
-  };
-
-  buildInputs = [
-    kdelibs phonon soprano shared_desktop_ontologies kdemultimedia
-    taglib gettext
-  ];
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  patches = [ ./gcc-4.7.patch ];
-
-  meta = with stdenv.lib; {
-    description = "A media player for KDE based on Nepomuk and Phonon";
-    longDescription = ''
-      Bangarang offers a minimalistic media center user interface,
-      media collection management, playlists and statistics.
-    '';
-    homepage = http://bangarangkde.wordpress.com/;
-    license = stdenv.lib.licenses.gpl3;
-    maintainers = [ maintainers.phreedom maintainers.urkud ];
-    platforms = platforms.linux;
-  };
-}
--- a/pkgs/applications/video/bangarang/gcc-4.7.patch
+++ b/pkgs/applications/video/bangarang/gcc-4.7.patch
@ -1,45 +0,0 @@
-commit b893fcdb7ddfc8c59fd29a29b7265a713c3dbab1
-Author: Alex Fiestas <afiestas@kde.org>
-Date:   Thu Mar 29 10:09:22 2012 +0200
-
-    Build fix: Add unistd.h include since sleep is defined there
-
-diff --git a/src/platform/infofetchers/lastfminfofetcher.cpp b/src/platform/infofetchers/lastfminfofetcher.cpp
-index 0c49d69..fcc4cd3 100644
--- a/src/platform/infofetchers/lastfminfofetcher.cpp
-+++ b/src/platform/infofetchers/lastfminfofetcher.cpp
-@@ -32,6 +32,8 @@
- #include <QFile>
- #include <QTextEdit>
- 
-+#include <unistd.h>
-+
- LastfmInfoFetcher::LastfmInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tmdbinfofetcher.cpp b/src/platform/infofetchers/tmdbinfofetcher.cpp
-index 7801644..3c01960 100644
--- a/src/platform/infofetchers/tmdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tmdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include <QDomDocument>
- #include <QFile>
- 
-+#include <unistd.h>
-+
- TMDBInfoFetcher::TMDBInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
-diff --git a/src/platform/infofetchers/tvdbinfofetcher.cpp b/src/platform/infofetchers/tvdbinfofetcher.cpp
-index ff351b0..670ed18 100644
--- a/src/platform/infofetchers/tvdbinfofetcher.cpp
-+++ b/src/platform/infofetchers/tvdbinfofetcher.cpp
-@@ -30,6 +30,8 @@
- #include <QDomDocument>
- #include <QFile>
- 
-+#include <unistd.h>
-+
- TVDBInfoFetcher::TVDBInfoFetcher(QObject *parent) :
-         InfoFetcher(parent)
- {
--- a/pkgs/applications/video/kdenlive/default.nix
+++ b/pkgs/applications/video/kdenlive/default.nix
@ -1,41 +0,0 @@
-{ stdenv, fetchurl, frei0r, lib, cmake, qt4, perl, kdelibs, automoc4
-, phonon , makeWrapper, mlt, gettext , qimageblitz, qjson
-, shared_mime_info, soprano, pkgconfig, shared_desktop_ontologies
-, libv4l, oxygen_icons
-}:
-
-stdenv.mkDerivation rec {
-  name = "kdenlive-${version}";
-  version = "0.9.10";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdenlive/${version}/src/${name}.tar.bz2";
-    sha256 = "0qxpxnfbr8g6xq0h32skgqqi2xylrv2bnmyx5x1cws9y2wwxp3zn";
-  };
-
-  buildInputs = [
-    frei0r kdelibs libv4l mlt phonon qimageblitz qjson qt4
-    shared_desktop_ontologies soprano
-  ];
-
-  nativeBuildInputs = [
-    automoc4 cmake gettext makeWrapper perl pkgconfig shared_mime_info
-  ];
-
-  propagatedUserEnvPkgs = [ oxygen_icons ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapProgram $out/bin/kdenlive --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
-    wrapProgram $out/bin/kdenlive_render  --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1
-  '';
-
-  meta = {
-    description = "Free and open source video editor";
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://www.kdenlive.org/;
-    maintainers = with stdenv.lib.maintainers; [ goibhniu viric ];
-    platforms = with stdenv.lib.platforms; linux;
-  };
-}
--- a/pkgs/applications/video/kmplayer/default.nix
+++ b/pkgs/applications/video/kmplayer/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , automoc4, cmake, gettext, makeWrapper, perl, pkgconfig
-, kdelibs, cairo, dbus_glib, mplayer
+, kdelibs4, cairo, dbus_glib, mplayer
 }:

 stdenv.mkDerivation {
@ -12,7 +12,7 @@ stdenv.mkDerivation {
    sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky";
  };

-  buildInputs = [ kdelibs cairo dbus_glib ];
+  buildInputs = [ kdelibs4 cairo dbus_glib ];

  nativeBuildInputs = [ automoc4 cmake gettext makeWrapper perl pkgconfig ];

--- a/pkgs/build-support/kdewrapper/default.nix
+++ b/pkgs/build-support/kdewrapper/default.nix
@ -1,44 +0,0 @@
-{ stdenv, kde4, shared_mime_info, extraLibs ? [] }:
-
-/* Supply a KDE program, and it will have the necessary KDE vars to
-  get icons, mime types, etc. working.
-  For example:
-  
-  packageOverrides = pkgs : {
-    kdenliveWrapped = kde4.wrapper kde4.kdenlive;
-  };
-  */
-program:
-
-let
-  libs = with kde4; [ kdelibs kde_runtime oxygen_icons shared_mime_info ]
-    ++ extraLibs;
-in
-stdenv.mkDerivation {
-  name = program.name + "-wrapped";
-
-  inherit libs;
-
-  buildCommand = ''
-    mkdir -p $out/bin
-
-    KDEDIRS=${program}
-    QT_PLUGIN_PATH=${program}/lib/qt4/plugins:${program}/lib/kde4/plugins
-    for a in $libs; do
-      KDEDIRS=$a''${KDEDIRS:+:}$KDEDIRS
-      QT_PLUGIN_PATH=$a/lib/qt4/plugins:$a/lib/kde4/plugins''${QT_PLUGIN_PATH:+:}$QT_PLUGIN_PATH
-    done
-    for a in ${program}/bin/*; do 
-      PROG=$out/bin/`basename $a` 
-    cat > $PROG << END
-    #!/bin/sh
-    export KDEDIRS=$KDEDIRS\''${KDEDIRS:+:}\$KDEDIRS
-    export QT_PLUGIN_PATH=$QT_PLUGIN_PATH\''${QT_PLUGIN_PATH:+:}\$QT_PLUGIN_PATH
-    exec $a "\$@"
-    END
-    chmod +x $PROG
-    done
-  '';
-
-  preferLocalBuild = true;
-}
--- a/pkgs/desktops/kde-4.14/applications/kate.nix
+++ b/pkgs/desktops/kde-4.14/applications/kate.nix
@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, kactivities, qjson, pythonPackages, pykde4}:
-
-kde {
-
-  buildInputs = [ kdelibs kactivities qjson pythonPackages.pyqt4 pythonPackages.python pykde4 ];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
--- a/pkgs/desktops/kde-4.14/applications/konsole.nix
+++ b/pkgs/desktops/kde-4.14/applications/konsole.nix
@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, kde_baseapps }:
-
-kde {
-
-  buildInputs = [ kdelibs kde_baseapps ];
-
-  meta = {
-    description = "Konsole, the KDE terminal emulator";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}
--- a/pkgs/desktops/kde-4.14/default.nix
+++ b/pkgs/desktops/kde-4.14/default.nix
@ -25,20 +25,10 @@ in

 kde.modules // kde.individual //
 {
-  inherit (kde) manifest modules individual splittedModuleList;
-
-  inherit kdelibs;
-
  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;
--- a/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
+++ b/pkgs/desktops/kde-4.14/files/kde-wallpapers-buildsystem.patch
@ -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)
- 
--- a/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
+++ b/pkgs/desktops/kde-4.14/files/rocs-0001-duplicate-add_test.patch
@ -1,62 +0,0 @@
-From 93081f817f20bbc26b55e1b37b22d60535d153f7 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Thu, 10 Sep 2015 18:41:57 -0500
-Subject: [PATCH] duplicate add_test
-
---
- RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt  | 1 -
- RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt | 1 -
- 5 files changed, 5 deletions(-)
-
-diff --git a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-index 32a2504..4fbb838 100644
--- a/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/dotFileFormat/Tests/CMakeLists.txt
-@@ -33,4 +33,3 @@ target_link_libraries(TestDotFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
-add_test(TestDotFileFormatPlugin TestDotFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-index 615004c..6383bd8 100644
--- a/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/gmlFileFormat/Tests/CMakeLists.txt
-@@ -32,4 +32,3 @@ target_link_libraries(TestGmlFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
-add_test(TestGmlFileFormatPlugin TestGmlFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-index f9cdbfa..842d14b 100644
--- a/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/kmlFileFormat/Tests/CMakeLists.txt
-@@ -30,4 +30,3 @@ target_link_libraries(TestKmlFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
-add_test(TestKmlFileFormatPlugin TestKmlFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-index 33c0da8..70cab8d 100644
--- a/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/tgfFileFormat/Tests/CMakeLists.txt
-@@ -35,4 +35,3 @@ target_link_libraries(TestTgfFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
-add_test(TestTgfFileFormatPlugin TestTgfFileFormatPlugin)
-diff --git a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-index b52736e..58ee40e 100644
--- a/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-+++ b/RocsCore/LoadSave/Plugins/tikzFileFormat/Tests/CMakeLists.txt
-@@ -29,5 +29,4 @@ target_link_libraries(TestTikzFileFormatPlugin
-     ${QT_QTTEST_LIBRARY}
-     ${KDE4_KDECORE_LIBS}
- )
-add_test(TestTikzFileFormatPlugin TestTikzFileFormatPlugin)
- 
-- 
-2.5.0
-
--- a/pkgs/desktops/kde-4.14/kactivities.nix
+++ b/pkgs/desktops/kde-4.14/kactivities.nix
@ -1,4 +1,4 @@
-{ fetchurl, kde, kdelibs, nepomuk_core }:
+{ fetchurl, kde, kdelibs }:

 kde {

@ -13,7 +13,7 @@ kde {

  setOutputFlags = false;

-  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+  propagatedBuildInputs = [ kdelibs ];

  meta = {
    description = "KDE activities library and daemon";
--- a/pkgs/desktops/kde-4.14/kde-base-artwork.nix
+++ b/pkgs/desktops/kde-4.14/kde-base-artwork.nix
@ -1,14 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE Base artwork";
-    license = "GPL";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
+++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix
@ -1,5 +1,4 @@
-{ stdenv, kde, kdelibs, html-tidy, kactivities
-, nepomuk_core, nepomuk_widgets, libXt }:
+{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }:

 kde {
  postPatch = ''
@ -7,7 +6,7 @@ kde {
      --replace buffio.h tidybuffio.h
  '';

-  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ];
+  buildInputs = [ kdelibs html-tidy kactivities libXt ];

  meta = {
    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
--- a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix
@ -1,380 +1,48 @@
 {stable=true;
 hashes=builtins.listToAttrs[
-  {name="amor";value="1n9qhy7pcprhh7a5v5i9xi5pr3a3lbg08j315kbahn89py2wqk6x";}
-  {name="analitza";value="08p4rky4q4c1r5mkw087s31k38xvc8k50fyahf6y0bkc03v7q8h0";}
-  {name="ark";value="1p5q96i7hxp80c3hzxaqfixc3rn16cdnhhhjdaqz7k5zkgmgfbnb";}
-  {name="artikulate";value="1spb3qwf62agc76vnji7hgm1xsahb7i2fg818gmqwd9ndd4rf0fk";}
-  {name="audiocd-kio";value="0572hwlzn4l53d3xi2w20pgdf6wsyankr49q4522ckfjw9zh2p33";}
  {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
-  {name="baloo-widgets";value="1lxwm8cb1f1dy91zr1d54alw0f67d30kixhr7hnbpqlanfw44sbv";}
-  {name="blinken";value="0zmfvj64xzgi9mmdx92csknm6nrgq57z458dmqr82glvdq6sy53w";}
-  {name="bomber";value="09bwp2fnyhi2jq6j36ssvcd02gxihd162b14hj4h76p50q9142ly";}
-  {name="bovo";value="0pflfpnxni01nfmljrb356bvb9sq7xg1yx7ylli8ws591s1wjv2f";}
-  {name="cantor";value="1qb58pnrpn23qr94j1nrdyj87yxc6gr9drra76mq583acra19j4g";}
-  {name="cervisia";value="1dgg0m8l2vb1ypkzq2lvp8d5faxn005z9fylf4pg6yczgj51y2m0";}
-  {name="dolphin-plugins";value="1vb5q9xwxplwxwfs57fqy1bi2hsq96cy1z705lbyiy1pq1g0xw5p";}
-  {name="dragon";value="195hv0l3w6n32qghdbqj3jzl4833lkbw90q53rnay56ia3azd7nk";}
-  {name="ffmpegthumbs";value="1waj02snh48qk8h021p1agy9pifpb7k7848ni9cyr1q76xmqbw3r";}
-  {name="filelight";value="16pp16zdvm8l6aaywj0cvvmpc1fgwr1ik1nf9s3vnj6pnqw91mc1";}
-  {name="granatier";value="08fs7nvhgg33cr54v2ib5p64lc9kmzshl12swsa88sp1fzakpdlj";}
-  {name="gwenview";value="1817nhd3qwghimbh4v57nxpbk9y2z9gh33i9s7rr190fqa5x2ci0";}
-  {name="jovie";value="06cvnycbab5w1vgws6fyfbpdnps63mvss2gnsv6ig1gm18pq8kh4";}
-  {name="juk";value="02dv0v34dbac9wpfj0p1kh438b380025qg0mpnhdisw9ng4igx83";}
-  {name="kaccessible";value="0blkyalm45c1q670wp9jn6mmqq4igw16hlsa39bv1dj82m5f0bkb";}
-  {name="kajongg";value="1f4fv1s1x2bg9ghf317br0kl6lgj9nacmck6fv1g3r14j60z5sfn";}
-  {name="kalgebra";value="0zgnppmnm2g0anq4yldlyd4bncjabr72b66h4s9ns6wd7kk9z6rs";}
-  {name="kalzium";value="1r8phdshq9whcglb7nyjcg8qjqnqya8rj1rm91mwax18jin0i3ab";}
-  {name="kamera";value="09n11d1hvl6xxfsp9j72q6ja103vda54gmrl7lqscnp5nvlfl2vg";}
-  {name="kanagram";value="0ns95365rdzx4v7akrsnbz1vgyl10d5h4jnavg1x08yrq7sm3rcm";}
-  {name="kapman";value="1c27dlpdnnmvxqwsr5359ixl386z54ijs5ysb5vd7f0nw980kjk0";}
-  {name="kapptemplate";value="089znigfd0c4gb318qjbxhyk3gc6j9z4vb4lw76g3nwjkk52s35s";}
-  {name="kate";value="0zbhgrhpa3f9zaf8a9b0s69p05m17rg6harvmyfbb9kgqgi4lgai";}
-  {name="katomic";value="1j3y0zfwcms2wfv2v3jpn6lisl2qw5zhvwswhyc2k44wq934vwq6";}
-  {name="kblackbox";value="1vlc37il59xh6k4zcap7cs25b1r70cbzi0b6jybpwhxrq2zh1zmz";}
-  {name="kblocks";value="16k8j3h8dvjz2yqdb22dkb9z6mi3k28c4wkhpa1l5q151kb8q6ba";}
-  {name="kbounce";value="16g2f6vvax74gqz3jn1b9rfwcdaia7dphnwg37d03ayflp2s7mji";}
-  {name="kbreakout";value="1011gcbajlk4h5z16nyr8xxkqz5k86vwgn1h5k4fqqpbl2g9aryr";}
-  {name="kbruch";value="0jrd0hqqiaghyhj1rw66j0skqs1f7p21czx3adiy2v50ni70i84z";}
-  {name="kcachegrind";value="0954zvzzhfc76msbs7pc10c9nqd4ganqwqdyn051n4204np1fyd6";}
-  {name="kcalc";value="03px8j0ga6bbla6bxbj3ahcw4jxwb4kkqhls0rxldbfkjwz2q1wz";}
-  {name="kcharselect";value="0js5wxdjmzg2yq83m0kpil9mdjwb1bschh8d9hsk044327i9wmz7";}
-  {name="kcolorchooser";value="1z5snm4vxn6whdhxh64kd18bvl58i65qb4p4xdznrc0gyrgnl92a";}
-  {name="kcron";value="1d685808rya0fjysn2smh0d1p6xqcg7a1r3ah54hnj58y4r3rxyc";}
-  {name="kdeartwork";value="1x0fz21xi54gxz4dkk7qhpv9a5j3nc0crgvygpq32jrkvv5ygp4k";}
  {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
-  {name="kde-base-artwork";value="14l83fd6drwpl9j4v876afp3k7na3dirpjwh03c1a7lcn27grzkn";}
-  {name="kde-dev-scripts";value="17zw6ckbvq5iqykc3ijdnp7j0nh4k06jgqwfsrnqnvp5fqqcf1vn";}
-  {name="kde-dev-utils";value="16kdr5i48jlflzdv1y5n2xca2kws5whwlymliqdqy7wlcgy0lh7q";}
-  {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";}
-  {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";}
-  {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";}
-  {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";}
-  {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";}
-  {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";}
  {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
-  {name="kdepim-runtime";value="03xmm9c5whr96bwrdrdmaq8w53qg251g0kd479g02x3br20yi3rd";}
-  {name="kdeplasma-addons";value="094gj8z1xx4d5vlkq8izifpgvh6sfq36bh08n8ylfa976qq8xm8j";}
-  {name="kde-runtime";value="01c6pjsq4xp75yma8wbfpg92lrvvppp9ighlxvy7z2afkd8lx9vq";}
-  {name="kdesdk-kioslaves";value="0k0ff1nq10z0gajr3rnrbhm1rml42d2fi9ahwxdjnxyaav31ml24";}
-  {name="kdesdk-strigi-analyzers";value="12r17q7mg74prir52h80prc61bn5rq1031cbp3xswh658srf1lg0";}
-  {name="kdesdk-thumbnailers";value="1kmdpb52kg04smgp9v5a51bjjrw6fsh347ajnxhr8ygg7d8zw763";}
-  {name="kde-wallpapers";value="05jb5ry6ziz64lqxrmi7c53n8j5hpgrz3lii4y1wnr204342ln6k";}
-  {name="kdewebdev";value="0sclb72i6nbrsz4a5jlxf7mgngdn7wbd669fqa7xw6axrsjj1cgn";}
  {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";}
-  {name="kdf";value="0y5d6d6wl5ycmcswrkgwc301jbj77jnb46sgl38i9q4nf7b3ham0";}
-  {name="kdiamond";value="0z8c07vx3k466ysri1syka0wm0bkz581kb72d5sns86np0rg0wmp";}
  {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
-  {name="kfloppy";value="02sv0k6cqvd9zf7hwsjxgb6l3jawx5fkg1siffbb62cgp49y8fw0";}
-  {name="kfourinline";value="0zhvpbgmk89cn7pjzgdzc4kah8rkjj3w97yym205phc8fc36nwa4";}
-  {name="kgamma";value="1cpm1d0sr3zphkqpfg11farqal2h2hl6gcdnf8p1b10np1b8rxwk";}
-  {name="kgeography";value="125772x1kbh136ymja903w2k7vgahs2d1nw471nr8fx511pnxcj4";}
-  {name="kget";value="1v1j5sfsym1sz8w6ll23il0n4qq74sjx9c9ij29zhdwxy21xasv9";}
-  {name="kgoldrunner";value="1mc93hwl1diygjlpalf2wdzhdnhcjq1mj9srlxhr5f1w0687pzar";}
-  {name="kgpg";value="0ihc5pp1mxsa67ynrvf2mpxwhyni6lkcdarj1xmvpcf56nlkfzdw";}
-  {name="khangman";value="0wddflgsfslbhdpkl39qipnc2xx6b23ci1gr19ipyiyif8d74zix";}
-  {name="kig";value="1kp3rhsfprp9c9f0wp264x9d6n454ff26ysfnli9gl5l2imxhw9f";}
-  {name="kigo";value="1gdsr31ybc07bkcyfrrm4fz081l3l5h5rv46ld0f6rfmxm3xv01j";}
-  {name="killbots";value="1d31pxvjls5a9m521a9n7rynl317585ald1nn4bpk2f138475d12";}
-  {name="kimono";value="17n1nx66kqcc2wfp6ql7xpn8lq9y3b6djf6y1n3ajvyjh8m357jf";}
-  {name="kiriki";value="00iis3vx95nlcarysy9mrbz4jnw4rbxgmjpy48z85imdd7yydd8x";}
-  {name="kiten";value="17n6q1kan8dlxqhnhk73nzn4jg39yw1hh88vsndswmx1s4k68x7r";}
-  {name="kjumpingcube";value="0p9kswv2wnxqgmlvwbcwxrb27b0h6by1zx91k5vmv16qm789gfk9";}
-  {name="klettres";value="01vf6cdiafncv0n35cp5v44azxkjjzn1rp1r8rw05vlmh2296p0l";}
-  {name="klickety";value="0c156fkchcpfybmvc3qkvdqizc62b758drkdqc8pawal8766ff27";}
-  {name="klines";value="1w8k18azfqsb0q90aijn7xfkkfrbnrnfwn6w66wc8xn2b6hibahl";}
-  {name="kmag";value="091h7vb3wcp5zg06mp240a2vdhj18xqw40i25djkl7a861xxhpb8";}
-  {name="kmahjongg";value="0qb933kjv205narrkgr83ha516pldpfxi65l8yhm7801nhljhpsg";}
-  {name="kmines";value="103lzgr7p2ic29afn8imk6mh7ab0pfpcrdwlsg21zkvrrbrcaq6k";}
-  {name="kmix";value="153fif25m7w94g8g20ahg5fjppkf3bi8rn4njq1zl1g0bsnrgpfp";}
-  {name="kmousetool";value="1z62h71mcxdrp4y2dl497x89295m6mlilaqnvp9ijpw6fm4b9czd";}
-  {name="kmouth";value="06n6srd6011bk29w5xnqihvs6pbhmg0sf5h7mwfwp4szvm167hc4";}
-  {name="kmplot";value="1xajighandffidp85rjjch4si0gb3mfjks3yh5i8sig8j4797b86";}
-  {name="knavalbattle";value="1fmh6qds3ql5w3nsw6zk18ia0z4immpwj8sl35qq2kkx1g0hbv0c";}
-  {name="knetwalk";value="0h17ck55fdwipvsdqfdhmn612jb1nrq6vkj0g9i3qchvw9qz0hcs";}
-  {name="kolf";value="006h7iqwn55bjrgsc9p6316lgvxvda0kvcdxxfd4sqg2ain64h7q";}
-  {name="kollision";value="1hc07r3z4w8gqby0pyb5m1ylp8izmvx0ib3dlpmh2jd5khp0qyhj";}
-  {name="kolourpaint";value="0kf6wjxcd80mc4hxb4nhpksxj0bm9339i835iwpsbjfn8xs1s55h";}
-  {name="kompare";value="0zhpw7kz1c9hcmqfhnvsg39xw4zhi36q39bgifcbyfvjs0ymbvi4";}
-  {name="konquest";value="125ciy00h77y7byrlnqv0zhw3pxp9a5i5clz12dlc1z251z3l588";}
-  {name="konsole";value="0mgi0fw5sc216cy8j45g4zd733d02l2d6z4wjcxqm7rh61lhwx9g";}
-  {name="kopete";value="0i9qq7k19vyss1k22ppr6xq3y3bb6mndg8b5323f0cvjlpgcc8xs";}
-  {name="korundum";value="0zapd60frhq652p1xnpaj680vpaqr595dqbhha552c4dfabvgv4j";}
-  {name="kpat";value="0kfvhkwamrfllgmd8yl6p3xlc0jmivxy0rsdrxpabvpb0vcqh9ml";}
-  {name="kppp";value="01pj8q1m3gwww6wvgwnd24lgbyvzfm6gskv2c802lzjcj7p9218m";}
-  {name="kqtquickcharts";value="1vml9scxva9gr8bb6rkxl8gaaghx3lyvwcwcifq5hz0154q875d5";}
-  {name="krdc";value="07p67z8gh9xnnr71kjy8g6ki07w22c767qbrk2fzar2zvc8dgnw6";}
-  {name="kremotecontrol";value="06nkg9chkimmzs1ww0sbxglssibby3157jkw6bncg661yfbsd48r";}
-  {name="kreversi";value="1pjjw3vim3pjazcxggs9axglkl7l1g0fpzqgjdxxn0p8vfh84jgg";}
-  {name="krfb";value="08qpw93slflx7whp9jbq1bsq1ikm0pgdvys11idvhmzl2lg86j1d";}
-  {name="kross-interpreters";value="1v6xjdpflzx3gi12vaf6ywzhb4ycrnawb839pjbpw3cy83p1m6pa";}
-  {name="kruler";value="08b54gimg0z4hl9lgndsbl797r5h88mjlamzzv10k0rf7rsd0924";}
-  {name="ksaneplugin";value="1rcmjkzr3yxanpvkfvbvf06dg57m1mmfmmy4n6ixy51ir0mh1v5j";}
-  {name="kscd";value="01nchy6pb4spvbhgmkfqglmrm8jgkslg6k1q1vzvahyns4lv8b6d";}
-  {name="kshisen";value="0i9imqb4zz2yvc80dgvbz08s3pxncm8dnvvwxjaw674nks0jxlh8";}
-  {name="ksirk";value="1lnsz5fg86vqdks3d5dfsxzkdxs8kzakjrwx4ixpab5xhq05vzls";}
-  {name="ksnakeduel";value="0721xwg3rjwib3aazgzhdmph0bpl2p5zkha8jbmq7aqr5i8ddkx0";}
-  {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";}
-  {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";}
-  {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";}
-  {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";}
-  {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";}
-  {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";}
-  {name="ktimer";value="02yw6zgp5wbgfvq38adbnn8mqpjc69chz4rndphmyskvflszz6n4";}
-  {name="ktouch";value="110haqrk8ixq7hmsb8hymkbqw7jygybxh467p4ag0pczr09gr3d3";}
-  {name="ktuberling";value="1jpnzb6dbmcv2f0hb7y3alqn9jqq589jzz2chbvlsm7p7xnpv2h2";}
-  {name="kturtle";value="1z6mx1ls5ymh5biyzf5f99q6qapr4a2jgxdi2za0qclqjsla4hrf";}
-  {name="ktux";value="1n854lccqs540c0lsg6794g0ir25zli1h6z92vyccsvranjb6k9r";}
-  {name="kubrick";value="1sa53z2bdk4rnvr5fs73nazl1aisbcg9yyianazggqshhy0l6w8k";}
-  {name="kuser";value="1rkjah60cwpkp355ldcbvb7cwap9ib1mvj1aska9zn2kad0dg8n1";}
-  {name="kwalletmanager";value="1w3csapcddpzn7l7v4a2802wwh6d1zm8vqx9lz3wmajczpx6xjab";}
-  {name="kwordquiz";value="0zvxzva65cvqin64v105zh9hwbv0yi8mx9lll4ybbp915dw8701q";}
  {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
-  {name="libkcompactdisc";value="14hjlql1vzzszfpxhz0rzvjpi0q7f20ry5857lpdbqhnrc0p3bmg";}
  {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
-  {name="libkdeedu";value="1i2sfby6ya8cfkdk28a9ia5zixwbixy56ql488v41w29mf1jnvzx";}
-  {name="libkdegames";value="0rd24v67fg09h5ilr4r7g9q21z165q1pm37y17l2qgjzr04czwn4";}
  {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
-  {name="libkipi";value="0fjm96pwird4km4wlhag1b67czwi03vsc2anng9iw3l4avavmvfw";}
-  {name="libkmahjongg";value="1ab66zgxya23yi7l3ga78yrm1kkr0l6hl709khyyk667kgzfqf16";}
-  {name="libkomparediff2";value="0bx672rysz78y2322lmm8a0i1k9v755wx8vmh538amk5smq936mz";}
-  {name="libksane";value="18nd90hrfmrgwmm6p5hgdr9dwc7z9978v2ibmjiim8dv44myk2is";}
-  {name="lokalize";value="1ig5mvzcspyz6ihr43fmwnhw560pby2kij0bz598xjkvb5hwfn8g";}
-  {name="lskat";value="01vgf40apf9x322k4f3i78n9ha01maga3xh3zvw4kmbs8kd662bi";}
  {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
-  {name="mplayerthumbs";value="0zin10mah7wm7f5v3hqffbwq2pqs7v39i2qhdizrijp85wsp925v";}
-  {name="nepomuk-core";value="0gdb7vk3qjvv04a5xqwlv0f4bjn391a3k3hkgibkql9ggxbjbrvl";}
-  {name="nepomuk-widgets";value="1qbrs56af9zdzhfb8964p44706gdf4j0bmj378xy5jva7km9cypx";}
-  {name="okteta";value="1vgs9kwp1bb5fvp1ja5hzvgll1s7n3ds5gg4500khy47k2z2cvmx";}
  {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
-  {name="oxygen-icons";value="1nwjjcm0isjnn3i8xf75nk6mhbg1zm20farlmyrzx261r2cj68lv";}
-  {name="pairs";value="124rpv22cx6bi65ixz5889zk46q17913w4l80d94pp9l6aypn4fm";}
-  {name="palapeli";value="08rklllik0zsrw19ff6b6l0ijxkyxy8wn5mxm3i07h9pbzv1ga5k";}
-  {name="parley";value="1mx0s7dmcmprrr44iim3pzr782cacndqiqiy7zz1zdw41mif3q16";}
-  {name="perlkde";value="0aiv8wmv08yp19rk228m7wirh43dagz4yapp3f7bgg50f4c6rpkb";}
-  {name="perlqt";value="0villxkgqwscx0sipfqnacxdyi3kzkmma4p9fkjq0hvqzq1b4pd0";}
-  {name="picmi";value="0x6nv6ahgsb90brckgv97grsmdb4za5m9izrkcyz6rg5gnn848c4";}
-  {name="poxml";value="020lf3wc7vn9d01pqqn1ygvvx7699vxkk5n9hq8zw7rf6n25gifx";}
-  {name="print-manager";value="0df1zca0cdk3qdyjfsymhghdadixz3fwm5w4h833iwf7fgr3c5q8";}
  {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";}
-  {name="qtruby";value="179wjl7w8vdm1606m1dzphhmcqxynfbdrcnrjzpyyvhibsdyfl10";}
-  {name="qyoto";value="0inwdnwhmi3cf82z0ni1abf621l6322r84kq447cqia6rkmf59j4";}
-  {name="rocs";value="1z6lk3xzbrw6581gy8hd3lm3ry4vkphg9wcdl8l03az1nyk2xp61";}
-  {name="smokegen";value="1if43r4icp7fz8ngmfw8i5wdylak48j79pp3bdvizfwn4pazl2s3";}
-  {name="smokekde";value="099c4qkpwwhbj9yibsm5zkgczv22qs4vd6s84v1p347kxr5in1hd";}
-  {name="smokeqt";value="02drfr1bnhac27a4c8pvbvvag250pmg71iz7ig968bp2gqvxcf99";}
-  {name="step";value="14f4a2k2al21ynkmwqrh5c33fgn6bhw3g461yhvmnq2sf8fwg8wb";}
-  {name="superkaramba";value="1jf3dck707svpbnbpwv46mlcgf5x52djnix5wjsg3wmkipgs4w88";}
  {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
-  {name="sweeper";value="0fhq9n1ffhcka37j6m9gs0rdxs0dzfn7lnl66v9wpgw075lfiaxx";}
-  {name="umbrello";value="0cvks49ij449grh3ldbpmmagz3yx61zq1g0fsg2ii9pqzbd6hn3x";}
-  {name="zeroconf-ioslave";value="0hhm5jj0kbi1y18m4x50hnpnfi1cjgh6mglggbscp8xr32jgmgjm";}
 ];
 versions=builtins.listToAttrs[
-  {name="amor";value="4.14.3";}
-  {name="analitza";value="4.14.3";}
-  {name="ark";value="4.14.3";}
-  {name="artikulate";value="4.14.3";}
-  {name="audiocd-kio";value="4.14.3";}
  {name="baloo";value="4.14.3";}
-  {name="baloo-widgets";value="4.14.3";}
-  {name="blinken";value="4.14.3";}
-  {name="bomber";value="4.14.3";}
-  {name="bovo";value="4.14.3";}
-  {name="cantor";value="4.14.3";}
-  {name="cervisia";value="4.14.3";}
-  {name="dolphin-plugins";value="4.14.3";}
-  {name="dragon";value="4.14.3";}
-  {name="ffmpegthumbs";value="4.14.3";}
-  {name="filelight";value="4.14.3";}
-  {name="granatier";value="4.14.3";}
-  {name="gwenview";value="4.14.3";}
-  {name="jovie";value="4.14.3";}
-  {name="juk";value="4.14.3";}
-  {name="kaccessible";value="4.14.3";}
  {name="kactivities";value="4.13.3";}
-  {name="kajongg";value="4.14.3";}
-  {name="kalgebra";value="4.14.3";}
-  {name="kalzium";value="4.14.3";}
-  {name="kamera";value="4.14.3";}
-  {name="kanagram";value="4.14.3";}
-  {name="kapman";value="4.14.3";}
-  {name="kapptemplate";value="4.14.3";}
-  {name="kate";value="4.14.3";}
-  {name="katomic";value="4.14.3";}
-  {name="kblackbox";value="4.14.3";}
-  {name="kblocks";value="4.14.3";}
-  {name="kbounce";value="4.14.3";}
-  {name="kbreakout";value="4.14.3";}
-  {name="kbruch";value="4.14.3";}
-  {name="kcachegrind";value="4.14.3";}
-  {name="kcalc";value="4.14.3";}
-  {name="kcharselect";value="4.14.3";}
-  {name="kcolorchooser";value="4.14.3";}
-  {name="kcron";value="4.14.3";}
-  {name="kdeartwork";value="4.14.3";}
  {name="kde-baseapps";value="4.14.3";}
-  {name="kde-base-artwork";value="4.14.3";}
-  {name="kde-dev-scripts";value="4.14.3";}
-  {name="kde-dev-utils";value="4.14.3";}
-  {name="kdegraphics-mobipocket";value="4.14.3";}
-  {name="kdegraphics-strigi-analyzer";value="4.14.3";}
-  {name="kdegraphics-thumbnailers";value="4.14.3";}
-  {name="kdenetwork-filesharing";value="4.14.3";}
-  {name="kdenetwork-strigi-analyzers";value="4.14.3";}
-  {name="kdepim";value="4.14.3";}
  {name="kdepimlibs";value="4.14.3";}
-  {name="kdepim-runtime";value="4.14.3";}
-  {name="kdeplasma-addons";value="4.14.3";}
  {name="kde-runtime";value="4.14.3";}
-  {name="kdesdk-kioslaves";value="4.14.3";}
-  {name="kdesdk-strigi-analyzers";value="4.14.3";}
-  {name="kdesdk-thumbnailers";value="4.14.3";}
-  {name="kde-wallpapers";value="4.14.3";}
-  {name="kdewebdev";value="4.14.3";}
  {name="kde-workspace";value="4.11.14";}
-  {name="kdf";value="4.14.3";}
-  {name="kdiamond";value="4.14.3";}
  {name="kfilemetadata";value="4.14.3";}
-  {name="kfloppy";value="4.14.3";}
-  {name="kfourinline";value="4.14.3";}
-  {name="kgamma";value="4.14.3";}
-  {name="kgeography";value="4.14.3";}
-  {name="kget";value="4.14.3";}
-  {name="kgoldrunner";value="4.14.3";}
-  {name="kgpg";value="4.14.3";}
-  {name="khangman";value="4.14.3";}
-  {name="kig";value="4.14.3";}
-  {name="kigo";value="4.14.3";}
-  {name="killbots";value="4.14.3";}
-  {name="kimono";value="4.14.3";}
-  {name="kiriki";value="4.14.3";}
-  {name="kiten";value="4.14.3";}
-  {name="kjumpingcube";value="4.14.3";}
-  {name="klettres";value="4.14.3";}
-  {name="klickety";value="4.14.3";}
-  {name="klines";value="4.14.3";}
-  {name="kmag";value="4.14.3";}
-  {name="kmahjongg";value="4.14.3";}
-  {name="kmines";value="4.14.3";}
-  {name="kmix";value="4.14.3";}
-  {name="kmousetool";value="4.14.3";}
-  {name="kmouth";value="4.14.3";}
-  {name="kmplot";value="4.14.3";}
-  {name="knavalbattle";value="4.14.3";}
-  {name="knetwalk";value="4.14.3";}
-  {name="kolf";value="4.14.3";}
-  {name="kollision";value="4.14.3";}
-  {name="kolourpaint";value="4.14.3";}
-  {name="kompare";value="4.14.3";}
-  {name="konquest";value="4.14.3";}
-  {name="konsole";value="4.14.3";}
-  {name="kopete";value="4.14.3";}
-  {name="korundum";value="4.14.3";}
-  {name="kpat";value="4.14.3";}
-  {name="kppp";value="4.14.3";}
-  {name="kqtquickcharts";value="4.14.3";}
-  {name="krdc";value="4.14.3";}
-  {name="kremotecontrol";value="4.14.3";}
-  {name="kreversi";value="4.14.3";}
-  {name="krfb";value="4.14.3";}
-  {name="kross-interpreters";value="4.14.3";}
-  {name="kruler";value="4.14.3";}
-  {name="ksaneplugin";value="4.14.3";}
-  {name="kscd";value="4.14.3";}
-  {name="kshisen";value="4.14.3";}
-  {name="ksirk";value="4.14.3";}
-  {name="ksnakeduel";value="4.14.3";}
-  {name="ksnapshot";value="4.14.3";}
-  {name="kspaceduel";value="4.14.3";}
-  {name="ksquares";value="4.14.3";}
-  {name="ksudoku";value="4.14.3";}
-  {name="ksystemlog";value="4.14.3";}
-  {name="kteatime";value="4.14.3";}
-  {name="ktimer";value="4.14.3";}
-  {name="ktouch";value="4.14.3";}
-  {name="ktuberling";value="4.14.3";}
-  {name="kturtle";value="4.14.3";}
-  {name="ktux";value="4.14.3";}
-  {name="kubrick";value="4.14.3";}
-  {name="kuser";value="4.14.3";}
-  {name="kwalletmanager";value="4.14.3";}
-  {name="kwordquiz";value="4.14.3";}
  {name="libkcddb";value="4.14.3";}
-  {name="libkcompactdisc";value="4.14.3";}
  {name="libkdcraw";value="4.14.3";}
-  {name="libkdeedu";value="4.14.3";}
-  {name="libkdegames";value="4.14.3";}
  {name="libkexiv2";value="4.14.3";}
-  {name="libkipi";value="4.14.3";}
-  {name="libkmahjongg";value="4.14.3";}
-  {name="libkomparediff2";value="4.14.3";}
-  {name="libksane";value="4.14.3";}
-  {name="lokalize";value="4.14.3";}
-  {name="lskat";value="4.14.3";}
  {name="marble";value="4.14.3";}
-  {name="mplayerthumbs";value="4.14.3";}
-  {name="nepomuk-core";value="4.14.3";}
-  {name="nepomuk-widgets";value="4.14.3";}
-  {name="okteta";value="4.14.3";}
  {name="okular";value="4.14.3";}
-  {name="oxygen-icons";value="4.14.3";}
-  {name="pairs";value="4.14.3";}
-  {name="palapeli";value="4.14.3";}
-  {name="parley";value="4.14.3";}
-  {name="perlkde";value="4.14.3";}
-  {name="perlqt";value="4.14.3";}
-  {name="picmi";value="4.14.3";}
-  {name="poxml";value="4.14.3";}
-  {name="print-manager";value="4.14.3";}
  {name="pykde4";value="4.14.3";}
-  {name="qtruby";value="4.14.3";}
-  {name="qyoto";value="4.14.3";}
-  {name="rocs";value="4.14.3";}
-  {name="smokegen";value="4.14.3";}
-  {name="smokekde";value="4.14.3";}
-  {name="smokeqt";value="4.14.3";}
-  {name="step";value="4.14.3";}
-  {name="superkaramba";value="4.14.3";}
  {name="svgpart";value="4.14.3";}
-  {name="sweeper";value="4.14.3";}
-  {name="umbrello";value="4.14.3";}
-  {name="zeroconf-ioslave";value="4.14.3";}
 ];
 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";  }
  ];
@ -383,196 +51,22 @@ modules=[
  module="kdelibs";
  split=true;
  pkgs=[
-    { 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";  }
+    { name = "baloo";  }
+    { name = "kfilemetadata";  }
  ];
 }
 {
  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="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";  }
  ];
 }
 {
@ -583,38 +77,7 @@ sane="kde_baseapps";  split=true;
  ];
 }
 { 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="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;}
 ];
 }
--- a/pkgs/desktops/kde-4.14/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.14/kde-package/default.nix
@ -113,14 +113,18 @@ rec {
  removeNames = subst: big:
    fold (s: out: filter (x: x.name != s) out) big subst;

-  modules = listToAttrs (map kdeModuleNV manifest.modules);
+  allModules = listToAttrs (map kdeModuleNV manifest.modules);
+
+  modules =
+    let unsplit = filter (a: ! (a ? pkgs)) manifest.modules;
+    in listToAttrs (map kdeModuleNV unsplit);

  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);
+    map (m: m.projects) (stdenv.lib.attrVals names allModules);

  individual =
    stdenv.lib.zipAttrsWith
--- a/pkgs/desktops/kde-4.14/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.14/kde-runtime.nix
@ -1,24 +0,0 @@
-{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2, shared_mime_info
-, libcanberra, samba, libjpeg, ntrack, pkgconfig, xz, libpulseaudio
-, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme, glib
-}:
-
-kde {
-  patches = [ ./CVE-2014-8600.diff ];
-
-  buildInputs = [
-    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
-    qca2 samba libcanberra libpulseaudio 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 = [ shared_mime_info ];
-
-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR -I${glib.dev}/include/glib-2.0 -I${glib.out}/lib/glib-2.0/include";
-
-  meta = {
-    license = "LGPL";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.14/kde-wallpapers.nix
@ -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 = "1mzj7jk0ag7yas2wm2x60z3ymv64g9jrjsz3nwlr719b4bhmgwjj";
-
-  meta = {
-    description = "Wallpapers for KDE";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/jovie.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kaccessible.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs, speechd }:
-
-kde {
-  buildInputs = [ kdelibs speechd ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kmag.nix
@ -1,10 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-#todo: package qaccessibilityclient
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kmousetool.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs, libXtst, libXt }:
-
-kde {
-  buildInputs = [ kdelibs libXtst libXt ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
+++ b/pkgs/desktops/kde-4.14/kdeaccessibility/kmouth.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
+++ b/pkgs/desktops/kde-4.14/kdeadmin/kcron.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Configure and schedule tasks";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
+++ b/pkgs/desktops/kde-4.14/kdeadmin/ksystemlog.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "System log viewer tool";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
+++ b/pkgs/desktops/kde-4.14/kdeadmin/kuser.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs, kdepimlibs }:
-
-kde {
-  buildInputs = [ kdelibs kdepimlibs ];
-
-  meta = {
-    description = "User management tool";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/ColorSchemes.nix
@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-color-schemes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE color schemes";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
+++ b/pkgs/desktops/kde-4.14/kdeartwork/FindXscreensaver.cmake
@ -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)
--- a/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/HighResolutionWallpapers.nix
@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-wallpapers-high-resolution";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE wallpapers in high resolution";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/IconThemes.nix
@ -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";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/WeatherWallpapers.nix
@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-weather-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/desktopthemes.nix
@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-desktop-themes";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/emoticons.nix
@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde {
-  name = "kde-emotion-icons";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/kscreensaver.nix
@ -1,15 +0,0 @@
-{ 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";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/kwin-styles.nix
@ -1,9 +0,0 @@
-{ kde, kdelibs, kde_workspace }:
-
-kde {
-  buildInputs = [ kdelibs kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/styles.nix
@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kde-style-phase";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
+++ b/pkgs/desktops/kde-4.14/kdeartwork/wallpapers.nix
@ -1,11 +0,0 @@
-{ kde, kdelibs }:
-
-kde rec {
-  name = "kdeartwork-wallpapers";
-
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
+++ b/pkgs/desktops/kde-4.14/kdebindings/perlqt.nix
@ -1,14 +0,0 @@
-{ kde, cmake, smokeqt, perl }:
-
-kde {
-
-  # TODO: qscintilla2, qwt5
-
-  buildInputs = [ smokeqt perl ];
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "Perl bindings for Qt library";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
+++ b/pkgs/desktops/kde-4.14/kdebindings/qtruby-install-prefix.patch
@ -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}")
--- a/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
+++ b/pkgs/desktops/kde-4.14/kdebindings/qtruby.nix
@ -1,22 +0,0 @@
-{ kde, cmake, smokeqt, ruby_2_2 }:
-
-kde {
-
- # TODO: scintilla2, qwt5
-
-  buildInputs = [ smokeqt ruby_2_2 ];
-
-  nativeBuildInputs = [ cmake ];
-
-  hardeningDisable = [ "all" ];
-
-  # The patch is not ready for upstream submmission.
-  # I should add an option() instead.
-  patches = [ ./qtruby-install-prefix.patch ];
-
-  cmakeFlags="-DRUBY_ROOT_DIR=${ruby_2_2}";
-
-  meta = {
-    description = "Ruby bindings for Qt library";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
@ -1,16 +0,0 @@
-diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt
--- smokegen-4.14.3-upstream/CMakeLists.txt	2014-09-15 13:23:01.000000000 -0430
-+++ smokegen-4.14.3/CMakeLists.txt	2015-03-29 16:41:59.295598992 -0430
-@@ -32,9 +32,9 @@
-     type.cpp
- )
- 
-# force RPATH so that the binary is usable from within the build tree
-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 )
- 
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen-nix.patch
@ -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)
--- a/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokegen.nix
@ -1,13 +0,0 @@
-{ stdenv, 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 = stdenv.lib.licenses.gpl2;
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokekde.nix
@ -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";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
+++ b/pkgs/desktops/kde-4.14/kdebindings/smokeqt.nix
@ -1,15 +0,0 @@
-{ stdenv, 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 = stdenv.lib.licenses.gpl2;
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/analitza.nix
@ -1,8 +0,0 @@
-{ kde, kdelibs, readline }:
-kde {
-  buildInputs = [ kdelibs readline ];
-
-  meta = {
-    description = "Library part of KAlgebra";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix
@ -1,8 +0,0 @@
-{ kde, kdelibs, qt_gstreamer1 }:
-kde {
-  buildInputs = [ kdelibs qt_gstreamer1 ];
-
-  meta = {
-    description = "A pronunciation learning program for KDE";
-  };
-}
--- a/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
+++ b/pkgs/desktops/kde-4.14/kdeedu/blinken.nix
@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "Memory Enhancement Game";
-  };
-}
--- a/Show More
+++ b/Show More