Merge pull request #32927 from peterhoeg/u/kdeapp

kde-applications: 17.08.3 -> 17.12.0

nixos/modules/services/x11/desktop-managers/plasma5.nix

@@ -25,8 +25,8 @@ in
         type = types.bool;
         default = true;
         description = ''
-          Enable support for Qt 4-based applications. Particularly, install the
+          Enable support for Qt 4-based applications. Particularly, install a
-          Qt 4 version of the Breeze theme and a default backend for Phonon.
+          default backend for Phonon.
         '';
       };
 
@@ -146,7 +146,7 @@ in
           libsForQt5.phonon-backend-gstreamer
         ]
 
-        ++ lib.optionals cfg.enableQt4Support [ breeze-qt4 pkgs.phonon-backend-gstreamer ]
+        ++ lib.optionals cfg.enableQt4Support [ pkgs.phonon-backend-gstreamer ]
 
         # Optional hardware support features
         ++ lib.optional config.hardware.bluetooth.enable bluedevil

pkgs/applications/audio/amarok/default.nix

@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, lib, automoc4, cmake, perl, pkgconfig
-, qtscriptgenerator, gettext, curl , libxml2, mysql, taglib
-, taglib_extras, loudmouth , kdelibs4, qca2, libmtp, liblastfm, libgpod
-, phonon , strigi, soprano, qjson, ffmpeg, libofa, nepomuk_core ? null
-, lz4, lzo, snappy, libaio, pcre
-}:
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  pname = "amarok";
-  version = "2.8.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.bz2";
-    sha256 = "1ilf9wdp3wna5pmvxill8x08rb9gw86qkc2zwm3xk9hpy8l9pf7l";
-  };
-
-  QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins";
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-  buildInputs = [
-    qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql.server/*libmysqld*/
-    taglib taglib_extras loudmouth kdelibs4 phonon strigi soprano qca2
-    libmtp liblastfm libgpod qjson ffmpeg libofa nepomuk_core
-    lz4 lzo snappy libaio pcre
-  ];
-
-  # This is already fixed upstream, will be release in 2.9
-  preConfigure = ''
-    sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/modules/FindTaglib.cmake
-  '';
-
-  cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";
-
-  enableParallelBuilding = true;
-
-  propagatedUserEnvPkgs = [ qtscriptgenerator ];
-
-  meta = {
-    repositories.git = git://anongit.kde.org/amarok.git;
-    description = "Popular music player for KDE";
-    license = "GPL";
-    homepage = https://amarok.kde.org;
-    inherit (kdelibs4.meta) platforms;
-  };
-}

pkgs/applications/graphics/digikam/default.nix

@@ -84,7 +84,8 @@ mkDerivation rec {
     qtsvg
     qtwebkit
 
-    kcalcore
+    # https://bugs.kde.org/show_bug.cgi?id=387960
+    #kcalcore
     kconfigwidgets
     kcoreaddons
     kfilemetadata

pkgs/applications/kde/akonadi/0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch

@@ -0,0 +1,49 @@
+From bc018b4bc816a3b51deb9739bedbf8a2268d0684 Mon Sep 17 00:00:00 2001
+From: gnidorah <gnidorah@users.noreply.github.com>
+Date: Fri, 22 Dec 2017 17:36:03 +0300
+Subject: [PATCH] Revert "Make Akonadi installation properly relocatable"
+
+This reverts commit b2bb55f13f2ac783f89cc414de8c39f62fa2096a.
+---
+ CMakeLists.txt            | 3 ---
+ KF5AkonadiConfig.cmake.in | 6 +++---
+ 2 files changed, 3 insertions(+), 6 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9788bea94..15bad00fd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -285,9 +285,6 @@ configure_package_config_file(
+     "${CMAKE_CURRENT_SOURCE_DIR}/KF5AkonadiConfig.cmake.in"
+     "${CMAKE_CURRENT_BINARY_DIR}/KF5AkonadiConfig.cmake"
+     INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+-    PATH_VARS AKONADI_DBUS_INTERFACES_INSTALL_DIR
+-              AKONADI_INCLUDE_DIR
+-              KF5Akonadi_DATA_DIR
+ )
+ 
+ install(FILES
+diff --git a/KF5AkonadiConfig.cmake.in b/KF5AkonadiConfig.cmake.in
+index 75abede50..10f039376 100644
+--- a/KF5AkonadiConfig.cmake.in
++++ b/KF5AkonadiConfig.cmake.in
+@@ -13,8 +13,8 @@ find_dependency(KF5ConfigWidgets "@KF5_VERSION@")
+ find_dependency(Qt5DBus "@QT_REQUIRED_VERSION@")
+ find_dependency(Qt5Network "@QT_REQUIRED_VERSION@")
+ 
+-set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@PACKAGE_AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
+-set_and_check(AKONADI_INCLUDE_DIR          "@PACKAGE_AKONADI_INCLUDE_DIR@")
++set_and_check(AKONADI_DBUS_INTERFACES_DIR  "@AKONADI_DBUS_INTERFACES_INSTALL_DIR@")
++set_and_check(AKONADI_INCLUDE_DIR          "@AKONADI_INCLUDE_DIR@")
+ 
+ find_dependency(Boost "@Boost_MINIMUM_VERSION@")
+ 
+@@ -22,4 +22,4 @@ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiTargets.cmake)
+ include(${CMAKE_CURRENT_LIST_DIR}/KF5AkonadiMacros.cmake)
+ 
+ # The directory where akonadi-xml.xsd and kcfg2dbus.xsl are installed
+-set(KF5Akonadi_DATA_DIR "@PACKAGE_KF5Akonadi_DATA_DIR@")
++set(KF5Akonadi_DATA_DIR "@KF5Akonadi_DATA_DIR@")
+-- 
+2.15.1
+

pkgs/applications/kde/akonadi/series

@@ -1,2 +1,3 @@
 akonadi-paths.patch
 akonadi-timestamps.patch
+0001-Revert-Make-Akonadi-installation-properly-relocatabl.patch

pkgs/applications/kde/akonadiconsole.nix

@@ -3,7 +3,7 @@
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-contacts, calendarsupport, kcalcore, kcompletion,
   kconfigwidgets, kcontacts, kdbusaddons, kitemmodels, kpimtextedit, libkdepim,
-  ktextwidgets, kxmlgui, messagelib, qtbase,
+  ktextwidgets, kxmlgui, messagelib, qtbase, akonadi-search, xapian
 }:
 
 mkDerivation {
@@ -16,6 +16,6 @@ mkDerivation {
   buildInputs = [
     akonadi akonadi-contacts calendarsupport kcalcore kcompletion kconfigwidgets
     kcontacts kdbusaddons kitemmodels kpimtextedit ktextwidgets kxmlgui
-    messagelib qtbase libkdepim
+    messagelib qtbase libkdepim akonadi-search xapian
   ];
 }

pkgs/applications/kde/default.nix

@@ -63,7 +63,6 @@ let
         kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ];
       };
     in {
-      kdelibs = callPackage ./kdelibs { inherit attica phonon; };
       akonadi = callPackage ./akonadi {};
       akonadi-calendar = callPackage ./akonadi-calendar.nix {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
@@ -102,6 +101,7 @@ let
       kdepim-apps-libs = callPackage ./kdepim-apps-libs {};
       kdf = callPackage ./kdf.nix {};
       keditbookmarks = callPackage ./keditbookmarks.nix {};
+      kget = callPackage ./kget.nix {};
       kgpg = callPackage ./kgpg.nix {};
       khelpcenter = callPackage ./khelpcenter.nix {};
       kholidays = callPackage ./kholidays.nix {};
@@ -124,6 +124,7 @@ let
       kontactinterface = callPackage ./kontactinterface.nix {};
       korganizer = callPackage ./korganizer.nix {};
       kpimtextedit = callPackage ./kpimtextedit.nix {};
+      ksmtp = callPackage ./ksmtp {};
       kqtquickcharts = callPackage ./kqtquickcharts.nix {};
       krdc = callPackage ./krdc.nix {};
       krfb = callPackage ./krfb.nix {};
@@ -135,6 +136,7 @@ let
       libkdcraw = callPackage ./libkdcraw.nix {};
       libkdepim = callPackage ./libkdepim.nix {};
       libkexiv2 = callPackage ./libkexiv2.nix {};
+      libkgapi = callPackage ./libkgapi.nix {};
       libkipi = callPackage ./libkipi.nix {};
       libkleo = callPackage ./libkleo.nix {};
       libkomparediff2 = callPackage ./libkomparediff2.nix {};
@@ -154,8 +156,6 @@ let
       print-manager = callPackage ./print-manager.nix {};
       spectacle = callPackage ./spectacle.nix {};
       syndication = callPackage ./syndication.nix {};
-
-      l10n = recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib recurseIntoAttrs; });
     };
 
 in lib.makeScope libsForQt5.newScope packages

pkgs/applications/kde/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.08.3/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.12.0/ -A '*.tar.xz' )

pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch

@@ -11,85 +11,6 @@ Index: grantleetheme-17.04.0/src/grantleetheme_p.h
      QString author;
      QString email;
  
-Index: grantleetheme-17.04.0/src/grantleetheme.cpp
-===================================================================
---- grantleetheme-17.04.0.orig/src/grantleetheme.cpp
-+++ grantleetheme-17.04.0/src/grantleetheme.cpp
-@@ -45,7 +45,7 @@ ThemePrivate::ThemePrivate(const ThemePr
-     , description(other.description)
-     , name(other.name)
-     , dirName(other.dirName)
--    , absolutePath(other.absolutePath)
-+    , absolutePaths(other.absolutePaths)
-     , author(other.author)
-     , email(other.email)
-     , loader(other.loader)
-@@ -63,12 +63,15 @@ void ThemePrivate::setupEngine()
- 
- void ThemePrivate::setupLoader()
- {
--    // Get the parent dir with themes, we set the theme directory separately
--    QDir dir(absolutePath);
--    dir.cdUp();
-+    QStringList templateDirs;
-+    for (const QString& path : absolutePaths) {
-+        QDir dir(path);
-+        dir.cdUp();
-+        templateDirs << dir.absolutePath();
-+    }
- 
-     loader = QSharedPointer<Grantlee::FileSystemTemplateLoader>::create();
--    loader->setTemplateDirs({ dir.absolutePath() });
-+    loader->setTemplateDirs(templateDirs);
-     loader->setTheme(dirName);
- 
-     if (!sEngine) {
-@@ -122,7 +123,7 @@ Theme::Theme(const QString &themePath, c
-     KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
-     if (group.isValid()) {
-         d->dirName = dirName;
--        d->absolutePath = themePath;
-+        d->absolutePaths = QStringList(themePath);
-         d->name = group.readEntry("Name", QString());
-         d->description = group.readEntry("Description", QString());
-         d->themeFileName = group.readEntry("FileName", QString());
-@@ -141,7 +142,7 @@ Theme::~Theme()
- 
- bool Theme::operator==(const Theme &other) const
- {
--    return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
-+    return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
- }
- 
- Theme &Theme::operator=(const Theme &other)
-@@ -185,7 +186,12 @@ QString Theme::dirName() const
- 
- QString Theme::absolutePath() const
- {
--    return d->absolutePath;
-+    return d->absolutePaths.first();
-+}
-+
-+QStringList Theme::absolutePaths() const
-+{
-+    return d->absolutePaths;
- }
- 
- QString Theme::author() const
-@@ -224,6 +230,13 @@ QString Theme::render(const QString &tem
-     return result;
- }
- 
-+void Theme::addThemeDir(const QString& path)
-+{
-+    QDir dir(path);
-+    dir.cdUp();
-+    d->absolutePaths << dir.absolutePath();
-+}
-+
- void Theme::addPluginPath(const QString &path)
- {
-     if (!ThemePrivate::sEngine) {
 Index: grantleetheme-17.04.0/src/grantleetheme.h
 ===================================================================
 --- grantleetheme-17.04.0.orig/src/grantleetheme.h
@@ -153,3 +74,80 @@ Index: grantleetheme-17.04.0/src/grantleethememanager.cpp
                      }
                  }
              }
+--- src/grantleetheme.cpp.orig	2017-12-22 16:11:39.863598126 +0300
++++ ./src/grantleetheme.cpp	2017-12-22 16:16:14.045664607 +0300
+@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePr
+     , description(other.description)
+     , name(other.name)
+     , dirName(other.dirName)
+-    , absolutePath(other.absolutePath)
++    , absolutePaths(other.absolutePaths)
+     , author(other.author)
+     , email(other.email)
+     , loader(other.loader)
+@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
+ 
+ void ThemePrivate::setupLoader()
+ {
+-    // Get the parent dir with themes, we set the theme directory separately
+-    QDir dir(absolutePath);
+-    dir.cdUp();
++    QStringList templateDirs;
++    for (const QString& path : absolutePaths) {
++        QDir dir(path);
++        dir.cdUp();
++        templateDirs << dir.absolutePath();
++    }
+ 
+     loader = QSharedPointer<GrantleeTheme::QtResourceTemplateLoader>::create();
+-    loader->setTemplateDirs({ dir.absolutePath() });
++    loader->setTemplateDirs(templateDirs);
+     loader->setTheme(dirName);
+ 
+     if (!sEngine) {
+@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, c
+     KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
+     if (group.isValid()) {
+         d->dirName = dirName;
+-        d->absolutePath = themePath;
++        d->absolutePaths = QStringList(themePath);
+         d->name = group.readEntry("Name", QString());
+         d->description = group.readEntry("Description", QString());
+         d->themeFileName = group.readEntry("FileName", QString());
+@@ -140,7 +143,7 @@ Theme::~Theme()
+ 
+ bool Theme::operator==(const Theme &other) const
+ {
+-    return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
++    return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
+ }
+ 
+ Theme &Theme::operator=(const Theme &other)
+@@ -184,7 +187,12 @@ QString Theme::dirName() const
+ 
+ QString Theme::absolutePath() const
+ {
+-    return d->absolutePath;
++    return d->absolutePaths.first();
++}
++
++QStringList Theme::absolutePaths() const
++{
++    return d->absolutePaths;
+ }
+ 
+ QString Theme::author() const
+@@ -223,6 +231,13 @@ QString Theme::render(const QString &tem
+     return result;
+ }
+ 
++void Theme::addThemeDir(const QString& path)
++{
++    QDir dir(path);
++    dir.cdUp();
++    d->absolutePaths << dir.absolutePath();
++}
++
+ void Theme::addPluginPath(const QString &path)
+ {
+     if (!ThemePrivate::sEngine) {

pkgs/applications/kde/kde-locale-4.nix

@@ -1,27 +0,0 @@
-name: args:
-
-{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }:
-
-mkDerivation (args // {
-  sname = "kde-l10n-${name}";
-  name = "kde-l10n-${name}-qt4";
-
-  outputs = [ "out" ];
-
-  nativeBuildInputs =
-    [ automoc4 cmake gettext perl ]
-    ++ (args.nativeBuildInputs or []);
-  buildInputs =
-    [ kdelibs ]
-    ++ (args.buildInputs or []);
-
-  preConfigure = ''
-    sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
-    ${args.preConfigure or ""}
-  '';
-
-  preFixup = ''
-    propagatedBuildInputs=
-    propagatedNativeBuildInputs=
-  '';
-})

pkgs/applications/kde/kdelibs/0001-old-kde4-cmake-policies.patch

@@ -1,56 +0,0 @@
-From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 13:54:57 -0500
-Subject: [PATCH 1/2] old kde4 cmake policies
-
----
- cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 7d54b9b..c435571 100644
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -345,6 +345,39 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
-+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
-+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
-+cmake_policy(VERSION 2.4.5)
-+
-+# CMake 2.6, set compatibility behaviour to cmake 2.4
-+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
-+# resets the policy settings, so we get a lot of warnings
-+
-+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
-+cmake_policy(SET CMP0000 OLD)
-+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
-+cmake_policy(SET CMP0002 OLD)
-+# CMP0003: add the link paths to the link command as with cmake 2.4
-+cmake_policy(SET CMP0003 OLD)
-+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
-+cmake_policy(SET CMP0005 OLD)
-+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
-+# where this is done, macros and functions are executed with the policies as they
-+# were when the were defined. Keep the OLD behaviour so we can set the policies here
-+# for all KDE software without the big warning
-+cmake_policy(SET CMP0011 OLD)
-+
-+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
-+# in this directory over those from CMAKE_MODULE_PATH
-+cmake_policy(SET CMP0017 NEW)
-+
-+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
-+if (POLICY CMP0026)
-+  cmake_policy(SET CMP0026 OLD)
-+endif (POLICY CMP0026)
-+
-+
- # Only do something if it hasn't been found yet
- if(NOT KDE4_FOUND)
- 
--- 
-2.5.0
-

pkgs/applications/kde/kdelibs/0002-polkit-install-path.patch

@@ -1,25 +0,0 @@
-From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 13:56:03 -0500
-Subject: [PATCH 2/2] polkit install path
-
----
- kdecore/auth/ConfigureChecks.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
-index 7cf9cb5..c8334ae 100644
---- a/kdecore/auth/ConfigureChecks.cmake
-+++ b/kdecore/auth/ConfigureChecks.cmake
-@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
--- 
-2.5.0
-

pkgs/applications/kde/kdelibs/0003-remove_xdg_impurities.patch

@@ -1,47 +0,0 @@
-diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
-index ab8f76d..2ae5089 100644
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
-     else
-     {
-         xdgdirList.clear();
--        xdgdirList.append(QString::fromLatin1("/etc/xdg"));
--#ifdef Q_WS_WIN
--        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
--#else
--        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
--#endif
-     }
- 
-     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
-@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
-         }
-     } else {
-         xdgdirList = kdedirDataDirs;
--#ifndef Q_WS_WIN
--        xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
--        xdgdirList.append(QString::fromLatin1("/usr/share/"));
--#endif
-     }
- 
-     localXdgDir = readEnvPath("XDG_DATA_HOME");
-diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
-index 4c9cad9..6849d45 100644
---- a/solid/solid/xdgbasedirs.cpp
-+++ b/solid/solid/xdgbasedirs.cpp
-@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
- {
-   if ( qstrncmp( "data", resource, 4 ) == 0 ) {
-     if ( instance()->mDataDirs.isEmpty() ) {
--      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
-+      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
-     }
-     return instance()->mDataDirs;
-   } else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
-     if ( instance()->mConfigDirs.isEmpty() ) {
--      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
-+      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
-     }
-     return instance()->mConfigDirs;
-   }

pkgs/applications/kde/kdelibs/default.nix

@@ -1,49 +0,0 @@
-{
-  mkDerivation, lib,
-  automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
-  attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
-  libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
-  shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
-}:
-
-mkDerivation {
-  name = "kdelibs";
-
-  outputs = [ "out" "dev" ];
-
-  outputInclude = "out";
-
-  setOutputFlags = false;
-
-  nativeBuildInputs = [
-    automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
-  ];
-  buildInputs = [
-    attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
-    polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
-  ];
-  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
-
-  patches = [
-    ./0001-old-kde4-cmake-policies.patch
-    ./0002-polkit-install-path.patch
-    ./0003-remove_xdg_impurities.patch
-  ];
-
-  # cmake does not detect path to `ilmbase`
-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
-
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    "-DWITH_SOLID_UDISKS2=ON"
-    "-DKDE_DEFAULT_HOME=.kde"
-  ];
-
-  meta = {
-    platforms = lib.platforms.linux;
-    homepage = http://www.kde.org;
-    license = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}

pkgs/applications/kde/kdepim-runtime.nix

@@ -5,7 +5,7 @@
   akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
   kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
   kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
-  pimcommon, qtwebengine,
+  pimcommon, qtwebengine, libkgapi
 }:
 
 mkDerivation {
@@ -19,7 +19,7 @@ mkDerivation {
     akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
     kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
     kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
-    pimcommon
+    pimcommon libkgapi
   ];
   # Attempts to build some files before dependencies have been generated
   enableParallelBuilding = false;

pkgs/applications/kde/kget.nix

@@ -0,0 +1,22 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
+  kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
+}:
+
+mkDerivation {
+  name = "kget";
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+
+  buildInputs = [
+    kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
+    kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
+  ];
+
+  meta = with lib; {
+    license = with licenses; [ gpl2 ];
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+}

pkgs/applications/kde/kmailtransport.nix

@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet,
+  akonadi, akonadi-mime, cyrus_sasl, kcmutils, ki18n, kio, kmime, kwallet, ksmtp
 }:
 
 mkDerivation {
@@ -11,7 +11,7 @@ mkDerivation {
     maintainers = kdepimTeam;
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ akonadi kcmutils ki18n kio ];
+  buildInputs = [ akonadi kcmutils ki18n kio ksmtp ];
   propagatedBuildInputs = [ akonadi-mime cyrus_sasl kmime kwallet ];
   outputs = [ "out" "dev" ];
 }

pkgs/applications/kde/ksmtp/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch

@@ -0,0 +1,25 @@
+From 749769232e7387ec8c8f2d3da845d8a6ae7d5977 Mon Sep 17 00:00:00 2001
+From: gnidorah <gnidorah@users.noreply.github.com>
+Date: Fri, 22 Dec 2017 19:32:47 +0300
+Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 83c2bcb..5f6d47c 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -51,7 +51,7 @@ ecm_generate_headers(KSMTP_CamelCase_HEADERS
+     REQUIRED_HEADERS KSMTP_HEADERS
+ )
+ 
+-install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
++install(TARGETS KPimSMTP EXPORT KPimSMTPTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ install(FILES
+     ${CMAKE_CURRENT_BINARY_DIR}/ksmtp_export.h
+-- 
+2.15.1
+

pkgs/applications/kde/ksmtp/default.nix

@@ -0,0 +1,17 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  kcoreaddons, kio, kmime, cyrus_sasl
+}:
+
+mkDerivation {
+  name = "ksmtp";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcoreaddons kio kmime ];
+  propagatedBuildInputs = [ cyrus_sasl ];
+  patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ];
+}

pkgs/applications/kde/l10n.nix

@@ -1,181 +0,0 @@
-{ callPackage, recurseIntoAttrs, lib }:
-
-let
-
-  kdeLocale4 = import ./kde-locale-4.nix;
-
-in
-
-lib.mapAttrs (name: attr: recurseIntoAttrs attr) {
-  ar = {
-    qt4 = callPackage (kdeLocale4 "ar" {}) {};
-  };
-  bg = {
-    qt4 = callPackage (kdeLocale4 "bg" {}) {};
-  };
-  bs = {
-    qt4 = callPackage (kdeLocale4 "bs" {}) {};
-  };
-  ca = {
-    qt4 = callPackage (kdeLocale4 "ca" {}) {};
-  };
-  ca_valencia = {
-    qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
-  };
-  cs = {
-    qt4 = callPackage (kdeLocale4 "cs" {}) {};
-  };
-  da = {
-    qt4 = callPackage (kdeLocale4 "da" {}) {};
-  };
-  de = {
-    qt4 = callPackage (kdeLocale4 "de" {}) {};
-  };
-  el = {
-    qt4 = callPackage (kdeLocale4 "el" {}) {};
-  };
-  en_GB = {
-    qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
-  };
-  eo = {
-    qt4 = callPackage (kdeLocale4 "eo" {}) {};
-  };
-  es = {
-    qt4 = callPackage (kdeLocale4 "es" {}) {};
-  };
-  et = {
-    qt4 = callPackage (kdeLocale4 "et" {}) {};
-  };
-  eu = {
-    qt4 = callPackage (kdeLocale4 "eu" {}) {};
-  };
-  fa = {
-    qt4 = callPackage (kdeLocale4 "fa" {}) {};
-  };
-  fi = {
-    qt4 = callPackage (kdeLocale4 "fi" {}) {};
-  };
-  fr = {
-    qt4 = callPackage (kdeLocale4 "fr" {}) {};
-  };
-  ga = {
-    qt4 = callPackage (kdeLocale4 "ga" {}) {};
-  };
-  gl = {
-    qt4 = callPackage (kdeLocale4 "gl" {}) {};
-  };
-  he = {
-    qt4 = callPackage (kdeLocale4 "he" {}) {};
-  };
-  hi = {
-    qt4 = callPackage (kdeLocale4 "hi" {}) {};
-  };
-  hr = {
-    qt4 = callPackage (kdeLocale4 "hr" {}) {};
-  };
-  hu = {
-    qt4 = callPackage (kdeLocale4 "hu" {}) {};
-  };
-  ia = {
-    qt4 = callPackage (kdeLocale4 "ia" {}) {};
-  };
-  id = {
-    qt4 = callPackage (kdeLocale4 "id" {}) {};
-  };
-  is = {
-    qt4 = callPackage (kdeLocale4 "is" {}) {};
-  };
-  it = {
-    qt4 = callPackage (kdeLocale4 "it" {}) {};
-  };
-  ja = {
-    qt4 = callPackage (kdeLocale4 "ja" {}) {};
-  };
-  kk = {
-    qt4 = callPackage (kdeLocale4 "kk" {}) {};
-  };
-  km = {
-    qt4 = callPackage (kdeLocale4 "km" {}) {};
-  };
-  ko = {
-    qt4 = callPackage (kdeLocale4 "ko" {}) {};
-  };
-  lt = {
-    qt4 = callPackage (kdeLocale4 "lt" {}) {};
-  };
-  lv = {
-    qt4 = callPackage (kdeLocale4 "lv" {}) {};
-  };
-  mr = {
-    qt4 = callPackage (kdeLocale4 "mr" {}) {};
-  };
-  nb = {
-    qt4 = callPackage (kdeLocale4 "nb" {}) {};
-  };
-  nds = {
-    qt4 = callPackage (kdeLocale4 "nds" {}) {};
-  };
-  nl = {
-    qt4 = callPackage (kdeLocale4 "nl" {}) {};
-  };
-  nn = {
-    qt4 = callPackage (kdeLocale4 "nn" {}) {};
-  };
-  pa = {
-    qt4 = callPackage (kdeLocale4 "pa" {}) {};
-  };
-  pl = {
-    qt4 = callPackage (kdeLocale4 "pl" {}) {};
-  };
-  pt = {
-    qt4 = callPackage (kdeLocale4 "pt" {}) {};
-  };
-  pt_BR = {
-    qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
-  };
-  ro = {
-    qt4 = callPackage (kdeLocale4 "ro" {}) {};
-  };
-  ru = {
-    qt4 = callPackage (kdeLocale4 "ru" {}) {};
-  };
-  sk = {
-    qt4 = callPackage (kdeLocale4 "sk" {}) {};
-  };
-  sl = {
-    qt4 = callPackage (kdeLocale4 "sl" {}) {};
-  };
-  sr = {
-    qt4 = callPackage (kdeLocale4 "sr" {
-      preConfigure = ''
-        patchShebangs \
-            4/sr/sr@latin/scripts/ts-pmap-compile.py \
-            4/sr/scripts/ts-pmap-compile.py \
-            4/sr/data/resolve-sr-hybrid \
-            4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \
-            4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
-        '';
-    }) {};
-  };
-  sv = {
-    qt4 = callPackage (kdeLocale4 "sv" {}) {};
-  };
-  tr = {
-    qt4 = callPackage (kdeLocale4 "tr" {}) {};
-  };
-  ug = {
-    qt4 = callPackage (kdeLocale4 "ug" {}) {};
-  };
-  uk = {
-    qt4 = callPackage (kdeLocale4 "uk" {}) {};
-  };
-  wa = {
-    qt4 = callPackage (kdeLocale4 "wa" {}) {};
-  };
-  zh_CN = {
-    qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
-  };
-  zh_TW = {
-    qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
-  };
-}

pkgs/applications/kde/libkgapi.nix

@@ -0,0 +1,15 @@
+{
+  mkDerivation, lib, kdepimTeam,
+  extra-cmake-modules, kdoctools,
+  qtwebengine, kio, kcalcore, kcontacts
+}:
+
+mkDerivation {
+  name = "libkgapi";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = kdepimTeam;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ qtwebengine kio kcalcore kcontacts ];
+}

pkgs/applications/misc/kgocode/default.nix

@@ -1,26 +0,0 @@
-{ fetchgit, stdenv, cmake, kdelibs4, automoc4 } :
-
-stdenv.mkDerivation rec {
-  name = "kgocode-0.0.1";
-
-  buildInputs = [ cmake kdelibs4 automoc4 ];
-
-  src = fetchgit {
-    url = https://bitbucket.org/lucashnegri/kgocode.git;
-    rev = "024536e4b2f371db4f51c1d80fb6b444352ff6a6";
-    sha256 = "10q4nvx3wz5wl3wwpfprz26j4x59s41bpdgafbg6604im58hklal";
-  };
-
-  meta = with stdenv.lib; {
-    description = "Go code completion for Kate, KDevelop and others";
-    longDescription = ''
-      A plugin for KTextEditor (Kate, KDevelop, among others) that provides
-      basic code completion for the Go programming language.
-      Uses gocode as completion provider.
-    '';
-    homepage    = https://bitbucket.org/lucashnegri/kgocode/overview;
-    maintainers = with maintainers; [ qknight ];
-    license = licenses.gpl3Plus;
-    platforms   = platforms.linux;
-  };
-}

pkgs/applications/networking/instant-messengers/kadu/cmake.patch

@@ -1,13 +0,0 @@
-diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
---- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2012-08-30 16:13:17.000000000 +0200
-+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2014-02-15 10:20:33.368716013 +0100
-@@ -26,7 +26,7 @@
- 					get_filename_component (_basename ${_current_MOC} NAME_WE)
- 					set (_header ${_abs_FILE})
- 					set (_moc ${_abs_PATH}/${_current_MOC})
--					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
-+					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
- 					MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
- 				endforeach (_current_MOC_INC)
- 			endif (_match)
-Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~

pkgs/applications/networking/instant-messengers/kadu/default.nix

@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, libgadu, libXScrnSaver, libsndfile, libX11,
-  alsaLib, aspell, libidn, qca2, phonon, pkgconfig }:
-
-stdenv.mkDerivation {
-
-  name = "kadu-0.12.3";
-
-  src = fetchurl {
-    url = http://download.kadu.im/stable/kadu-0.12.3.tar.bz2;
-    sha256 = "1a5q5b8pm253cwg6ahahjdm8jxj0pv41apyi1nvvy08bs38bn1yn";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ cmake qt4 libgadu libXScrnSaver libsndfile libX11 alsaLib aspell libidn qca2 phonon
-  ];
-
-  configureFlags = "CPPFLAGS=-DQT_NO_DEBUG";
-
-  preConfigure = ''
-    export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:${phonon}/lib64/pkgconfig:${phonon}/lib32/pkgconfig"
-  '';
-
-  cmakeFlags = "-DENABLE_AUTODOWNLOAD=OFF -DBUILD_DESCRIPTION='NixOS'";
-
-  prePatch = ''
-    patchShebangs .
-  '';
-
-  # Disable the kadu plugins I wasn't able to get to work
-  patchPhase = ''
-    sed -i -e '/mpd_mediaplayer/d' \
-           -e '/encryption_ng/d'   \
-           -e '/encryption_ng_simlite/d' Plugins.cmake
-    patch -p1 < ${./cmake.patch}
-  '';
-
-  NIX_LDFLAGS="-lX11";
-
-  meta = {
-    description = "An instant-messenger client for the gadu-gadu network (most popular polish IM network)";
-    homepage = http://www.kadu.net/w/English:Main_Page;
-    license = stdenv.lib.licenses.gpl2;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.piotr ];
-  };
-}

pkgs/applications/networking/kget/default.nix

@@ -1,33 +0,0 @@
-{
-  mkDerivation, lib, fetchFromGitHub,
-  extra-cmake-modules, kdoctools, makeWrapper,
-  kdelibs4support, libgcrypt, libktorrent, qca-qt5, qgpgme,
-  kcmutils, kcompletion, kcoreaddons, knotifyconfig, kparts, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui
-}:
-
-let
-  pname = "kget";
-  version = "20170903";
-
-in mkDerivation {
-  name = "${pname}-${version}";
-  src = fetchFromGitHub {
-    owner  = "KDE";
-    repo   = pname;
-    rev    = "739c0b399faf5a393c7436c0771662596b840fdc";
-    sha256 = "0rn6a4xd9zmf9sdjd5b4rh8yky6qm6ffjgjpn4snkdjsn6vm6y43";
-  };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
-
-  buildInputs = [
-    kdelibs4support libgcrypt libktorrent qca-qt5 qgpgme
-    kcmutils kcompletion kcoreaddons knotifyconfig kparts kwallet kwidgetsaddons kwindowsystem kxmlgui
-  ];
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ peterhoeg ];
-  };
-}

pkgs/applications/office/calligra/2.nix

@@ -1,56 +0,0 @@
-{ 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
-, kactivities, okular, git, oxygen-icons5, makeWrapper
-# TODO: not found
-#, xbase, openjpeg
-# TODO: package libWPS, Spnav, m2mml, LibEtonyek
-}:
-
-stdenv.mkDerivation rec {
-  name = "calligra-2.9.11";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${name}/${name}.tar.xz";
-    sha256 = "02gaahp7a7m53n0hvrp3868s8w37b457isxir0z7b4mwhw7jv3di";
-  };
-
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig makeWrapper ];
-
-  buildInputs = [
-    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
-    kactivities okular git
-  ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    for i in $out/bin/*; do
-      wrapProgram $i \
-        --prefix PATH ':' "${pstoedit.out}/bin" \
-        --prefix XDG_DATA_DIRS ':' "${oxygen-icons5}/share"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A suite of productivity applications";
-    longDescription = ''
-      Calligra Suite is a set of applications written to help
-      you to accomplish your work. Calligra includes efficient
-      and capable office components: Words for text processing,
-      Sheets for computations, Stage for presentations, Plan for
-      planning, Flow for flowcharts, Kexi for database creation,
-      Krita for painting and raster drawing, and Karbon for
-      vector graphics.
-    '';
-    homepage = http://calligra.org;
-    maintainers = with maintainers; [ phreedom ebzzry ];
-    inherit (kdelibs4.meta) platforms;
-    license = licenses.gpl2;
-    broken = true;
-  };
-}

pkgs/applications/office/calligra/default.nix

@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl, extra-cmake-modules, kdoctools, makeWrapper,
+  mkDerivation, lib, fetchurl, fetchpatch, extra-cmake-modules, kdoctools, makeWrapper,
   boost, qtwebkit, qtx11extras, shared_mime_info,
   breeze-icons, kactivities, karchive, kcodecs, kcompletion, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kdiagram, kguiaddons, khtml, ki18n,
@@ -23,6 +23,16 @@ mkDerivation rec {
     sha256 = "1cjdd7sx1zhas6lhw0dzhrnki790jkf93f88wn6z9yrww32dsas5";
   };
 
+  enableParallelBuilding = true;
+
+  patches = [
+    (fetchpatch {
+      name = "calligra-build-with-newer-kcalcore.patch";
+      url = "https://github.com/KDE/calligra/commit/9a02a545e8606aa91aff2038da137226a9432e1a.diff";
+      sha256 = "08xays41v6rfnc31vixf4vbz8zmi2x5lfnk7f82bm4sgmpgfxwa0";
+    })
+  ];
+
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
 
   buildInputs = [

pkgs/applications/office/libreoffice/still.nix

@@ -6,7 +6,7 @@
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf
 , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr
-, libwpg, dbus_glib, glibc, qt4, kdelibs4, 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
@@ -15,7 +15,6 @@
 , defaultIconTheme, glib, ncurses
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" "hu" "it" ]
 , withHelp ? true
-, kdeIntegration ? false
 }:
 
 let
@@ -187,7 +186,6 @@ in stdenv.mkDerivation rec {
     "--disable-report-builder"
     "--enable-python=system"
     "--enable-dbus"
-    (lib.enableFeature kdeIntegration "kde4")
     "--with-package-format=installed"
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
@@ -250,8 +248,7 @@ in stdenv.mkDerivation rec {
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew ncurses
       libodfgen CoinMP librdf_rasqal defaultIconTheme
-    ]
+    ];
-    ++ lib.optional kdeIntegration kdelibs4;
   nativeBuildInputs = [ wrapGAppsHook ];
 
   passthru = {

pkgs/applications/office/zanshin/default.nix

@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  fetchurl, fetchpatch,
+  fetchFromGitHub,
   extra-cmake-modules,
   qtbase, boost,
   akonadi-calendar, akonadi-notes, akonadi-search, kidentitymanagement, kontactinterface, kldap,
@@ -9,22 +9,16 @@
 
 mkDerivation rec {
   pname = "zanshin";
-  version = "0.4.1";
+  version = "2017-11-25";
   name = "${pname}-${version}";
 
-  src = fetchurl {
+  src = fetchFromGitHub {
-    url = "https://files.kde.org/${pname}/${name}.tar.bz2";
+    owner = "KDE";
-    sha256 = "1llqm4w4mhmdirgrmbgwrpqyn47phwggjdghf164k3qw0bi806as";
+    repo = "zanshin";
+    rev = "3df91dd81682d2ccfe542c4582dc1d5f98537c89";
+    sha256 = "18wx7bdqzp81xmwi266gphh2lfbcp5s0fzyp654gki40yhkqph6m";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "zanshin-fix-qt59-build.patch";
-      url = "https://phabricator.kde.org/R4:77ad64872f69ad9f7abe3aa8e103a12b95e100a4?diff=1";
-      sha256 = "0p497gqd3jmhbmqzh46zp6zwf6j1q77a9jp0in49xhgc2kj5ar7x";
-    })
-  ];
-
   nativeBuildInputs = [
     extra-cmake-modules
   ];

pkgs/desktops/kde-4.14/CVE-2014-8600.diff

@@ -1,19 +0,0 @@
---- a/kioslave/bookmarks/kio_bookmarks.cpp
-+++ b/kioslave/bookmarks/kio_bookmarks.cpp
-@@ -22,6 +22,7 @@
- #include <stdlib.h>
- 
- #include <qregexp.h>
-+#include <qtextdocument.h>
- 
- #include <kapplication.h>
- #include <kcmdlineargs.h>
-@@ -197,7 +198,7 @@
-     echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size"));
-   } else {
-     echoHead();
--    echo("<p class=\"message\">" + i18n("Wrong request: %1",path) + "</p>");
-+    echo("<p class=\"message\">" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "</p>");
-   }
-   finished();
- }

pkgs/desktops/kde-4.14/default.nix

@@ -1,36 +0,0 @@
-{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3", kdelibs }:
-
-let
-  branch = "4.14";
-
-  # Need callPackageOrig to avoid infinite cycle
-  kde = callPackageOrig ./kde-package {
-    inherit release branch ignoreList extraSubpkgs callPackage;
-  };
-
-  # The list of igored individual modules
-  ignoreList = {
-    # Doesn't work yet
-    kdeutils = [ "ksecrets" ];
-    # kdeadmin/strigi-analyzer has no real code
-    kdeadmin = [ "strigi-analyzer" ];
-    # Most of kdebindings do not compile due to a bug in the buildsystem
-    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
-  };
-
-  # Extra subpackages in the manifest format
-  extraSubpkgs = {};
-
-in
-
-kde.modules // kde.individual //
-{
-  akonadi = callPackage ./support/akonadi { };
-
-  inherit release;
-
-  l10n = callPackage ./l10n {
-    inherit release branch;
-    inherit (kde.manifest) stable;
-  };
-}

pkgs/desktops/kde-4.14/files/ksysguard-0001-disable-signalplottertest.patch

@@ -1,36 +0,0 @@
-From 38f35dcec38458f7192424b3d63bc0c614bb86e0 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 18:55:44 -0500
-Subject: [PATCH] ksysguard disable signalplottertest
-
----
- libs/ksysguard/tests/CMakeLists.txt | 16 ----------------
- 1 file changed, 16 deletions(-)
-
-diff --git a/libs/ksysguard/tests/CMakeLists.txt b/libs/ksysguard/tests/CMakeLists.txt
-index d472fd7..f178b71 100644
---- a/libs/ksysguard/tests/CMakeLists.txt
-+++ b/libs/ksysguard/tests/CMakeLists.txt
-@@ -14,19 +14,3 @@ target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIB
- set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
- kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
- target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KGraphicsSignalPlotter benchmark
--set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
--kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
--target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
--
--
--# KSignalPlotter unit test
--set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
--kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
--target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
--
--
--
--
--- 
-2.5.0
-

pkgs/desktops/kde-4.14/kactivities.nix

@@ -1,21 +0,0 @@
-{ fetchurl, kde, kdelibs }:
-
-kde {
-
-  src = fetchurl {
-    url = "mirror://kde/stable/4.13.3/src/kactivities-4.13.3.tar.xz";
-    sha256 = "12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  outputInclude = "out";
-
-  setOutputFlags = false;
-
-  propagatedBuildInputs = [ kdelibs ];
-
-  meta = {
-    description = "KDE activities library and daemon";
-  };
-}

pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix

@@ -1,15 +0,0 @@
-{ stdenv, kde, kdelibs, html-tidy, kactivities, libXt }:
-
-kde {
-  postPatch = ''
-    substituteInPlace konq-plugins/validators/tidy_validator.cpp \
-      --replace buffio.h tidybuffio.h
-  '';
-
-  buildInputs = [ kdelibs html-tidy kactivities libXt ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/desktops/kde-4.14/kde-package/4.14.3.nix

@@ -1,71 +0,0 @@
-{stable=true;
-hashes=builtins.listToAttrs[
-  {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";}
-  {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";}
-  {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";}
-  {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";}
-  {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";}
-  {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";}
-  {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";}
-  {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";}
-  {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";}
-  {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";}
-];
-versions=builtins.listToAttrs[
-  {name="baloo";value="4.14.3";}
-  {name="kactivities";value="4.13.3";}
-  {name="kde-baseapps";value="4.14.3";}
-  {name="kdepimlibs";value="4.14.3";}
-  {name="kde-runtime";value="4.14.3";}
-  {name="kfilemetadata";value="4.14.3";}
-  {name="libkcddb";value="4.14.3";}
-  {name="libkdcraw";value="4.14.3";}
-  {name="libkexiv2";value="4.14.3";}
-  {name="marble";value="4.14.3";}
-  {name="okular";value="4.14.3";}
-  {name="svgpart";value="4.14.3";}
-];
-modules=[
-{
-  module="kdemultimedia";
-  split=true;
-  pkgs=[
-    { name="libkcddb";  }
-  ];
-}
-{
-  module="kdegraphics";
-  split=true;
-  pkgs=[
-    { name="libkdcraw";  }
-    { name="libkexiv2";  }
-    { name="okular";  }
-    { name="svgpart";  }
-  ];
-}
-{
-  module="kdelibs";
-  split=true;
-  pkgs=[
-    { name = "baloo";  }
-    { name = "kfilemetadata";  }
-  ];
-}
-{
-  module="kdeedu";
-  split=true;
-  pkgs=[
-    { name="marble";  }
-  ];
-}
-{
-  module="kde-baseapps";
-sane="kde_baseapps";  split=true;
-  pkgs=[
-    { name="kde-baseapps"; sane="kde_baseapps"; }
-  ];
-}
-{ module="kactivities";  split=false;}
-{ module="kdepimlibs";  split=false;}
-];
-}

pkgs/desktops/kde-4.14/kde-package/default.nix

@@ -1,138 +0,0 @@
-{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake_2_8, automoc4, perl, pkgconfig
-, release, branch, ignoreList, extraSubpkgs
-}:
-
-let
-  inherit (stdenv.lib) filter fold;
-  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
-  cmake = cmake_2_8;
-in
-rec {
-  manifest = import (./. + "/${release}.nix");
-
-  # src attribute for $name tarball
-  kdesrc = name: version: fetchurl {
-    url = "mirror://kde/" + (if manifest.stable then "" else "un")
-      + "stable/${release}/src/${name}-${version}.tar.xz";
-    sha256 = getAttr name manifest.hashes;
-  };
-
-  # Default meta attribute
-  defMeta = {
-    homepage = http://www.kde.org;
-    inherit branch;
-    platforms = stdenv.lib.platforms.linux;
-    inherit (qt4.meta) maintainers;
-  };
-
-  # KDE package built from the whole tarball
-  # This function is used both for monolithic modules and modules which are
-  # released as individual tarballs
-  kdeMonoPkg = name:
-    let n_ = name; v_ = getAttr name manifest.versions; in
-    a@{meta, name ? n_, version ? v_, nativeBuildInputs ? [], ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${version}";
-      src = kdesrc name version;
-      nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
-      meta = defMeta // meta;
-      enableParallelBuilding = true;
-    } // (removeAttrs a [ "meta" "name" "nativeBuildInputs" ]));
-
-  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
-  # API.
-  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
-
-  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
-  kdeSubdirPkg = module:
-    {name, subdir ? name, sane ? name}:
-    let name_ = name; version_ = getAttr module manifest.versions; in
-    a@{cmakeFlags ? [], name ? name_, version ? version_, meta ? {}, nativeBuildInputs ? [], ...}:
-    stdenv.mkDerivation ({
-      name = "${name}-${release}";
-      src = kdesrc module version;
-      nativeBuildInputs = nativeBuildInputs ++ [ automoc4 cmake perl pkgconfig ];
-      cmakeFlags =
-        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
-          "-DBUILD_doc=TRUE"
-          "-DBUILD_${subdir}=TRUE"
-        ] ++ cmakeFlags;
-      meta = defMeta // meta;
-      enableParallelBuilding = module.enableParallelBuilding or true;
-    } // (removeAttrs a [ "meta" "name" "cmakeFlags" "nativeBuildInputs" ]));
-
-  # A KDE monolithic module
-  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
-
-  # Combine packages in one module.
-  # Arguments:
-  #  * pkgFun --- a function of the following signature:
-  #               module: manifest_attrs: manual_attrs: derivation;
-  #  * module --- name of the module
-  #  * pkgs --- list of packages in manifest format
-  combinePkgs = pkgFun: module: pkgs:
-    let
-      f = p@{name, ...}:
-        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
-      list = map f pkgs;
-      attrs = listToAttrs (map
-        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
-        pkgs);
-    in
-      runCommand "${module}-${release}"
-      ({passthru = attrs // {
-         propagatedUserEnvPackages = list;
-         projects = attrs;
-       };})
-        ''
-          mkdir -pv $out/nix-support
-          printWords ${toString list} | tee $out/nix-support/propagated-user-env-packages
-        '';
-
-  # Given manifest module data, return the module
-  kdeModule = { module, sane ? module, split, pkgs ? [] }:
-    let
-      pkgs_ = filterPkgs module pkgs;
-    in
-    # Module is splitted by upstream
-    if split then combinePkgs kdeSplittedPkg module pkgs_
-    # Monolithic module
-    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
-    # Module is splitted by us
-    else combinePkgs kdeSubdirPkg module pkgs_;
-
-  # The same, as nameValuePair with sane name
-  kdeModuleNV = a@{ module, sane ? module, ... }:
-    { name = sane; value = kdeModule a; };
-
-  filterPkgs = module: (p:
-      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
-      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
-
-  # Remove attrsets with x.name in subst. Optimized for empty subst.
-  removeNames = subst: big:
-    fold (s: out: filter (x: x.name != s) out) big subst;
-
-  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 allModules);
-
-  individual =
-    stdenv.lib.zipAttrsWith
-    (
-      name: list:
-      if tail list == []
-      then head list
-      else abort "Multiple modules define ${name}"
-    )
-    splittedModuleList;
-}

pkgs/desktops/kde-4.14/kde-package/kde-manifest.sh

@@ -1,173 +0,0 @@
-#! /bin/sh
-
-# Usage: download kde release to $dir, then run
-# $0 $dir
-
-dir="$1"
-
-
-if [[ -z $(type -p xsltproc) ]]; then
-  echo "Please provide libxslt" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kdelibs-*.tar.xz | \
-  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
-
-# Detect release number & whether it is a stable release
-if [[ $? -ne 0 || -z $release ]]; then
-  echo "'${dir}' is not a directory (or kdelibs...tar.xz doesn't exist)!" >&2
-  exit 1
-fi
-
-if [[ ${release##*.} -gt 50 ]]; then
-  stable="false"
-else
-  stable="true"
-fi
-
-echo "Detected release ${release}" >&2
-
-declare -A hash
-declare -A version
-declare -A modules
-declare -a packages
-declare -a top_level
-
-if [[ ! -f ${dir}/kde_projects.xml ]]; then
-  if ! curl -o "${dir}/kde_projects.xml" -J http://projects.kde.org/kde_projects.xml; then
-    echo "Could not download http://projects.kde.org/kde_projects.xml to ${dir}/kde_projects.xml" >&2
-    exit 1
-  fi
-fi
-# xsltproc output declares -A module
-eval `xsltproc kde-submodules.xslt ${dir}/kde_projects.xml`
-
-module[kde-baseapps]=kde-baseapps
-unset module[kactivities]
-
-print_sane() {
-  echo "Called print_sane $1" >&2
-  sane="${1//[^a-z0-9_]/_}"
-  if [[ "$sane" != "$1" ]]; then
-    echo "Sane version is $sane" >&2
-    echo -n "sane=\"$sane\";"
-  fi
-}
-
-for i in `cd "${dir}"; ls *.tar.xz`; do
-  package=${i%.tar.xz}
-  v=${package##*-}
-  package=${i%-*}
-  packages+=( "$package" )
-  echo -n "${package}.. " >&2
-  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo -n ${hash[$package]} >&2
-
-  version[$package]=$v
-
-  if [ -n "${module[$package]}" ]; then
-    m="${module[$package]}"
-    echo " (${m})" >&2
-    modules[$m]=1
-  else
-    top_level+=( "$package" )
-    echo " (top-level)" >&2
-  fi
-  nix-store --add-fixed sha256 "${dir}/${i}" >&2
-done
-
-
-print_pkg_hash() {
-  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
-}
-
-print_pkg_version() {
-  echo "  {name=\"${1}\";value=\"${version[$1]}\";}"
-}
-
-print_hashes(){
-  echo "hashes=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
-  echo "];"
-}
-
-print_versions(){
-  echo "versions=builtins.listToAttrs["
-  for p in "${packages[@]}"; do print_pkg_version "$p"; done
-  echo "];"
-}
-
-print_split_module(){
-  echo -n "$1:" >&2
-  echo -e "{\n  module=\"$1\";"
-  print_sane "$1"
-  echo "  split=true;"
-  echo "  pkgs=["
-  for p in "${packages[@]}"; do
-    if [[ "${module[$p]}" == "$1" ]]; then
-      echo -n "    { name=\"$p\"; "
-      print_sane "$p"
-      echo " }"
-      echo -n " $p" >&2
-    fi
-  done
-  echo "  ];"
-  echo "}"
-  echo >&2
-}
-
-print_mono_module(){
-  echo -en "{ module=\"$1\"; "
-  print_sane "$1"
-  echo -n "$1 ... " >&2
-  pkg=$(cd "$dir"; echo "$1"-*.tar.xz)
-  pkg="${pkg%.tar.xz}"
-  echo -n " split=false;"
-  cml="$pkg/CMakeLists.txt"
-  tar -xf "${dir}/$pkg.tar.xz" "$cml"
-  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
-    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
-      echo " is monolithic (has unconditionally added subdirs)" >&2
-    else
-      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
-        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
-        grep -v '\(doc\|cmake\)'` )
-      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
-      echo -e "\n  pkgs=["
-      for s in "${subdirs[@]}"; do
-        echo -en "    {"
-		echo -n " name=\"${s//\//-}\"; "
-        print_sane "$s"
-        if [[ $s != "${s//\//-}" ]]; then
-          echo -n "subdir=\"$s\"; "
-        fi
-        echo "}"
-      done
-      echo -e "  ];\n"
-    fi
-  else
-    echo " is monolithic (has no subdirs)" >&2
-  fi
-  rm $cml
-  rmdir "$pkg"
-  echo "}"
-}
-
-print_modules(){
-  echo "modules=["
-  echo "Printing modules splitted by upstream" >&2
-  for m in "${!modules[@]}"; do print_split_module "$m"; done
-  echo >&2
-  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
-  for m in "${top_level[@]}"; do print_mono_module "$m"; done
-  echo "];"
-}
-
-echo "Writing ${release}.nix" >&2
-exec > "${release}.nix"
-echo "{stable=${stable};"
-print_hashes
-print_versions
-print_modules
-echo "}"

pkgs/desktops/kde-4.14/kde-package/kde-submodules.xslt

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
-
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-
-	<xsl:output method="text" />
-	<xsl:template match="/">
-		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
-			<xsl:text>declare -A module
</xsl:text>
-			<xsl:for-each select="module">
-				<xsl:variable name="module" select='@identifier' />
-				<xsl:for-each select=".//project[repo]">
-					<xsl:text>module["</xsl:text>
-					<xsl:value-of select='@identifier' />
-					<xsl:text>"]="</xsl:text>
-					<xsl:value-of select="$module" />
-					<xsl:text>"
</xsl:text>
-				</xsl:for-each>
-			</xsl:for-each>
-		</xsl:for-each>
-	</xsl:template>
-</xsl:stylesheet>

pkgs/desktops/kde-4.14/kdeedu/marble.nix

@@ -1,12 +0,0 @@
-{ kde, kdelibs, gpsd }:
-
-kde {
-
-# TODO: package QextSerialPort, libshp(shapelib), QtMobility, QtLocation, libwlocate, quazip
-
-  buildInputs = [ kdelibs gpsd ];
-
-  meta = {
-    description = "Marble Virtual Globe";
-  };
-}

pkgs/desktops/kde-4.14/kdegraphics/libkdcraw.nix

@@ -1,11 +0,0 @@
-{ stdenv, kde, kdelibs, pkgconfig, libraw, lcms2 }:
-
-kde {
-
-  buildInputs = [ kdelibs libraw lcms2 ];
-
-  meta = {
-    description = "Library for decoding RAW images";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/desktops/kde-4.14/kdegraphics/libkexiv2.nix

@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs, exiv2 }:
-
-kde {
-  buildInputs = [ kdelibs exiv2 ];
-
-  meta = {
-    description = "Exiv2 support library";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/desktops/kde-4.14/kdegraphics/okular.nix

@@ -1,17 +0,0 @@
-{ stdenv, chmlib, djvulibre, ebook_tools, kde, kdelibs, libspectre, poppler_qt4, qca2
-, qimageblitz, libtiff, kactivities, pkgconfig, libkexiv2 }:
-
-kde {
-
-# TODO: package activeapp, qmobipocket
-
-  buildInputs = [ kdelibs chmlib djvulibre ebook_tools libspectre poppler_qt4
-                  qca2 qimageblitz libtiff kactivities libkexiv2 ];
-
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/desktops/kde-4.14/kdegraphics/svgpart.nix

@@ -1,10 +0,0 @@
-{ stdenv, kde, kdelibs }:
-
-kde {
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    description = "SVG KPart";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/desktops/kde-4.14/kdelibs/baloo.nix

@@ -1,18 +0,0 @@
-{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost
-}:
-
-kde {
-
-# TODO: qmobipocket
-
-  buildInputs = [
-    kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost
-  ];
-
-  nativeBuildInputs = [ pkgconfig doxygen ];
-
-  meta = {
-    description = "Baloo";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/desktops/kde-4.14/kdelibs/kfilemetadata.nix

@@ -1,14 +0,0 @@
-{ stdenv, kde, kdelibs, pkgconfig, doxygen, poppler_qt4, taglib, exiv2, ffmpeg }:
-
-kde {
-  buildInputs = [
-    kdelibs poppler_qt4 taglib exiv2 ffmpeg
-  ];
-
-  nativeBuildInputs = [ pkgconfig doxygen ];
-
-  meta = {
-    description = "KFileMetaData";
-    license = stdenv.lib.licenses.gpl2;
-  };
-}

pkgs/desktops/kde-4.14/kdemultimedia/libkcddb.nix

@@ -1,8 +0,0 @@
-{ kde, kdelibs }:
-kde {
-#todo: libmusicbrainz5
-  buildInputs = [ kdelibs ];
-  meta = {
-    description = "A library used to retrieve audio CD meta data from the internet";
-  };
-}

pkgs/desktops/kde-4.14/kdepimlibs.nix

@@ -1,35 +0,0 @@
-{ kde, pkgconfig, boost, cyrus_sasl, gpgme, libical, openldap, prison
-, kdelibs, akonadi, libxslt
-, shared_mime_info, shared_desktop_ontologies, qjson
-, automoc4, cmake_2_8, perl
-}:
-
-kde {
-  outputs = [ "out" "dev" ];
-
-  outputInclude = "out";
-
-  setOutputFlags = false;
-
-  nativeBuildInputs = [ automoc4 cmake_2_8 perl pkgconfig ];
-
-  cmakeFlags = [
-    "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.3"
-  ];
-
-  buildInputs =
-    [ boost gpgme libical libxslt qjson prison
-      openldap cyrus_sasl akonadi shared_desktop_ontologies
-      shared_mime_info
-    ];
-
-  propagatedBuildInputs = [ kdelibs ];
-
-  # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev.
-  postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake";
-
-  meta = {
-    description = "KDE PIM libraries";
-    license = "LGPL";
-  };
-}

pkgs/desktops/kde-4.14/l10n/default.nix

@@ -1,52 +0,0 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, kdelibs, gettext, release, branch, stable
-}:
-
-let
-
-  inherit (stdenv.lib) attrByPath singleton;
-
-  kdeL10nDerivation =
-    { lang, saneName, sha256 }:
-
-    stdenv.mkDerivation rec {
-      name = "kde-l10n-${saneName}-${release}";
-
-      src = fetchurl {
-        url = "mirror://kde/${if stable then "" else "un"}stable/${release}/src/kde-l10n/kde-l10n-${lang}-${release}.tar.xz";
-        name = "${name}.tar.xz";
-        inherit sha256;
-      };
-
-      buildInputs = [ gettext kdelibs ];
-
-      nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-
-      cmakeFlags = [
-        "-Wno-dev"
-      ];
-
-      meta = {
-        description = "KDE translation for ${lang}";
-        inherit branch;
-        license = "GPL";
-        platforms = stdenv.lib.platforms.linux;
-        inherit (kdelibs.meta) maintainers homepage;
-      };
-    };
-
-  kdeL10nRelease =
-    builtins.listToAttrs (
-      map ({lang, saneName, sha256}:
-        {
-          name = saneName;
-          value = kdeL10nDerivation { inherit lang saneName sha256; };
-        }
-      ) (import (./manifest + "-${release}.nix"))
-    );
-
-in
-{
-  inherit kdeL10nDerivation;
-  recurseForDerivations = true;
-} // kdeL10nRelease

pkgs/desktops/kde-4.14/l10n/l10n-manifest.sh

@@ -1,32 +0,0 @@
-#!/bin/sh
-
-# Usage: download kde-l10n to $dir, then run
-# $0 $dir
-
-dir=$1
-
-if [[ ! -d "${dir}" ]]; then
-  echo "${dir} is not a directory (or doesn't exist)!" >&2
-  exit 1
-fi
-
-release=$(ls "${dir}"/kde-l10n-en_GB-*.tar.xz | \
-	sed -e 's/.*en_GB-//' -e 's/\.tar\.xz//')
-
-echo "Detected release ${release}" >&2
-
-exec > "manifest-${release}.nix"
-echo "["
-for i in `cd "${dir}"; ls kde-l10n-*-${release}.tar.xz`; do
-  lang=${i%-${release}.tar.xz}
-  lang=${lang#kde-l10n-}
-  echo -n "${lang}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  lang = \"${lang}\";"
-  echo "  saneName = \"$(echo $lang | sed s^@^_^g)\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
-done
-echo "]"

pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix

@@ -1,267 +0,0 @@
-[
-{
-  lang = "ar";
-  saneName = "ar";
-  sha256 = "1amzzwa4zhwm0r1b1fdi0fjp883wpbjh12wn9q42g04xzza6nq04";
-}
-{
-  lang = "bg";
-  saneName = "bg";
-  sha256 = "1x1yx6lw86bwv2d7lcfb061k1pqgqw6abqwrga7pnzfmk2fcaawb";
-}
-{
-  lang = "bs";
-  saneName = "bs";
-  sha256 = "148195dk6wmymk6jib467a10w9jajh3bmx1igxl29l7vp33xpgng";
-}
-{
-  lang = "ca";
-  saneName = "ca";
-  sha256 = "04bgjfwr5pwn79lh3wixajswmccfcqll5dnjhf84zw7p09138m0v";
-}
-{
-  lang = "ca@valencia";
-  saneName = "ca_valencia";
-  sha256 = "0p257jjilkmjrq9ddvwfdh41911b2yrcrid1j31g7gg9gp7iriq4";
-}
-{
-  lang = "cs";
-  saneName = "cs";
-  sha256 = "0kjn9pq9p8bfja6ca4pcpqgli9k1mfyh77j6i8p28i37wfmgv0cn";
-}
-{
-  lang = "da";
-  saneName = "da";
-  sha256 = "1w0ylqnxkbqz6camk8045nrxpz1n4dbz8cgl559l31m7zacq1rmb";
-}
-{
-  lang = "de";
-  saneName = "de";
-  sha256 = "0i97h1jcm8lpv3pap7wiz8nvjwf00jav5z5ymsbklagvmbmwyfyk";
-}
-{
-  lang = "el";
-  saneName = "el";
-  sha256 = "1br19741hmn08g3vzmx8dilx2kdfbg5zv1rjxnigdfwi0zphqyw9";
-}
-{
-  lang = "en_GB";
-  saneName = "en_GB";
-  sha256 = "1flp57prc12ri2rhh6vwf6hb5mqj8w1sj94pnji02ylmkghcc466";
-}
-{
-  lang = "es";
-  saneName = "es";
-  sha256 = "0waccr5mih5nv4q31k6xn07iws2by8n67riij6k9nsfsrlrxv21g";
-}
-{
-  lang = "et";
-  saneName = "et";
-  sha256 = "1bqd4jaws8890r2zjzpf6pw1k9v7h2lr7xk1dzfs8ak7gny32fm9";
-}
-{
-  lang = "eu";
-  saneName = "eu";
-  sha256 = "0q4cac4vp1s7fda328xxyzhqll0iqinn5v9syb93xfj29kij4ja2";
-}
-{
-  lang = "fa";
-  saneName = "fa";
-  sha256 = "0avabmdm9bxyb5b5d0mrv8mmwp6j1r4ch7y0ab7b4zl380blw7d3";
-}
-{
-  lang = "fi";
-  saneName = "fi";
-  sha256 = "0lk0r03r2wmqpf8n9zvwpsbl7s11dipa8kc3lmkh1yrjk8c4z2sw";
-}
-{
-  lang = "fr";
-  saneName = "fr";
-  sha256 = "1gzwc6yj7x7x3jx0270ap5nf70ckl25lqccrxiyzwx3mqfxgfbx2";
-}
-{
-  lang = "ga";
-  saneName = "ga";
-  sha256 = "0bkf62cqj4rfgz81yj9jspv5jfa932hsyhk4kq0r2hqsm8gndddd";
-}
-{
-  lang = "gl";
-  saneName = "gl";
-  sha256 = "00m4m480fqls5i1cvdidkq3nb8xzqhgyqqp0zk3j3qybxfq98yg5";
-}
-{
-  lang = "he";
-  saneName = "he";
-  sha256 = "1488lk7jniv0hj77wcfxplxw10srp3df6lv6llss8b5m3yqb061a";
-}
-{
-  lang = "hi";
-  saneName = "hi";
-  sha256 = "16ni7257b1ch0wabncvq17569c57ncz7pzqgqm830bj8ldpk9zzv";
-}
-{
-  lang = "hr";
-  saneName = "hr";
-  sha256 = "1si90cnwjsvw553pmppb0aakfk7fan2jk44ag0j191kdiir2b3xk";
-}
-{
-  lang = "hu";
-  saneName = "hu";
-  sha256 = "1x2s2cd521ffp5azzrzq2w2cr4sjz6gpg1a1h9jg4749xwqfhc1a";
-}
-{
-  lang = "ia";
-  saneName = "ia";
-  sha256 = "1ybaihygv0lviw6bq3a6ki40glgs49gsk29abq4y95bi9ymlrryc";
-}
-{
-  lang = "id";
-  saneName = "id";
-  sha256 = "1s8zliwc737avc04n2l27rhhh9isz9ag81nsajai27yxif0ncn7x";
-}
-{
-  lang = "is";
-  saneName = "is";
-  sha256 = "1x2mag8jwlmbh8v8y3rmvp9n69sv2xfwwsxw7c9vb8qg4cybax1c";
-}
-{
-  lang = "it";
-  saneName = "it";
-  sha256 = "1ng2hzrbvcak3nhbmlb3h64a15h34zfrgabzwrjvi2b0fv8liycw";
-}
-{
-  lang = "ja";
-  saneName = "ja";
-  sha256 = "01klhf9bmha9x6s39r4wnd0hxn35jg5bh7h9rwqij3nf06rddfrj";
-}
-{
-  lang = "kk";
-  saneName = "kk";
-  sha256 = "149fi65z1x64svs00rn82njmw6l0pncgs4b5d66fb18ah3bjlfg2";
-}
-{
-  lang = "km";
-  saneName = "km";
-  sha256 = "17hjv0gi2fqa5gkjgmqkxb4k7z3zizrxax6inq8s03g4f2vfibaz";
-}
-{
-  lang = "ko";
-  saneName = "ko";
-  sha256 = "19yhacc0v5grxc35bmks9r4qy091qij26yfi2qvs3rca7cc374jp";
-}
-{
-  lang = "lt";
-  saneName = "lt";
-  sha256 = "0y0nkvqidc12paf8ghk4p6z213gxcyv27nvglk120l2602980idj";
-}
-{
-  lang = "lv";
-  saneName = "lv";
-  sha256 = "0msw54v8d9p08c7prw6m20w29qf8f0yb32s378knhsql6abv5gln";
-}
-{
-  lang = "mr";
-  saneName = "mr";
-  sha256 = "05kcm7x7jj4lppn6fd1jlzl37r3gs9wrz0cckwpscc2m6y2g7p55";
-}
-{
-  lang = "nb";
-  saneName = "nb";
-  sha256 = "0wsdr8yyjjik2h30xy7y38i5hagy4jya98cqjbcrrab35i677l9a";
-}
-{
-  lang = "nds";
-  saneName = "nds";
-  sha256 = "0lr5z1r8v3fkqpkcjvnml2s9jh50wmqsqiyls9ivr46ygwm8wcbq";
-}
-{
-  lang = "nl";
-  saneName = "nl";
-  sha256 = "09w8cniq3z11900axjcdlm24jbzjjsqcpdwpvhvc9z78hfsjqp36";
-}
-{
-  lang = "nn";
-  saneName = "nn";
-  sha256 = "1b304wg1143pk7ib8k451g2riq87c1h0611khslghy428q4rviwd";
-}
-{
-  lang = "pa";
-  saneName = "pa";
-  sha256 = "02y56ld5hiywph88khh55hqg0gpcvmqcqrbpsidzx3qdgh5j40nl";
-}
-{
-  lang = "pl";
-  saneName = "pl";
-  sha256 = "137mfrr7wza2pg4yzqqi93bsmsrjvj0ar27gi3lk1qh6zniwyjai";
-}
-{
-  lang = "pt";
-  saneName = "pt";
-  sha256 = "1zb454rg4pigkldg9jp97r2r7k8azwxbal77zscky2q6rbw0sjcn";
-}
-{
-  lang = "pt_BR";
-  saneName = "pt_BR";
-  sha256 = "1zrn09k99pfscnc5zyxh1jzyrbirhy8ilwacbgg913maaanjprny";
-}
-{
-  lang = "ro";
-  saneName = "ro";
-  sha256 = "1lkr14if7jmfcxmb10pf11a6xjxxqxrq45lwdx19kj3djgr5l4pc";
-}
-{
-  lang = "ru";
-  saneName = "ru";
-  sha256 = "1ldf4y9wck339n0jq8x43x9h57jvfg3qk0spfv9d5fw9qyxygwwi";
-}
-{
-  lang = "sk";
-  saneName = "sk";
-  sha256 = "1n4qjwvpkddwizl8k3gr1xwv8icwd6lqsg09cypax049g3q2sy4p";
-}
-{
-  lang = "sl";
-  saneName = "sl";
-  sha256 = "1k111r9ssprgali6sg3wpbvp635hb56ckmcgpdhyvk6bbkcbnbmr";
-}
-{
-  lang = "sr";
-  saneName = "sr";
-  sha256 = "0pini77jlnrv2fhl0j99wjxylwlj77bihcbfvnkf5bganffgwc11";
-}
-{
-  lang = "sv";
-  saneName = "sv";
-  sha256 = "0ykxy95a4q0pp5ibmw20ckg33b3h89g2m86p6fcfnqf6350nxs2v";
-}
-{
-  lang = "tr";
-  saneName = "tr";
-  sha256 = "15vcfpyc30ia6bsjgwv3zhydv2nlnmggr8i2yjpnb5dlynn3sywh";
-}
-{
-  lang = "ug";
-  saneName = "ug";
-  sha256 = "0qhzfbd3j0d7grg4ghzn7y5vrl031iz9krifv7dv6jgp68fzz1h0";
-}
-{
-  lang = "uk";
-  saneName = "uk";
-  sha256 = "03n2myhwx9lvm1vzqvrg2sgl3y1m0rrrskqa22m06fjmh4vxawhx";
-}
-{
-  lang = "wa";
-  saneName = "wa";
-  sha256 = "11b7gyy31n2zfhkaj304pd4lkr14sp1sgi4pzv86c824sr6lp01v";
-}
-{
-  lang = "zh_CN";
-  saneName = "zh_CN";
-  sha256 = "1r5gxadd94ckdpkwcchwa8k735g2y9x7bi6px6hm7qlxdbi9sjmq";
-}
-{
-  lang = "zh_TW";
-  saneName = "zh_TW";
-  sha256 = "04bvvb3na4arns483fz27npjs045hf3s53p2rkd2nvq9gwvn0kmi";
-}
-]

pkgs/desktops/kde-4.14/support/akonadi/default.nix

@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, cmake, qt4, shared_mime_info, libxslt, boost, automoc4, soprano, sqlite, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "akonadi-1.13.0";
-  
-  src = fetchurl {
-    url = "mirror://kde/stable/akonadi/src/${name}.tar.bz2";
-    sha256 = "8c7f690002ea22c139f3a64394aef2e816e00ca47fd971af7d54a66087356dd2";
-  };
-
-  buildInputs = [ qt4 soprano libxslt boost sqlite ];
-
-  nativeBuildInputs = [ cmake automoc4 shared_mime_info pkgconfig ];
-
-  enableParallelBuilding = true;
-  
-  meta = with stdenv.lib; {
-    description = "KDE PIM Storage Service";
-    license = "LGPL";
-    homepage = http://pim.kde.org/akonadi;
-    maintainers = [ maintainers.sander maintainers.phreedom ];
-    platforms = platforms.linux;
-  };
-}

pkgs/desktops/plasma-5/breeze-qt4.nix

@@ -1,17 +0,0 @@
-{
-  mkDerivation, lib,
-  automoc4, cmake, perl, pkgconfig,
-  kdelibs4, qt4, xproto
-}:
-
-mkDerivation {
-  name = "breeze-qt4";
-  sname = "breeze";
-  buildInputs = [ kdelibs4 qt4 xproto ];
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
-  outputs = [ "out" "dev" ];
-  cmakeFlags = [
-    "-DUSE_KDE4=ON"
-    "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
-  ];
-}

pkgs/desktops/plasma-5/default.nix

@@ -100,7 +100,6 @@ let
     in {
       bluedevil = callPackage ./bluedevil.nix {};
       breeze-gtk = callPackage ./breeze-gtk.nix {};
-      breeze-qt4 = callPackage ./breeze-qt4.nix {};
       breeze-qt5 = callPackage ./breeze-qt5.nix {};
       breeze-grub = callPackage ./breeze-grub.nix {};
       breeze-plymouth = callPackage ./breeze-plymouth {};

pkgs/development/python-modules/pykde4/default.nix

@@ -0,0 +1,43 @@
+{ pyqt4,
+  stdenv, callPackage, fetchurl, cmake, automoc4, sip }:
+
+let
+  kdelibs = callPackage ./kdelibs.nix {};
+  sip4_19_3 = sip.overrideAttrs (oldAttrs: rec {
+    src = fetchurl {
+      url = "mirror://sourceforge/pyqt/sip/sip-4.19.3/sip-4.19.3.tar.gz";
+      sha256 = "0x2bghbprwl3az1ni3p87i0bq8r99694la93kg65vi0cz12gh3bl";
+    };
+  });
+  pyqt4_fixed = pyqt4.overrideAttrs (oldAttrs: rec {
+    propagatedBuildInputs = [ sip4_19_3 ];
+  });
+in stdenv.mkDerivation rec {
+  version = "4.14.3";
+  name = "pykde4-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${version}/src/${name}-${version}.tar.xz";
+    sha256 = "1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";
+  };
+
+  patches = [ ./dlfcn.patch ];
+
+  buildInputs = [
+    kdelibs
+  ];
+
+  nativeBuildInputs = [ cmake automoc4 ];
+
+  propagatedBuildInputs = [ pyqt4_fixed ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    description = "Python bindings for KDE";
+    license = with licenses; [ gpl2 lgpl2 ];
+    homepage = https://api.kde.org/pykde-4.3-api/;
+    maintainers = with maintainers; [ gnidorah ];
+  };
+}

pkgs/development/python-modules/pykde4/dlfcn.patch

@@ -0,0 +1,13 @@
+--- __init__.py.orig	2017-11-02 09:06:48.998054459 +0300
++++ ./__init__.py	2017-11-02 09:24:28.089072752 +0300
+@@ -1,4 +1,8 @@
+-import sys,DLFCN
++import sys
++try:
++    import DLFCN
++except ImportError:
++    import os as DLFCN
+ # This is needed to ensure that dynamic_cast and RTTI works inside kdelibs.
+ sys.setdlopenflags(DLFCN.RTLD_NOW|DLFCN.RTLD_GLOBAL)
+      
+\ No newline at end of file

pkgs/development/python-modules/pykde4/kdelibs.nix

@@ -0,0 +1,38 @@
+{
+  stdenv, fetchurl,
+  automoc4, cmake_2_8, libxslt, perl, pkgconfig, shared_mime_info,
+  attica, docbook_xml_dtd_42, docbook_xsl, giflib,
+  libdbusmenu_qt, libjpeg, phonon, qt4
+}:
+
+stdenv.mkDerivation rec {
+  version = "4.14.38";
+  name = "kdelibs-${version}";
+  src = fetchurl {
+    url = "mirror://kde/stable/applications/17.08.3/src/${name}.tar.xz";
+    sha256 = "1zn3yb09sd22bm54is0rn98amj0398zybl550dp406419sil7z9p";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    automoc4 cmake_2_8 libxslt perl pkgconfig shared_mime_info
+  ];
+  buildInputs = [
+    attica giflib libdbusmenu_qt libjpeg
+  ];
+  propagatedBuildInputs = [ qt4 phonon ];
+
+  cmakeFlags = [
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    "-DKJS_FORCE_DISABLE_PCRE=true"
+    "-DWITH_SOLID_UDISKS2=OFF"
+  ];
+
+  meta = with stdenv.lib; {
+    platforms = platforms.linux;
+    homepage = http://www.kde.org;
+    license = with licenses; [ gpl2 fdl12 lgpl21 ];
+  };
+}

pkgs/tools/inputmethods/uim/default.nix

@@ -6,10 +6,7 @@
 , withGtk3 ? withGtk, gtk3 ? null
 , withQt ? true
 , withQt4 ? withQt, qt4 ? null
-, withKde ? withQt
+, withLibnotify ? true, libnotify ? null
-, withKde4 ? withKde && withQt4, kdelibs4 ? null, automoc4 ? null
-, withKNotify4 ? false
-, withLibnotify ? !withKNotify4, libnotify ? null
 , withSqlite ? true, sqlite ? null
 , withNetworking ? true, curl ? null, openssl ? null
 , withFFI ? true, libffi ? null
@@ -24,9 +21,7 @@ assert withAnthy -> anthy != null;
 assert withGtk2 -> gtk2 != null;
 assert withGtk3 -> gtk3 != null;
 assert withQt4 -> qt4 != null;
-assert withKde4 -> withQt4 && kdelibs4 != null && automoc4 != null;
+assert withLibnotify -> libnotify != null;
-assert withKNotify4 -> withKde4 && !withLibnotify;
-assert withLibnotify -> !withKNotify4 && libnotify != null;
 assert withSqlite -> sqlite != null;
 assert withNetworking -> curl != null && openssl != null;
 assert withFFI -> libffi != null;
@@ -49,9 +44,6 @@ stdenv.mkDerivation rec {
   ++ optional withGtk2 gtk2
   ++ optional withGtk3 gtk3
   ++ optional withQt4 qt4
-  ++ optionals withKde4 [
-    kdelibs4 automoc4
-  ]
   ++ optional withLibnotify libnotify
   ++ optional withSqlite sqlite
   ++ optionals withNetworking [
@@ -76,8 +68,6 @@ stdenv.mkDerivation rec {
     "--with-qt4"
     "--with-qt4-immodule"
   ]
-  ++ optional withKde4 "--enable-kde4-applet"
-  ++ optional withKNotify4 "--enable-notify=knotify4"
   ++ optional withLibnotify "--enable-notify=libnotify"
   ++ optional withSqlite "--with-sqlite3"
   ++ optionals withNetworking [

pkgs/top-level/all-packages.nix

@@ -2959,10 +2959,6 @@ with pkgs;
 
   kpcli = callPackage ../tools/security/kpcli { };
 
-  # kget is part of kde-applications but the released version is still for KDE 4
-  # This needs to move to the proper place when the "frameworks" branch is released
-  kget = libsForQt5.callPackage ../applications/networking/kget { };
-
   krename = libsForQt5.callPackage ../applications/misc/krename { };
 
   kronometer = libsForQt5.callPackage ../tools/misc/kronometer { };
@@ -5109,7 +5105,7 @@ with pkgs;
 
   uhttpmock = callPackage ../development/libraries/uhttpmock { };
 
-  uim = kde4.callPackage ../tools/inputmethods/uim { };
+  uim = callPackage ../tools/inputmethods/uim { };
 
   uhub = callPackage ../servers/uhub { };
 
@@ -8977,8 +8973,6 @@ with pkgs;
     in
       recurseIntoAttrs (makeOverridable mkFrameworks attrs);
 
-  kdelibs4 = kdeApplications.kdelibs;
-
   keybinder = callPackage ../development/libraries/keybinder {
     automake = automake111x;
     lua = lua5_1;
@@ -13066,8 +13060,6 @@ with pkgs;
 
   gocode = callPackage ../development/tools/gocode { };
 
-  kgocode = callPackage ../applications/misc/kgocode { };
-
   gotags = callPackage ../development/tools/gotags { };
 
   golint = callPackage ../development/tools/golint { };
@@ -13972,11 +13964,6 @@ with pkgs;
 
   msgviewer = callPackage ../applications/networking/mailreaders/msgviewer { };
 
-  amarok = kde4.callPackage ../applications/audio/amarok {
-    ffmpeg = ffmpeg_2;
-    stdenv = overrideCC stdenv gcc5;
-  };
-
   amarok-kf5 = libsForQt5.callPackage ../applications/audio/amarok/kf5.nix { };
 
   AMB-plugins = callPackage ../applications/audio/AMB-plugins { };
@@ -14214,10 +14201,6 @@ with pkgs;
 
   calibre = libsForQt5.callPackage ../applications/misc/calibre { };
 
-  calligra2 = kde4.callPackage ../applications/office/calligra/2.nix {
-    vc = vc_0_7;
-  };
-
   calligra = libsForQt5.callPackage ../applications/office/calligra {
     inherit (kdeApplications) akonadi-calendar akonadi-contacts;
     openjpeg = openjpeg_1;
@@ -15573,8 +15556,6 @@ with pkgs;
 
   k9copy = libsForQt5.callPackage ../applications/video/k9copy {};
 
-  kadu = kde4.callPackage ../applications/networking/instant-messengers/kadu { };
-
   kanboard = callPackage ../applications/misc/kanboard { };
 
   kdeApplications =
@@ -15591,7 +15572,7 @@ with pkgs;
   inherit (kdeApplications)
     akonadi akregator ark dolphin ffmpegthumbs filelight gwenview k3b
     kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf keditbookmarks
-    kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
+    kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
     kontact korganizer krdc krfb kwalletmanager marble minuet okteta okular spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
@@ -16470,7 +16451,7 @@ with pkgs;
     python = python3;
   };
 
-  psi = kde4.callPackage ../applications/networking/instant-messengers/psi { };
+  psi = callPackage ../applications/networking/instant-messengers/psi { };
 
   psi-plus = callPackage ../applications/networking/instant-messengers/psi-plus { };
 
@@ -18590,24 +18571,6 @@ with pkgs;
 
   kakasi = callPackage ../tools/text/kakasi { };
 
-  kde4 =
-    let
-      deps = lib.makeScope newScope (self: {
-        inherit (python2Packages) python;
-        kdelibs = kdelibs4;
-        boost = boost155;
-        ffmpeg = ffmpeg_2; # ffmpegthumb doesn't build otherwise
-      });
-
-      self = lib.makeScope deps.newScope (self: with self;
-        import ../desktops/kde-4.14 {
-          callPackageOrig = pkgs.callPackage;
-          inherit (self) callPackage;
-          inherit stdenv qt48 kdelibs;
-        }
-      );
-    in recurseIntoAttrs self;
-
   lumina = libsForQt5.callPackage ../desktops/lumina { };
 
   lxqt = recurseIntoAttrs (import ../desktops/lxqt {
@@ -18680,7 +18643,7 @@ with pkgs;
   inherit (kdeFrameworks) kded kinit frameworkintegration;
 
   inherit (plasma5)
-    bluedevil breeze-gtk breeze-qt4 breeze-qt5 breeze-grub breeze-plymouth
+    bluedevil breeze-gtk breeze-qt5 breeze-grub breeze-plymouth
     kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5
     kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard
     kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop

pkgs/top-level/python-packages.nix

@@ -303,6 +303,11 @@ in {
 
   pyjwkest = callPackage ../development/python-modules/pyjwkest { };
 
+  pykde4 = callPackage ../development/python-modules/pykde4/default.nix {
+    inherit (self) pyqt4;
+    callPackage = pkgs.callPackage;
+  };
+
   pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
     pythonPackages = self;
   };