Merge branch 'kde5-split-qt'

.gitignore

@@ -14,5 +14,5 @@ result-*
 
 /pkgs/applications/kde-apps-*/tmp/
 /pkgs/development/libraries/kde-frameworks-*/tmp/
-/pkgs/development/libraries/qt-5/*-submodules/tmp/
+/pkgs/development/libraries/qt-5/*/tmp/
 /pkgs/desktops/plasma-*/tmp/

nixos/modules/programs/environment.nix

@@ -47,7 +47,8 @@ in
         KDEDIRS = [ "" ];
         STRIGI_PLUGIN_PATH = [ "/lib/strigi/" ];
         QT_PLUGIN_PATH = [ "/lib/qt4/plugins" "/lib/kde4/plugins" "/lib/qt5/plugins" ];
-        QML2_IMPORT_PATH = [ "/lib/qml" ];
+        QML_IMPORT_PATH = [ "/lib/qt5/imports" ];
+        QML2_IMPORT_PATH = [ "/lib/qt5/qml" ];
         QTWEBKIT_PLUGIN_PATH = [ "/lib/mozilla/plugins/" ];
         GTK_PATH = [ "/lib/gtk-2.0" "/lib/gtk-3.0" ];
         XDG_CONFIG_DIRS = [ "/etc/xdg" ];

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

@@ -11,12 +11,14 @@ let
   phononBackends = {
     gstreamer = [
       pkgs.phonon_backend_gstreamer
+      pkgs.gst_all.gstreamer
       pkgs.gst_all.gstPluginsBase
       pkgs.gst_all.gstPluginsGood
       pkgs.gst_all.gstPluginsUgly
       pkgs.gst_all.gstPluginsBad
       pkgs.gst_all.gstFfmpeg # for mp3 playback
       pkgs.phonon_qt5_backend_gstreamer
+      pkgs.gst_all_1.gstreamer
       pkgs.gst_all_1.gst-plugins-base
       pkgs.gst_all_1.gst-plugins-good
       pkgs.gst_all_1.gst-plugins-ugly
@@ -33,7 +35,7 @@ let
   phononBackendPackages = flip concatMap cfg.phononBackends
     (name: attrByPath [name] (throw "unknown phonon backend `${name}'") phononBackends);
 
-  kf5 = pkgs.kf5_stable;
+  kf5 = plasma5.kf5;
 
   plasma5 = pkgs.plasma5_stable;
 
@@ -56,8 +58,8 @@ in
         default = ["gstreamer"];
         example = ["gstreamer" "vlc"];
         description = ''
-          Phonon backends to use in KDE. Only the VLC and gstreamer backends are
-          available. The VLC backend is preferred by upstream.
+          Phonon backends to use in KDE. Only the VLC and GStreamer backends are
+          available. The GStreamer backend is preferred by upstream.
         '';
       };
 
@@ -85,17 +87,17 @@ in
       setuid = true;
     };
 
-    environment.systemPackages = with plasma5; with kf5;
+    environment.systemPackages =
       (builtins.attrValues
         (removeAttrs plasma5
-          [ "deepOverride" "override" "overrideDerivation"
+          [ "deepOverride" "kf5" "override" "overrideDerivation"
             "recurseForDerivations" "scope"
           ]))
       ++
       (builtins.attrValues
         (removeAttrs kf5
-          [ "deepOverride" "extra-cmake-modules" "mkDerivation" "override"
-            "overrideDerivation" "recurseForDerivations" "scope"
+          [ "deepOverride" "mkDerivation" "override" "overrideDerivation"
+            "recurseForDerivations" "qt5" "scope"
           ]))
       ++
       [
@@ -113,7 +115,7 @@ in
 
         pkgs.orion # GTK theme, nearly identical to Breeze
       ]
-      ++ (optional config.networking.networkmanager.enable plasma-nm)
+      ++ (optional config.networking.networkmanager.enable plasma5.plasma-nm)
       ++ phononBackendPackages;
 
     environment.pathsToLink = [ "/share" ];
@@ -136,6 +138,9 @@ in
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
 
+    # Extra UDEV rules used by Solid
+    services.udev.packages = [ pkgs.media-player-info ];
+
     security.pam.services.kde = { allowNullPassword = true; };
 
   };

pkgs/applications/kde-apps-14.12/default.nix

@@ -12,7 +12,7 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, kde4, kf5, pkgs, qt4, stdenv, debug ? false }:
+{ autonix, symlinkJoin, kde4, kf5, pkgs, qt4, qt5, stdenv, debug ? false }:
 
 with stdenv.lib; with autonix;
 
@@ -20,7 +20,7 @@ let kf5Orig = kf5; in
 
 let
 
-  kf5 = kf5Orig.override { inherit debug; };
+  kf5 = kf5Orig.override { inherit debug qt5; };
 
   mirror = "mirror://kde";
 
@@ -37,6 +37,22 @@ let
       "LibKonq" = "kde-baseapps";
     };
 
+  mkDerivation = drv: kf5.mkDerivation (drv // {
+    preHook = (drv.preHook or "") + ''
+      addQt4Plugins() {
+        if [[ -d "$1/lib/qt4/plugins" ]]; then
+            propagatedUserEnvPkgs+=" $1"
+        fi
+
+        if [[ -d "$1/lib/kde4/plugins" ]]; then
+            propagatedUserEnvPkgs+=" $1"
+        fi
+      }
+
+      envHooks+=(addQt4Plugins)
+    '';
+  });
+
   scope =
     # packages in this collection
     (mapAttrs (dep: name: kdeApps."${name}") renames) //
@@ -131,8 +147,36 @@ let
         (blacklist ["kdewebdev"]) # unknown build failure
       ];
 
+  l10nPkgQt4 = orig:
+    let drvName = builtins.parseDrvName orig.name; in
+    mkDerivation {
+      name = "${drvName.name}-qt4-${drvName.version}";
+      inherit (orig) src;
+      buildInputs = [ kdeApps.kdelibs ];
+      nativeBuildInputs = with pkgs; [ cmake gettext perl ];
+      preConfigure = ''
+        cd 4/
+      '';
+    };
+
+  l10nPkgQt5 = orig:
+    let drvName = builtins.parseDrvName orig.name; in
+    mkDerivation {
+      name = "${drvName.name}-qt5-${drvName.version}";
+      inherit (orig) src;
+      buildInputs = with kf5; [ kdoctools ki18n ];
+      nativeBuildInputs = with pkgs; [ cmake kf5.extra-cmake-modules gettext perl ];
+      preConfigure = ''
+        cd 5/
+      '';
+    };
+
+  l10nPkg = name: orig: symlinkJoin orig.name [(l10nPkgQt4 orig) (l10nPkgQt5 orig)];
+
+  removeL10nPkgs = filterAttrs (n: v: !(hasPrefix "kde-l10n") n);
+
   postResolve = super:
-    super // {
+    (removeL10nPkgs super) // {
 
       ark = with pkgs; super.ark // {
         buildInputs = (super.ark.buildInputs or []) ++ [ makeWrapper ];
@@ -264,9 +308,14 @@ let
 
     };
 
+  l10nManifest =
+    filterAttrs
+      (n: v: hasPrefix "kde-l10n" n)
+      (importManifest ./manifest.nix { inherit mirror; });
+
   kdeApps = generateCollection ./. {
-    inherit (kf5) mkDerivation;
+    inherit mkDerivation;
     inherit mirror preResolve postResolve renames scope;
   };
 
-in kdeApps
+in kdeApps // (mapAttrs l10nPkg l10nManifest)

pkgs/applications/kde-apps-14.12/dependencies.nix

@@ -10,7 +10,7 @@
   };
 
   analitza = {
-    buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5OpenGL" ];
+    buildInputs = [ "ECM" "Eigen3" "GLEW" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -122,7 +122,7 @@
   };
 
   gwenview = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KIO" "Kdcraw" "Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Activities" "KF5Baloo" "KF5KDELibs4Support" "KF5KIO" "Kdcraw" "Kipi" "LCMS2" "PNG" "Phonon4Qt5" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5OpenGL" "Qt5QUIET" "Qt5Script" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -162,7 +162,7 @@
   };
 
   kalgebra = {
-    buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5WebKitWidgets" "Readline" ];
+    buildInputs = [ "Analitza5" "Curses" "ECM" "KF5ConfigWidgets" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5WidgetsAddons" "OpenGL" "Qt5" "Qt5NO_MODULE" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" "Qt5Svg" "Qt5Test" "Qt5WebKitWidgets" "Qt5Xml" "Readline" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -186,7 +186,7 @@
   };
 
   kanagram = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5NewStuff" "KF5Sonnet" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5OPTIONAL_COMPONENTS" "Qt5OpenGL" "Qt5PrintSupport" "Qt5Qml" "Qt5Quick" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -202,7 +202,7 @@
   };
 
   kapptemplate = {
-    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Archive" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5XmlGui" "KdepimLibs" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "RBKCONFIG_COMPILER4" "RBUIC4" "XSLTPROC_EXECUTABLE" "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -210,7 +210,7 @@
   };
 
   kate = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5ItemModels" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5OPTIONAL_COMPONENTS" "KF5Parts" "KF5Plasma" "KF5Service" "KF5TextEditor" "KF5ThreadWeaver" "KF5Wallet" "KF5WindowSystem" "KF5XmlGui" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "SIP" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5Init" "KF5ItemModels" "KF5JobWidgets" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5OPTIONAL_COMPONENTS" "KF5Parts" "KF5Plasma" "KF5Service" "KF5TextEditor" "KF5ThreadWeaver" "KF5Wallet" "KF5WindowSystem" "KF5XmlGui" "LibGit2" "PyKDE4" "PyQt4" "PythonLibrary" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5Widgets" "SIP" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -978,7 +978,7 @@
   };
 
   khangman = {
-    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" ];
+    buildInputs = [ "ECM" "KDE4" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5NewStuff" "KF5Notifications" "KF5XmlGui" "LibKEduVocDocument" "Phonon4Qt5" "Qt5" "Qt5Core" "Qt5Svg" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -1170,7 +1170,7 @@
   };
 
   konsole = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Konq" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "X11" ];
+    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5KDELibs4Support" "KF5KIO" "KF5Konq" "KF5Notifications" "KF5NotifyConfig" "KF5Parts" "KF5Pty" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Script" "Qt5Test" "Qt5Widgets" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -1178,7 +1178,7 @@
   };
 
   kopete = {
-    buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ];
+    buildInputs = [ "Alsa" "Boost" "Expat" "GIF" "GLIB2" "IDN" "Jasper" "JsonCpp" "KDE4" "KdepimLibs" "Kleopatra" "LibMeanwhile" "LibOTR" "LibV4L2" "LibXml2" "Libgadu" "Libmsn" "LiboRTP" "Mediastreamer" "OpenSSL" "QCA2" "QGpgme" "QImageBlitz" "Qt4" "Qt5Core" "Qt5Network" "Qt5QUIET" "SRTP" "Speex" "Sqlite" "Xmms" "ZLIB" ];
     nativeBuildInputs = [ "LibXslt" "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -1458,7 +1458,7 @@
   };
 
   libkeduvocdocument = {
-    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Archive" "KF5I18n" "KF5KIO" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -1546,7 +1546,7 @@
   };
 
   okteta = {
-    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "QCA2" "Qt5" "Qt5Test" "SharedMimeInfo" ];
+    buildInputs = [ "ECM" "KF5" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5ConfigWidgets" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qca-qt5" "Qt5" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5QUIET" "Qt5Script" "Qt5ScriptTools" "Qt5Test" "Qt5Widgets" "Qt5Xml" "SharedMimeInfo" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -1586,7 +1586,7 @@
   };
 
   parley = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Kross" "KF5MODULE" "KF5NewStuff" "KF5Notifications" "KF5Sonnet" "KF5XmlGui" "KF5docbook" "KF5produce" "KF5the" "LibAttica" "LibKEduVocDocument" "LibXml2" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Multimedia" "Qt5Svg" "Qt5Test" ];
     nativeBuildInputs = [ "LibXslt" "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];

pkgs/applications/networking/irc/quassel/default.nix

@@ -29,7 +29,10 @@ in with stdenv; mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ cmake makeWrapper qt ]
+  buildInputs = [ cmake makeWrapper ]
+    ++ (if useQt5 then [ qt.base ] else [ qt ])
+    ++ (if useQt5 && (monolithic || daemon) then [ qt.script ] else [])
+    ++ (if useQt5 && previews then [ qt.webkit qt.webkitwidgets ] else [])
     ++ lib.optional withKDE kdelibs
     ++ lib.optional withKDE automoc4
     ++ lib.optional withKDE phonon
@@ -58,17 +61,17 @@ in with stdenv; mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://quassel-irc.org/;
-    description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon";
+    description = "Qt4/KDE4/Qt5 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).
+      as WeeChat, but graphical (based on Qt4/KDE4 or Qt5).
     '';
     license = stdenv.lib.licenses.gpl3;
-    maintainers = [ maintainers.phreedom ];
+    maintainers = with maintainers; [ phreedom ttuegel ];
     repositories.git = https://github.com/quassel/quassel.git;
-    inherit (qt.meta) platforms;
+    inherit ((if useQt5 then qt.base else qt).meta) platforms;
   };
 }

pkgs/applications/video/vlc/default.nix

@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       libkate libtiger libv4l samba liboggz libass libdvbpsi libva
       xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms
       libdc1394 libraw1394 libopus libebml libmatroska libvdpau
-    ] ++ [(if withQt5 then qt5 else qt4)];
+    ] ++ (if withQt5 then with qt5; [ base ] else [qt4]);
 
   nativeBuildInputs = [ pkgconfig ];
 

pkgs/build-support/autonix/default.nix

@@ -36,9 +36,10 @@ let
   writeManifestXML = filename:
     let
       generateStores = mapAttrs (n: pkg: pkg.store);
-      manifest = generateStores (importManifest filename { mirror = ""; });
+      manifest = importManifest filename { mirror = ""; };
+      stores = generateStores manifest;
     in
-      writeText "manifest.xml" (builtins.toXML manifest);
+      writeText "manifest.xml" (builtins.toXML stores);
 
   /* Generate a set of Nix expressions for the collection, given a
    * manifest.nix, dependencies.nix, and renames.nix in the same directory.
@@ -69,9 +70,8 @@ let
 
     in derive (postResolve (resolve (preResolve packages)));
 
-  pkgNameVersion = pkg: nameFromURL pkg.name ".tar";
-  pkgAttrName = pkg: (builtins.parseDrvName (pkgNameVersion pkg)).name;
-  pkgVersion = pkg: (builtins.parseDrvName (pkgNameVersion pkg)).version;
+  pkgAttrName = pkg: (builtins.parseDrvName pkg.name).name;
+  pkgVersion = pkg: (builtins.parseDrvName pkg.name).version;
 
   depAttrNames = [
     "buildInputs" "nativeBuildInputs"
@@ -112,7 +112,7 @@ let
         builtins.listToAttrs
           (map (p: nameValuePair (toLower (pkgAttrName p)) p) manifest);
 
-      orig = import path { inherit mirror; };
+      orig = import path { inherit stdenv fetchurl mirror; };
     in
       fold (f: x: f x) orig [ withNames bestVersions ];
 
@@ -134,11 +134,10 @@ let
 
       deps = import (path + "/dependencies.nix") {};
 
-      mkPkg = pkg: pkgManifest:
+      mkPkg = name: manifest:
         {
-          name = nameFromURL pkgManifest.name ".tar";
-          src = { inherit (pkgManifest) sha256 name url; };
-          inherit (deps."${pkg}")
+          inherit (manifest) name src;
+          inherit (deps."${name}")
             buildInputs nativeBuildInputs propagatedBuildInputs
             propagatedNativeBuildInputs propagatedUserEnvPkgs;
         };

pkgs/build-support/autonix/manifest.sh

@@ -6,7 +6,7 @@
 
 cat >../manifest.nix <<EOF
 # This file is generated automatically. DO NOT EDIT!
-{ mirror }:
+{ stdenv, fetchurl, mirror }:
 [
 EOF
 
@@ -24,10 +24,13 @@ workdir=$(pwd)
         store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$name")
         cat >>../manifest.nix <<EOF
   {
+    name = stdenv.lib.nameFromURL "${name}" ".tar";
+    store = "${store}";
+    src = fetchurl {
       url = "\${mirror}/${url}";
       sha256 = "${sha256}";
       name = "${name}";
-    store = "${store}";
+    };
   }
 EOF
     fi

pkgs/data/misc/media-player-info/default.nix

@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, python3, udev }:
+
+let
+  name = "media-player-info-22";
+in
+
+  stdenv.mkDerivation {
+    inherit name;
+
+    src = fetchurl {
+      url = "http://www.freedesktop.org/software/media-player-info/${name}.tar.gz";
+      sha256 = "0di3gfx5z8c34yspzyllydr5snzg71r985kbqhrhb1il51qxgrvy";
+    };
+
+    buildInputs = [ udev ];
+    nativeBuildInputs = [ pkgconfig python3 ];
+
+    preConfigure = ''
+      configureFlags="$configureFlags --with-udevdir=$out/lib/udev"
+    '';
+
+    meta = with stdenv.lib; {
+      description = "A repository of data files describing media player capabilities";
+      homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/";
+      license = with licenses; [ bsd3 ];
+      maintainer = with maintainers; [ ttuegel ];
+    };
+  }

pkgs/desktops/plasma-5.1/default.nix

@@ -1,143 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, kf55, pkgs, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let
-
-  kf5 = kf55.override { inherit debug; };
-
-  mirror = "mirror://kde";
-
-  renames =
-    builtins.removeAttrs
-      (import ./renames.nix {})
-      ["Backend" "CTest" "KF5Wayland"];
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: plasma5."${name}") renames) //
-    # packages from KDE Frameworks 5
-    kf5.scope //
-    # packages pinned to this version of Qt 5
-    {
-      PopplerQt5 = (pkgs.poppler.override { inherit (kf5) qt5; }).poppler_qt5;
-    } //
-    # packages from nixpkgs
-    (with pkgs;
-      {
-        inherit epoxy;
-        Epub = ebook_tools;
-        Exiv2 = exiv2;
-        FFmpeg = ffmpeg;
-        FONTFORGE_EXECUTABLE = fontforge;
-        Freetype = freetype;
-        LibSSH = libssh;
-        ModemManager = modemmanager;
-        NetworkManager = networkmanager;
-        PulseAudio = pulseaudio;
-        Taglib = taglib;
-        Xapian = xapian;
-      }
-    );
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-        (blacklist ["kwayland"])
-      ];
-
-  postResolve = super:
-    (builtins.removeAttrs super ["breeze"]) // {
-
-      breeze-qt4 = with pkgs; super.breeze // {
-        name = "breeze-qt4-" + (builtins.parseDrvName super.breeze.name).version;
-        buildInputs = [ xlibs.xproto kde4.kdelibs qt4 ];
-        nativeBuildInputs = [ cmake pkgconfig ];
-        cmakeFlags =
-          [
-            "-DUSE_KDE4=ON"
-            "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
-          ];
-      };
-
-      breeze-qt5 = with pkgs; super.breeze // {
-        name = "breeze-qt5-" + (builtins.parseDrvName super.breeze.name).version;
-        buildInputs = with kf5;
-          [
-            kcompletion kconfig kconfigwidgets kcoreaddons frameworkintegration
-            ki18n kwindowsystem qt5
-          ];
-        nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
-        cmakeFlags = [ "-DUSE_KDE4=OFF" ];
-      };
-
-      kwin = with pkgs; super.kwin // {
-        buildInputs = with xlibs;
-          super.kwin.buildInputs ++ [ libICE libSM libXcursor ];
-        patches = [ ./kwin/kwin-import-plugin-follow-symlinks.patch ];
-      };
-
-      libkscreen = with pkgs; super.libkscreen // {
-        buildInputs = with xlibs;
-          super.libkscreen.buildInputs ++ [libXrandr];
-        patches = [ ./libkscreen/libkscreen-backend-path.patch ];
-      };
-
-      plasma-desktop = with pkgs; super.plasma-desktop // {
-        buildInputs = with xlibs;
-          super.plasma-desktop.buildInputs ++
-          [ pkgs.libcanberra libxkbfile libXcursor ];
-        patches = [
-          ./plasma-desktop/plasma-desktop-hwclock.patch
-          ./plasma-desktop/plasma-desktop-zoneinfo.patch
-        ];
-        preConfigure = ''
-          substituteInPlace kcms/dateandtime/helper.cpp \
-            --subst-var-by hwclock "${utillinux}/sbin/hwclock"
-        '';
-      };
-
-      plasma-workspace = with pkgs; super.plasma-workspace // {
-        buildInputs = with xlibs;
-          super.plasma-workspace.buildInputs ++ [ libSM libXcursor pam ];
-        postInstall = ''
-          # We use a custom startkde script
-          rm $out/bin/startkde
-        '';
-      };
-
-      powerdevil = with pkgs; super.powerdevil // {
-        buildInputs = with xlibs; super.powerdevil.buildInputs ++ [libXrandr];
-      };
-
-    };
-
-  plasma5 = generateCollection ./. {
-    inherit (kf5) mkDerivation;
-    inherit mirror preResolve postResolve renames scope;
-  };
-
-in
-  plasma5 // {
-    inherit scope;
-    startkde = pkgs.callPackage ./startkde {
-      inherit (kf5) kconfig kinit kservice;
-      inherit (plasma5) plasma-desktop plasma-workspace;
-    };
-  }

pkgs/desktops/plasma-5.1/dependencies.nix

@@ -1,220 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  baloo = {
-    buildInputs = [ "ECM" "KF5" "KF5Abc" "KF5Akonadi" "KF5AkonadiMime" "KF5AkonadiServer" "KF5Auth" "KF5CalendarCore" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Mime" "KF5PimUtils" "KF5Solid" "Qt5" "Qt5Test" "Xapian" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  breeze = {
-    buildInputs = [ "ECM" "KDE4" "KDecorations" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kde-cli-tools = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDE4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeplasma-addons = {
-    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "SCIM" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kfilemetadata = {
-    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Taglib" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khelpcenter = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDE4Support" "KF5KHtml" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khotkeys = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDE4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinfocenter = {
-    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "RAW1394" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio-extras = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KDE4Support" "KF5KHtml" "KF5KIO" "KF5Solid" "LibSSH" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5Test" "SLP" "Samba" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kmenuedit = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDE4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Sensors" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwayland = {
-    buildInputs = [ "ECM" "Qt5" "Wayland" ];
-    nativeBuildInputs = [ "WAYLAND_SCANNER_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwin = {
-    buildInputs = [ "ECM" "EGL" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenGL" "OpenGLES" "Qt5" "Qt5Multimedia" "Qt5Test" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5Service" "KF5WindowSystem" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwrited = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5KDE4Support" "KF5Pty" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libkscreen = {
-    buildInputs = [ "Doxygen" "ECM" "Qt5" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5KDE4Support" "KF5Plasma" "Qt5" "Qt5X11Extras" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libmm-qt = {
-    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  libnm-qt = {
-    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  milou = {
-    buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen = {
-    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KDecorations" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  oxygen-fonts = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "FONTFORGE_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-desktop = {
-    buildInputs = [ "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KDecorations" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-nm = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-workspace-wallpapers = {
-    buildInputs = [ "ECM" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  powerdevil = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  systemsettings = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}

pkgs/desktops/plasma-5.1/dependencies.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

pkgs/desktops/plasma-5.1/kwin/kwin-import-plugin-follow-symlinks.patch

@@ -1,13 +0,0 @@
-diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
-index 26b44a9..d14e226 100644
---- a/clients/aurorae/src/aurorae.cpp
-+++ b/clients/aurorae/src/aurorae.cpp
-@@ -73,7 +73,7 @@ void AuroraeFactory::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();

pkgs/desktops/plasma-5.1/libkscreen/libkscreen-backend-path.patch

@@ -1,130 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 460022f..422a708 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
- 
-+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
-+
- set(libkscreen_SRCS
-     backendloader.cpp
-     config.cpp
-diff --git a/src/backendloader.cpp b/src/backendloader.cpp
-index b93e469..8aebc14 100644
---- a/src/backendloader.cpp
-+++ b/src/backendloader.cpp
-@@ -16,6 +16,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
-  *************************************************************************************/
- 
-+#include "config-libkscreen.h"
- #include "backendloader.h"
- #include "debug_p.h"
- #include "backends/abstractbackend.h"
-@@ -40,55 +41,54 @@ bool BackendLoader::init()
-     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
-     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
- 
--    const QStringList paths = QCoreApplication::libraryPaths();
--    Q_FOREACH (const QString &path, paths) {
--        const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
--                       backendFilter,
--                       QDir::SortFlags(QDir::QDir::NoSort),
--                       QDir::NoDotAndDotDot | QDir::Files);
--        const QFileInfoList finfos = dir.entryInfoList();
--        Q_FOREACH (const QFileInfo &finfo, finfos) {
--            // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
--            if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
--                continue;
--            }
-+    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
- 
--            // When on X11, skip the QScreen backend, instead use the XRandR backend,
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
--                    QX11Info::isPlatformX11()) {
--                continue;
--            }
-+    const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
-+                   backendFilter,
-+                   QDir::SortFlags(QDir::QDir::NoSort),
-+                   QDir::NoDotAndDotDot | QDir::Files);
-+    const QFileInfoList finfos = dir.entryInfoList();
-+    Q_FOREACH (const QFileInfo &finfo, finfos) {
-+        // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
-+        if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
-+            continue;
-+        }
- 
--            // When not on X11, skip the XRandR backend, and fall back to QSCreen
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
--                    !QX11Info::isPlatformX11()) {
--                continue;
--            }
-+        // When on X11, skip the QScreen backend, instead use the XRandR backend,
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
-+                QX11Info::isPlatformX11()) {
-+            continue;
-+        }
-+
-+        // When not on X11, skip the XRandR backend, and fall back to QSCreen
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
-+                !QX11Info::isPlatformX11()) {
-+            continue;
-+        }
- 
--            QPluginLoader loader(finfo.filePath());
--            loader.load();
--            QObject *instance = loader.instance();
--            if (!instance) {
-+        QPluginLoader loader(finfo.filePath());
-+        loader.load();
-+        QObject *instance = loader.instance();
-+        if (!instance) {
-+            loader.unload();
-+            continue;
-+        }
-+
-+        s_backend = qobject_cast< AbstractBackend* >(instance);
-+        if (s_backend) {
-+            if (!s_backend->isValid()) {
-+                qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
-+                delete s_backend;
-+                s_backend = 0;
-                 loader.unload();
-                 continue;
-             }
--
--            s_backend = qobject_cast< AbstractBackend* >(instance);
--            if (s_backend) {
--                if (!s_backend->isValid()) {
--                    qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
--                    delete s_backend;
--                    s_backend = 0;
--                    loader.unload();
--                    continue;
--                }
--                qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
--                return true;
--            }
-+            qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
-+            return true;
-         }
-     }
- 
-diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
-new file mode 100644
-index 0000000..a99f3d1
---- /dev/null
-+++ b/src/config-libkscreen.h.cmake
-@@ -0,0 +1,2 @@
-+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
-+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"

pkgs/desktops/plasma-5.1/manifest.nix

@@ -1,166 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ mirror }:
-[
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kwayland-5.1.2.tar.xz";
-    sha256 = "0v57gdbhbqq9nm8y6f8xlwwsfib8v8wbh32bb38aa22wkcqbnqh5";
-    name = "kwayland-5.1.2.tar.xz";
-    store = "/nix/store/r4bjs61x7ad3ff1iy4j111japxzn8gdm-kwayland-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/milou-5.1.2.tar.xz";
-    sha256 = "0dawmwzdxb289gblnbxw4ryqj45c1rmws7mm0cmqlnxh2ykysska";
-    name = "milou-5.1.2.tar.xz";
-    store = "/nix/store/d90rryiyw3haw0mlcxzs57b0vsmq2c3g-milou-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/plasma-workspace-5.1.2.tar.xz";
-    sha256 = "03gwkikxmmbiglyf2cbhm79wri1vfsibpr0qsyydcnqf2bja4adk";
-    name = "plasma-workspace-5.1.2.tar.xz";
-    store = "/nix/store/9b2pcs64kvdnb0mf7g1gyjgygi8pfrk1-plasma-workspace-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kdeplasma-addons-5.1.2.tar.xz";
-    sha256 = "0jfrnvrn4x5cjd3yp21sr53rddcaxw3l05xkcq99lb29jx7x831f";
-    name = "kdeplasma-addons-5.1.2.tar.xz";
-    store = "/nix/store/9f7154m5aq35lfwj6rfq7ra4c2b0xs4r-kdeplasma-addons-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/khotkeys-5.1.2.tar.xz";
-    sha256 = "0kyjvrfpf8zqv8milbzdj0y6i37413qmvdhkxy2phqwrnwj4x69q";
-    name = "khotkeys-5.1.2.tar.xz";
-    store = "/nix/store/lq1v4haiag93w5g6pqwp5r9w8n3xvh1n-khotkeys-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kde-cli-tools-5.1.2.tar.xz";
-    sha256 = "1akgj042i52b6mzd0lq8xgrqnwi63wc7k82g8r4kfy8611vxw6wb";
-    name = "kde-cli-tools-5.1.2.tar.xz";
-    store = "/nix/store/byjdh6cmqimk3i314h3y57s2z3nvpfnw-kde-cli-tools-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/libnm-qt-5.1.2.tar.xz";
-    sha256 = "1gm3yjlb5iq2l0rm8wqg0hs1f66ca5j8zvw6rrn3z4f2hsw9b8vm";
-    name = "libnm-qt-5.1.2.tar.xz";
-    store = "/nix/store/yx6jhazzb32580ax7dw4jdzncj1lpx4a-libnm-qt-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/oxygen-fonts-5.1.2.tar.xz";
-    sha256 = "05f06fsgp6xjv5azs546cq5653k3cyyidbdkggf20yrwlybypg2w";
-    name = "oxygen-fonts-5.1.2.tar.xz";
-    store = "/nix/store/ppzbxx7vkpymjgvi3skrch2dlx3mwhjg-oxygen-fonts-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/khelpcenter-5.1.2.tar.xz";
-    sha256 = "0fgwabsvbg4xzzli8k28hqw6rw5wzmp77fpb7qxiaks2qxd6xfvl";
-    name = "khelpcenter-5.1.2.tar.xz";
-    store = "/nix/store/nq86gdfz5fgkxcndk4knnb3n59y9b17x-khelpcenter-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kmenuedit-5.1.2.tar.xz";
-    sha256 = "1f09m8ki1qib0rfvbkd1nqszq5mglc802rz9b7s9hfi0n5la05cj";
-    name = "kmenuedit-5.1.2.tar.xz";
-    store = "/nix/store/8l7agrg12ghva4103iwm1xdzhqk3iwxp-kmenuedit-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kinfocenter-5.1.2.tar.xz";
-    sha256 = "1yp08z0sirm1i21ix27c72l1pygndrh4gnb5rl4r6rj0rymy4xn0";
-    name = "kinfocenter-5.1.2.tar.xz";
-    store = "/nix/store/jl3s4kimn0xamxc4yhc1jsrz9j0cmws1-kinfocenter-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kwrited-5.1.2.tar.xz";
-    sha256 = "0bsm3dkl1zi1h16cd1pc9qcbv2jpjpzcw7m6cg9gbk7icjymn065";
-    name = "kwrited-5.1.2.tar.xz";
-    store = "/nix/store/ishi0y744yapvf2yf0hm5gam3z5j2687-kwrited-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kio-extras-5.1.2.tar.xz";
-    sha256 = "0d4yyssiddcabrfr94ylf4p2f7l5mpg353m67w2x4rdlc7bgc00z";
-    name = "kio-extras-5.1.2.tar.xz";
-    store = "/nix/store/6pqx9daq9bx7in8dghy041vfn5x829g2-kio-extras-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/systemsettings-5.1.2.tar.xz";
-    sha256 = "102s7l1xaxqzsswzcsr6qx2mizi1fw85ickj8sm4ql493m3iy0vy";
-    name = "systemsettings-5.1.2.tar.xz";
-    store = "/nix/store/c56khxzyh8gzi5nxy8i3n2vlwbsmblsz-systemsettings-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/powerdevil-5.1.2.tar.xz";
-    sha256 = "0bq042phd1rv42qf21672l74mlygzvqknqd0vhfay7lz5hihd3np";
-    name = "powerdevil-5.1.2.tar.xz";
-    store = "/nix/store/5p6j6949gv1s03cm1yn1v0i18clma3cw-powerdevil-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/plasma-desktop-5.1.2.tar.xz";
-    sha256 = "0nn1fcb8b4cmh6wzfar7dzmc6r830n6nq78icsbqkl2yi631vmv7";
-    name = "plasma-desktop-5.1.2.tar.xz";
-    store = "/nix/store/nnk00ddkr0rqbmk6i1q17wimvb6n79m6-plasma-desktop-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/libmm-qt-5.1.2.tar.xz";
-    sha256 = "1jx3zq5j7dm27k74ayibg0d82f7nm7r40mj92sk0drgzaj0q2wv4";
-    name = "libmm-qt-5.1.2.tar.xz";
-    store = "/nix/store/z3f23bansr6yqvc8pwcavwy828ykf85z-libmm-qt-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/breeze-5.1.2.tar.xz";
-    sha256 = "1c7bfr2zdhh84bik5ksyfxvng8c23slasf6lbr86f0mmvwssqhc4";
-    name = "breeze-5.1.2.tar.xz";
-    store = "/nix/store/h0ra9f62jj3lqsg5hhqsb8cq05fqaq0c-breeze-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/ksysguard-5.1.2.tar.xz";
-    sha256 = "03bngwq0dpgffcr7dkzk44n995kcawk1fgxf38zkik4qrr2m8xmz";
-    name = "ksysguard-5.1.2.tar.xz";
-    store = "/nix/store/vrgl460m4h0bzwhakgkj9sddn2pr6057-ksysguard-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kwin-5.1.2.tar.xz";
-    sha256 = "1sjb9w8yaicypjdlcnn6a8zaa03fmgn9bsbbr1xfh3kcjm0p2hjf";
-    name = "kwin-5.1.2.tar.xz";
-    store = "/nix/store/0lcmq4bl3kc48gcps703bby99z0zdl7q-kwin-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/oxygen-5.1.2.tar.xz";
-    sha256 = "0dwlqc57qwp09bbmknakjndqgajfp948kri8ysakj50qbfzq22ly";
-    name = "oxygen-5.1.2.tar.xz";
-    store = "/nix/store/al4whqd4gdnyym26kd2yp3c1slyll0bw-oxygen-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/libkscreen-5.1.2.tar.xz";
-    sha256 = "1kbs042anmc8mifmbxwi7sw0n74kcpf5hpbld5a7nclhm0xpyzb9";
-    name = "libkscreen-5.1.2.tar.xz";
-    store = "/nix/store/rkmydih2fss2gm84j8rgpd3ybz7pyz5p-libkscreen-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/libksysguard-5.1.2.tar.xz";
-    sha256 = "061jjqh6i70g5f8qh47znk295wh1j7z3i9imppdlxhymm2sdix5k";
-    name = "libksysguard-5.1.2.tar.xz";
-    store = "/nix/store/dyipim22aisn9cnk3d9431bi393qsi38-libksysguard-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/plasma-workspace-wallpapers-5.1.2.tar.xz";
-    sha256 = "18my7r17b6c0wm545knpy68bcgawmr6x1h383br1a3jrahb9smfx";
-    name = "plasma-workspace-wallpapers-5.1.2.tar.xz";
-    store = "/nix/store/inqv621x6l2yz1kj71d824kc0labpss7-plasma-workspace-wallpapers-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/kfilemetadata-5.1.2.tar.xz";
-    sha256 = "0ssz2v9dm09ig20m5c2gcgi0dhkbijs7580j75kyabcyxyq33gdi";
-    name = "kfilemetadata-5.1.2.tar.xz";
-    store = "/nix/store/84jqp15fclxia88dmbr2zpq50m6xzwib-kfilemetadata-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/plasma-nm-5.1.2.tar.xz";
-    sha256 = "1ifwjbzdjsfcq2vbq58fnx1r8m11wbmcwchnn7ihabbcgj5admp7";
-    name = "plasma-nm-5.1.2.tar.xz";
-    store = "/nix/store/2czga7b7i36841rs4mnfzd7j7s3rfanv-plasma-nm-5.1.2.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/plasma/5.1.2/baloo-5.1.2.tar.xz";
-    sha256 = "1ynd3amry3wjk8sjlb5knpvjshn0gvs2m1gpbr7r7528ckkv0gpv";
-    name = "baloo-5.1.2.tar.xz";
-    store = "/nix/store/lcrrxz5yjf88cgifz3zjcq5skdp4jxkk-baloo-5.1.2.tar.xz";
-  }
-]

pkgs/desktops/plasma-5.1/manifest.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../.. -A autonix.manifest) \
-      http://download.kde.org/stable/plasma/5.1.2/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi

pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-hwclock.patch

@@ -1,24 +0,0 @@
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index cec5ab8..fc4a6b9 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -48,10 +48,6 @@
- #include <sys/stat.h>
- #endif
- 
--// We cannot rely on the $PATH environment variable, because D-Bus activation
--// clears it. So we have to use a reasonable default.
--static const QString exePath = QLatin1String("/usr/sbin:/usr/bin:/sbin:/bin");
--
- int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
- {
-     int ret = 0;
-@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
- 
- void ClockHelper::toHwclock()
- {
--    QString hwclock = KStandardDirs::findExe("hwclock", exePath);
-+    QString hwclock = "@hwclock@";
-     if (!hwclock.isEmpty()) {
-         KProcess::execute(hwclock, QStringList() << "--systohc");
-     }

pkgs/desktops/plasma-5.1/plasma-desktop/plasma-desktop-zoneinfo.patch

@@ -1,18 +0,0 @@
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index fc4a6b9..7b64d05 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    // NixOS-specific path
-+    QString tz = "/etc/zoneinfo/" + selectedzone;
-+    if (!QFile::exists(tz)) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove("/etc/localtime");

pkgs/desktops/plasma-5.1/renames.nix

@@ -1,24 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "powerdevil";
-"CTest" = "kdeplasma-addons";
-"ECM" = "extra-cmake-modules";
-"KDecorations" = "kwin";
-"KF5Baloo" = "baloo";
-"KF5FileMetaData" = "kfilemetadata";
-"KF5ModemManagerQt" = "libmm-qt";
-"KF5NetworkManagerQt" = "libnm-qt";
-"KF5Screen" = "libkscreen";
-"KF5SysGuard" = "libksysguard";
-"KF5Wayland" = "kwayland";
-"KF5XmlRpcClientPrivate" = "plasma-workspace";
-"KHotKeysDBusInterface" = "khotkeys";
-"KRunnerAppDBusInterface" = "plasma-workspace";
-"KSMServerDBusInterface" = "plasma-workspace";
-"KWinDBusInterface" = "kwin";
-"LibKWorkspace" = "plasma-workspace";
-"LibTaskManager" = "plasma-workspace";
-"OxygenFont" = "oxygen-fonts";
-"ScreenSaverDBusInterface" = "plasma-workspace";
-}

pkgs/desktops/plasma-5.1/startkde/default.nix

@@ -1,33 +0,0 @@
-# We provide our own version of the startkde script in its entirety, rather than
-# patching the version provided by kde-workspace, because it requires such
-# extensive patching.
-
-{ stdenv, bash, dbus, gnused, gnugrep, kconfig, kinit, kservice, plasma-desktop
-, plasma-workspace, qt5, socat, xorg }:
-
-let startkde = ./startkde.in; in
-
-stdenv.mkDerivation {
-  name = "startkde-0.1";
-  phases = "installPhase";
-
-  inherit bash gnused gnugrep kconfig kinit kservice qt5 socat;
-  inherit (xorg) mkfontdir xmessage xprop xrdb xset xsetroot;
-  dbus_tools = dbus.tools;
-  plasmaWorkspace = plasma-workspace;
-  plasmaDesktop = plasma-desktop;
-  startupconfigkeys = ./startupconfigkeys;
-  kdeglobals = ./kdeglobals;
-
-  installPhase = ''
-    mkdir -p $out/bin
-    substituteAll ${startkde} $out/bin/startkde
-    chmod +x $out/bin/startkde
-  '';
-
-  meta = {
-    description = "Custom startkde script for Nixpkgs";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-    license = with stdenv.lib.licenses; [ gpl2Plus ];
-  };
-}

pkgs/desktops/plasma-5.1/startkde/kdeglobals

@@ -1,11 +0,0 @@
-[General]
-XftAntialias=true
-XftHintStyle=hintmedium
-XftSubPixel=none
-desktopFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-fixed=Oxygen Mono,9,-1,5,50,0,0,0,0,0
-font=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-menuFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-smallestReadableFont=Oxygen-Sans,8,-1,5,50,0,0,0,0,0
-taskbarFont=Oxygen-Sans,10,-1,5,50,0,0,0,0,0
-toolBarFont=Oxygen-Sans,9,-1,5,50,0,0,0,0,0

pkgs/desktops/plasma-5.1/startkde/startkde.in

@@ -1,382 +0,0 @@
-#!@bash@/bin/bash -x
-#
-#  NIXOS KDE STARTUP SCRIPT
-#
-
-# The KDE icon cache is supposed to update itself
-# automatically, but it uses the timestamp on the icon
-# theme directory as a trigger.  Since in Nix the
-# timestamp is always the same, this doesn't work.  So as
-# a workaround, nuke the icon cache on login.  This isn't
-# perfect, since it may require logging out after
-# installing new applications to update the cache.
-# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-rm -fv $HOME/.cache/icon-cache.kcache
-
-# Qt writes a weird ‘libraryPath’ line to
-# ~/.config/Trolltech.conf that causes the KDE plugin
-# paths of previous KDE invocations to be searched.
-# Obviously using mismatching KDE libraries is potentially
-# disastrous, so here we nuke references to the Nix store
-# in Trolltech.conf.  A better solution would be to stop
-# Qt from doing this wackiness in the first place.
-if [ -e $HOME/.config/Trolltech.conf ]; then
-    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-fi
-
-if test "x$1" = x--failsafe; then
-    KDE_FAILSAFE=1 # General failsafe flag
-    KWIN_COMPOSE=N # Disable KWin's compositing
-    export KWIN_COMPOSE KDE_FAILSAFE
-fi
-
-# When the X server dies we get a HUP signal from xinit. We must ignore it
-# because we still need to do some cleanup.
-trap 'echo GOT SIGHUP' HUP
-
-# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-unset DYLD_FORCE_FLAT_NAMESPACE
-
-# Check if a KDE session already is running and whether it's possible to connect to X
-@plasmaWorkspace@/bin/kcheckrunning
-kcheckrunning_result=$?
-if test $kcheckrunning_result -eq 0 ; then
-  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
-	exit 1
-elif test $kcheckrunning_result -eq 2 ; then
-	echo "\$DISPLAY is not set or cannot connect to the X server."
-  exit 1
-fi
-
-# Boot sequence:
-#
-# kdeinit is used to fork off processes which improves memory usage
-# and startup time.
-#
-# * kdeinit starts klauncher first.
-# * Then kded is started. kded is responsible for keeping the sycoca
-#   database up to date. When an up to date database is present it goes
-#   into the background and the startup continues.
-# * Then kdeinit starts kcminit. kcminit performs initialisation of
-#   certain devices according to the user's settings
-#
-# * Then ksmserver is started which takes control of the rest of the startup sequence
-
-# We need to create config folder so we can write startupconfigkeys
-if [  ${XDG_CONFIG_HOME} ]; then
-  configDir=$XDG_CONFIG_HOME;
-else
-  # This is the default
-  # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
-  configDir=${HOME}/.config;
-fi
-
-mkdir -p $configDir
-
-# This is basically setting defaults so we can use them with kstartupconfig5
-cat @startupconfigkeys@ >$configDir/startupconfigkeys
-
-# preload the user's locale on first start
-plasmalocalerc=$configDir/plasma-localerc
-test -f $plasmalocalerc || {
-cat >$plasmalocalerc <<EOF
-[Formats]
-LANG=$LANG
-EOF
-}
-
-# export LC_* variables set by kcmshell5 formats into environment
-# so it can be picked up by QLocale and friends.
-exportformatssettings=$configDir/plasma-locale-settings.sh
-[ -f $exportformatssettings ] && . $exportformatssettings
-
-# Write a default kdeglobals file to set up the font
-kdeglobalsfile=$configDir/kdeglobals
-[ -f $kdeglobalsfile ] || cat @kdeglobals@ >$kdeglobalsfile
-
-@plasmaWorkspace@/bin/kstartupconfig5
-returncode=$?
-if test $returncode -ne 0; then
-    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 exited with $returncode"
-    exit 1
-fi
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
-
-XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | tr "\n" ":")
-export XCURSOR_PATH
-
-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-
-    @plasmaDesktop@/bin/kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-    if test $? -eq 10; then
-        XCURSOR_THEME=default
-        export XCURSOR_THEME
-    elif test -n "$kcminputrc_mouse_cursortheme"; then
-        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
-        export XCURSOR_THEME
-    fi
-    if test -n "$kcminputrc_mouse_cursorsize"; then
-        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
-        export XCURSOR_SIZE
-    fi
-fi
-
-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-# from some users that they're confused and don't know what to do. This is
-# especially necessary on slow machines, where starting KDE takes one or two
-# minutes until anything appears on the screen.
-#
-# If the user has overwritten fonts, the cursor font may be different now
-# so don't move this up.
-#
-@xsetroot@/bin/xsetroot -cursor_name left_ptr
-
-dl=$DESKTOP_LOCKED
-unset DESKTOP_LOCKED # Don't want it in the environment
-
-# Make sure that D-Bus is running
-# D-Bus autolaunch is broken
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
-fi
-if @qt5@/bin/qdbus >/dev/null 2>/dev/null; then
-    : # ok
-else
-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
-    exit 1
-fi
-
-ksplash_pid=
-if test -z "$dl"; then
-  # the splashscreen and progress indicator
-  case "$ksplashrc_ksplash_engine" in
-    KSplashQML)
-      ksplash_pid=`@plasmaWorkspace@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
-      ;;
-    None)
-      ;;
-    *)
-      ;;
-  esac
-fi
-
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
-# (where <config locations> correspond to the system and user's configuration
-# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
-# and /etc/xdg/ on Linux)
-#
-# This is where you can define environment variables that will be available to
-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
-# or eval `gpg-agent --daemon`.
-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
-#
-# (see end of this file).
-# For anything else (that doesn't set env vars, or that needs a window manager),
-# better use the Autostart folder.
-
-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
-scriptpath=`@qt5@/bin/qtpaths --paths ConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g'`
-
-# Add /env/ to the directory to locate the scripts to be sourced
-for prefix in `echo $scriptpath`; do
-  for file in "$prefix"/env/*.sh; do
-    test -r "$file" && . "$file"
-  done
-done
-
-# Set the path for Qt plugins provided by KDE
-QT_PLUGIN_PATH=${QT_PLUGIN_PATH+$QT_PLUGIN_PATH:}`@qt5@/bin/qtpaths --plugin-dir`
-# TODO: Do we really need this?
-QT_PLUGIN_PATH=$QT_PLUGIN_PATH:$kdehome/lib/kde5/plugins/
-export QT_PLUGIN_PATH
-
-# Activate the kde font directories.
-#
-# There are 4 directories that may be used for supplying fonts for KDE.
-#
-# There are two system directories. These belong to the administrator.
-# There are two user directories, where the user may add her own fonts.
-#
-# The 'override' versions are for fonts that should come first in the list,
-# i.e. if you have a font in your 'override' directory, it will be used in
-# preference to any other.
-#
-# The preference order looks like this:
-# user override, system override, X, user, system
-#
-# Where X is the original font database that was set up before this script
-# runs.
-
-usr_odir=$HOME/.fonts/kde-override
-usr_fdir=$HOME/.fonts
-
-if test -n "$KDEDIRS"; then
-  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
-  sys_odir=$kdedirs_first/share/fonts/override
-  sys_fdir=$kdedirs_first/share/fonts
-else
-  sys_odir=$KDEDIR/share/fonts/override
-  sys_fdir=$KDEDIR/share/fonts
-fi
-
-# We run mkfontdir on the user's font dirs (if we have permission) to pick
-# up any new fonts they may have installed. If mkfontdir fails, we still
-# add the user's dirs to the font path, as they might simply have been made
-# read-only by the administrator, for whatever reason.
-
-test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
-test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
-test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
-test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
-
-# Ask X11 to rebuild its font list.
-@xset@/bin/xset fp rehash
-
-# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
-if test -n "$GS_LIB" ; then
-    GS_LIB=$usr_fdir:$GS_LIB
-    export GS_LIB
-else
-    GS_LIB=$usr_fdir
-    export GS_LIB
-fi
-
-echo 'startkde: Starting up...'  1>&2
-
-
-# Mark that full KDE session is running (e.g. Konqueror preloading works only
-# with full KDE running). The KDE_FULL_SESSION property can be detected by
-# any X client connected to the same X session, even if not launched
-# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
-# however guarantees that the application is launched in the same environment
-# like the KDE session and that e.g. KDE utilities/libraries are available.
-# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
-# The matching tests are:
-#   For $KDE_FULL_SESSION:
-#     if test -n "$KDE_FULL_SESSION"; then ... whatever
-#   For KDE_FULL_SESSION property:
-#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
-#     if test $? -eq 0; then ... whatever
-#
-# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
-# of the user running the KDE session. It should be rarely needed (e.g.
-# after sudo to prevent desktop-wide functionality in the new user's kded).
-#
-# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
-# Note that this didn't exist in KDE3, which can be detected by its absense and
-# the presence of KDE_FULL_SESSION.
-#
-KDE_FULL_SESSION=true
-export KDE_FULL_SESSION
-@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-
-KDE_SESSION_VERSION=5
-export KDE_SESSION_VERSION
-@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-
-KDE_SESSION_UID=`id -ru`
-export KDE_SESSION_UID
-
-XDG_CURRENT_DESKTOP=KDE
-export XDG_CURRENT_DESKTOP
-
-# At this point all the environment is ready, let's send it to kwalletd if running
-if test -n "$PAM_KWALLET_LOGIN" ; then
-    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-fi
-
-# At this point all environment variables are set, let's send it to the DBus
-# session server to update the activation environment
-@plasmaWorkspace@/lib/libexec/ksyncdbusenv
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not sync environment to dbus.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
-  exit 1
-fi
-
-# We set LD_BIND_NOW to increase the efficiency of kdeinit.
-# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not start kdeinit5.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5."
-  exit 1
-fi
-
-# (NixOS) We run kbuildsycoca5 before starting the user session because things
-# may be missing or moved if they have run nixos-rebuild and it may not be
-# possible for them to start Konsole to run it manually!
-@kservice@/bin/kbuildsycoca5
-
-# finally, give the session control to the session manager
-# see kdebase/ksmserver for the description of the rest of the startup sequence
-# if the KDEWM environment variable has been set, then it will be used as KDE's
-# window manager instead of kwin.
-# if KDEWM is not set, ksmserver will ensure kwin is started.
-# kwrapper5 is used to reduce startup time and memory usage
-# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
-# We only check for 255 which means that the ksmserver process could not be
-# started, any problems thereafter, e.g. ksmserver failing to initialize,
-# will remain undetected.
-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
-# If the session should be locked from the start (locked autologin),
-# lock now and do the rest of the KDE startup underneath the locker.
-KSMSERVEROPTIONS=""
-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
-@kinit@/bin/kwrapper5 @plasmaWorkspace@/bin/ksmserver $KDEWM $KSMSERVEROPTIONS
-if test $? -eq 255; then
-  # Startup error
-  echo 'startkde: Could not start ksmserver.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver."
-fi
-
-wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-
-if test x"$wait_drkonqi"x = x"true"x ; then
-    # wait for remaining drkonqi instances with timeout (in seconds)
-    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-    wait_drkonqi_counter=0
-    while @qt5@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-        sleep 5
-        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-            # ask remaining drkonqis to die in a graceful way
-            @qt5@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
-                @qt5@/bin/qdbus "$address" "/MainApplication" "quit"
-            done
-            break
-        fi
-    done
-fi
-
-echo 'startkde: Shutting down...'  1>&2
-# just in case
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-
-# Clean up
-@kinit@/bin/kdeinit5_shutdown
-
-echo 'startkde: Running shutdown scripts...'  1>&2
-
-# Run scripts found in <config locations>/plasma-workspace/shutdown
-for prefix in `echo "$scriptpath"`; do
-  for file in `ls "$prefix"/shutdown 2> /dev/null | @gnugrep@/bin/egrep -v '(~|\.bak)$'`; do
-    test -x "$prefix$file" && "$prefix$file"
-  done
-done
-
-unset KDE_FULL_SESSION
-@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
-unset KDE_SESSION_VERSION
-@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
-unset KDE_SESSION_UID
-
-echo 'startkde: Done.'  1>&2

pkgs/desktops/plasma-5.1/startkde/startupconfigkeys

@@ -1,5 +0,0 @@
-kcminputrc Mouse cursorTheme 'breeze_cursors'
-kcminputrc Mouse cursorSize ''
-ksplashrc KSplash Theme Breeze
-ksplashrc KSplash Engine KSplashQML
-kcmfonts General forceFontDPI 0

pkgs/desktops/plasma-5.2/default.nix

@@ -12,15 +12,15 @@
 #  make a copy of this directory first. After copying, be sure to delete ./tmp
 #  if it exists. Then follow the minor update instructions.
 
-{ autonix, kf56, pkgs, stdenv, debug ? false }:
+{ autonix, kf5, pkgs, qt5, stdenv, debug ? false }:
 
 with stdenv.lib; with autonix;
 
+let kf5Orig = kf5; in
+
 let
 
-  kf5 = kf56.override { inherit debug; };
-
-  inherit (kf5) qt5;
+  kf5 = kf5Orig.override { inherit debug qt5; };
 
   mirror = "mirror://kde";
 
@@ -38,7 +38,7 @@ let
     {
       LibBlueDevil = pkgs.libbluedevil;
       PolkitQt5-1 = pkgs.polkit_qt5.override { inherit qt5; };
-      PopplerQt5 = (pkgs.poppler.override { inherit (kf5) qt5; }).poppler_qt5;
+      PopplerQt5 = (pkgs.poppler.override { inherit qt5; }).poppler_qt5;
     } //
     # packages from nixpkgs
     (with pkgs;
@@ -90,7 +90,7 @@ let
         buildInputs = with kf5; with plasma5;
           [
             kcompletion kconfig kconfigwidgets kcoreaddons kdecoration
-            frameworkintegration ki18n kwindowsystem qt5
+            frameworkintegration ki18n kwindowsystem qt5.base qt5.x11extras
           ];
         nativeBuildInputs = [ cmake kf5.extra-cmake-modules pkgconfig ];
         cmakeFlags = [ "-DUSE_KDE4=OFF" ];
@@ -155,7 +155,7 @@ let
 
 in
   plasma5 // {
-    inherit scope;
+    inherit kf5 scope;
     startkde = pkgs.callPackage ./startkde {
       inherit (kf5) kconfig kinit kservice;
       inherit (plasma5) plasma-desktop plasma-workspace;

pkgs/desktops/plasma-5.2/dependencies.nix

@@ -2,7 +2,7 @@
 { }:
 {
   baloo = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Xapian" ];
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5Crash" "KF5FileMetaData" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5Solid" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" "Xapian" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5CoreAddons" "KF5FileMetaData" "Qt5Core" "Xapian" ];
     propagatedNativeBuildInputs = [  ];
@@ -10,7 +10,7 @@
   };
 
   bluedevil = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "SharedMimeInfo" ];
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5MODULE" "KF5Notifications" "KF5WidgetsAddons" "LibBlueDevil" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "SharedMimeInfo" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -18,7 +18,7 @@
   };
 
   breeze = {
-    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
+    buildInputs = [ "ECM" "KDE4" "KDecoration2" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5FrameworkIntegration" "KF5I18n" "KF5Service" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -26,7 +26,7 @@
   };
 
   kde-cli-tools = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5Su" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -34,7 +34,7 @@
   };
 
   kde-gtk-config = {
-    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5KCMUtils" "KF5NewStuff" "Qt5" ];
+    buildInputs = [ "ECM" "GTK2" "GTK3" "KF5" "KF5Archive" "KF5ConfigWidgets" "KF5I18n" "KF5KCMUtils" "KF5NewStuff" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -42,7 +42,7 @@
   };
 
   kdecoration = {
-    buildInputs = [ "ECM" "Qt5" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Gui" ];
     propagatedNativeBuildInputs = [  ];
@@ -50,7 +50,7 @@
   };
 
   kdeplasma-addons = {
-    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
+    buildInputs = [ "ECM" "GIO" "GLIB2" "GObject" "IBus" "KDE4" "KF5" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Kross" "KF5Plasma" "KF5Runner" "KF5Service" "KF5UnitConversion" "KdepimLibs" "Kexiv2" "Lancelot" "Lancelot-Datamodels" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Widgets" "Qt5X11Extras" "SCIM" "SharedMimeInfo" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -58,7 +58,7 @@
   };
 
   kfilemetadata = {
-    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Taglib" ];
+    buildInputs = [ "ECM" "EPub" "Exiv2" "FFmpeg" "KF5" "KF5Archive" "KF5I18n" "PopplerQt5" "QMobipocket" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Xml" "Taglib" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -66,7 +66,7 @@
   };
 
   khelpcenter = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KHtml" "Qt5" "Qt5DBus" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -74,7 +74,7 @@
   };
 
   khotkeys = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "X11" ];
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Plasma" "KF5XmlGui" "LibKWorkspace" "Qt5" "Qt5X11Extras" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -82,7 +82,7 @@
   };
 
   kinfocenter = {
-    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "RAW1394" "X11" ];
+    buildInputs = [ "ECM" "EGL" "KF5" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5Service" "KF5Solid" "KF5Wayland" "KF5WidgetsAddons" "KF5XmlGui" "OpenGL" "OpenGLES" "PCIUTILS" "Qt5" "Qt5Core" "Qt5Gui" "Qt5Widgets" "RAW1394" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -90,7 +90,7 @@
   };
 
   kio-extras = {
-    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5Test" "SLP" "Samba" "SharedMimeInfo" ];
+    buildInputs = [ "ECM" "Exiv2" "JPEG" "KF5" "KF5Archive" "KF5Bookmarks" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DNSSD" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KHtml" "KF5KIO" "KF5Pty" "KF5Solid" "LibSSH" "Mtp" "OpenEXR" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Svg" "Qt5Test" "Qt5Widgets" "SLP" "Samba" "SharedMimeInfo" ];
     nativeBuildInputs = [ "MD5SUM_EXECUTABLE" "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -98,7 +98,7 @@
   };
 
   kmenuedit = {
-    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5KDELibs4Support" "KF5KIO" "KF5Sonnet" "KF5XmlGui" "KHotKeysDBusInterface" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -106,7 +106,7 @@
   };
 
   kscreen = {
-    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5ConfigWidgets" "KF5DBusAddons" "KF5GlobalAccel" "KF5I18n" "KF5Screen" "KF5XmlGui" "Qt5" "Qt5QuickWidgets" "Qt5Test" "Qt5X11Extras" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -114,7 +114,7 @@
   };
 
   ksshaskpass = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5Wallet" "KF5WidgetsAddons" "Qt5" "Qt5Core" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -122,7 +122,7 @@
   };
 
   ksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Sensors" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KDELibs4Support" "KF5NewStuff" "KF5SysGuard" "Qt5" "Qt5Core" "Qt5Widgets" "Sensors" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -130,7 +130,7 @@
   };
 
   kwayland = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Widgets" "Wayland" "WaylandScanner" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Gui" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Wayland" "WaylandScanner" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Gui" ];
     propagatedNativeBuildInputs = [  ];
@@ -138,7 +138,7 @@
   };
 
   kwin = {
-    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Multimedia" "Qt5Test" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
+    buildInputs = [ "ECM" "EGL" "KDecoration2" "KF5" "KF5Activities" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5Init" "KF5KCMUtils" "KF5KIO" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Wayland" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "Libinput" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5Multimedia" "Qt5QUIET" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5X11Extras" "UDev" "Wayland" "X11" "XCB" "XKB" "epoxy" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -146,7 +146,7 @@
   };
 
   kwrited = {
-    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" "KF5Notifications" "KF5Pty" "Qt5" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -154,7 +154,7 @@
   };
 
   libbluedevil = {
-    buildInputs = [ "Doxygen" "Qt5" ];
+    buildInputs = [ "Doxygen" "Qt5" "Qt5Core" "Qt5DBus" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -162,7 +162,7 @@
   };
 
   libkscreen = {
-    buildInputs = [ "Doxygen" "ECM" "Qt5" "X11" "XCB" ];
+    buildInputs = [ "Doxygen" "ECM" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5X11Extras" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -170,7 +170,7 @@
   };
 
   libksysguard = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5WebKitWidgets" "Qt5X11Extras" "X11" "ZLIB" ];
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5Plasma" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "ZLIB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Config" "KF5I18n" "KF5IconThemes" "Qt5Core" "Qt5Network" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -178,7 +178,7 @@
   };
 
   libmm-qt = {
-    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" ];
+    buildInputs = [ "ECM" "KF5ModemManagerQt" "ModemManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -186,7 +186,7 @@
   };
 
   milou = {
-    buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Declarative" "KF5I18n" "KF5Plasma" "KF5Runner" "KdepimLibs" "Qt5" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -194,7 +194,7 @@
   };
 
   muon = {
-    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5KDELibs4Support" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "QtOAuth" "packagekitqt5" ];
+    buildInputs = [ "AkabeiClient" "AppstreamQt" "BODEGA" "DebconfKDE" "ECM" "KF5" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5KDELibs4Support" "KF5NewStuff" "KF5Notifications" "KF5Plasma" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "Phonon4Qt5" "QApt" "Qca-qt5" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5Xml" "QtOAuth" "packagekitqt5" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -202,7 +202,7 @@
   };
 
   oxygen = {
-    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "XCB" ];
+    buildInputs = [ "ECM" "KDE4" "KDE4Workspace" "KF5" "KF5Completion" "KF5Config" "KF5FrameworkIntegration" "KF5GuiAddons" "KF5I18n" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "PkgConfig" "Qt5" "Qt5Widgets" "Qt5X11Extras" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -218,7 +218,7 @@
   };
 
   plasma-desktop = {
-    buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
+    buildInputs = [ "Boost" "ECM" "Fontconfig" "Freetype" "GLIB2" "KDE4" "KF5" "KF5Activities" "KF5Attica" "KF5Auth" "KF5Baloo" "KF5DocTools" "KF5Emoticons" "KF5I18n" "KF5ItemModels" "KF5KCMUtils" "KF5KDELibs4Support" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Wallet" "KRunnerAppDBusInterface" "KSMServerDBusInterface" "KWinDBusInterface" "LibKWorkspace" "LibTaskManager" "OpenGL" "OpenGLES" "PackageKitQt5" "Phonon4Qt5" "PulseAudio" "Qt4" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Quick" "Qt5QuickWidgets" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "Strigi" "USB" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -226,7 +226,7 @@
   };
 
   plasma-nm = {
-    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Completion" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5I18n" "KF5IconThemes" "KF5Init" "KF5ItemViews" "KF5KDELibs4Support" "KF5KIO" "KF5ModemManagerQt" "KF5NetworkManagerQt" "KF5Notifications" "KF5Plasma" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "MobileBroadbandProviderInfo" "ModemManager" "NetworkManager" "OpenConnect" "OpenSSL" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Network" "Qt5Quick" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -234,7 +234,7 @@
   };
 
   plasma-workspace = {
-    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5DBus" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Test" "Qt5WebKitWidgets" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
+    buildInputs = [ "ECM" "KF5" "KF5Activities" "KF5Baloo" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5JsEmbed" "KF5KCMUtils" "KF5KDELibs4Support" "KF5KIO" "KF5NO_MODULE" "KF5NewStuff" "KF5NotifyConfig" "KF5Plasma" "KF5PlasmaQuick" "KF5Runner" "KF5Screen" "KF5Solid" "KF5Su" "KF5SysGuard" "KF5TextEditor" "KF5TextWidgets" "KF5Wallet" "KF5Wayland" "KF5WebKit" "KWinDBusInterface" "Phonon4Qt5" "Prison" "Qalculate" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5Qml" "Qt5Quick" "Qt5QuickWidgets" "Qt5Script" "Qt5Sql" "Qt5Test" "Qt5WebKitWidgets" "Qt5Widgets" "Qt5X11Extras" "Wayland" "WaylandScanner" "X11" "XCB" "ZLIB" "dbusmenu-qt5" "libgps" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5KIO" "KF5SysGuard" ];
     propagatedNativeBuildInputs = [  ];
@@ -250,7 +250,7 @@
   };
 
   polkit-kde-agent = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5WidgetsAddons" "KF5WindowSystem" "PolkitQt5-1" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -258,7 +258,7 @@
   };
 
   powerdevil = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ];
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5Config" "KF5GlobalAccel" "KF5I18n" "KF5IdleTime" "KF5KDELibs4Support" "KF5KIO" "KF5NotifyConfig" "KF5Solid" "LibKWorkspace" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "ScreenSaverDBusInterface" "UDev" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -266,7 +266,7 @@
   };
 
   sddm-kcm = {
-    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "X11" "XCB" ];
+    buildInputs = [ "ECM" "KF5" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Designer" "Qt5Gui" "Qt5Quick" "Qt5QuickWidgets" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -274,7 +274,7 @@
   };
 
   systemsettings = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
+    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KCMUtils" "KF5KHtml" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];

pkgs/desktops/plasma-5.2/manifest.nix

@@ -1,214 +1,328 @@
 # This file is generated automatically. DO NOT EDIT!
-{ mirror }:
+{ stdenv, fetchurl, mirror }:
 [
   {
+    name = stdenv.lib.nameFromURL "kwin-5.2.0.1.tar.xz" ".tar";
+    store = "/nix/store/n6p747v05l1bs1l6802apii9wad8111v-kwin-5.2.0.1.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.1.tar.xz";
+      sha256 = "0jfzrhcnfi4v8qa0hcj0hmvjq0gd7ampq9qvl0s4bd3n6g92pn5f";
+      name = "kwin-5.2.0.1.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ksshaskpass-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/gv341fwlrzw3svd2vr5b8wxcjk93r64v-ksshaskpass-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/ksshaskpass-5.2.0.tar.xz";
       sha256 = "17xjlb1gwxcdxzfadv0brr6ainnw25m681p013na182zigx9f9bv";
       name = "ksshaskpass-5.2.0.tar.xz";
-    store = "/nix/store/gv341fwlrzw3svd2vr5b8wxcjk93r64v-ksshaskpass-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kio-extras-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/iilra8kczb0waqigff390x2j2svkv5ba-kio-extras-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kio-extras-5.2.0.tar.xz";
       sha256 = "1c5qhp6axzbn5mla9q6qk0aalm0n4hvs6c4d9pclbcv58ysv3vw5";
       name = "kio-extras-5.2.0.tar.xz";
-    store = "/nix/store/iilra8kczb0waqigff390x2j2svkv5ba-kio-extras-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kmenuedit-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/4qcwcvnyqnpa6b7my8aqrp6v2zadz91m-kmenuedit-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kmenuedit-5.2.0.tar.xz";
       sha256 = "1qg7dh42lyp6mrckxjz07mmhk589d3wr080vljbm6hkgqm3aq7zr";
       name = "kmenuedit-5.2.0.tar.xz";
-    store = "/nix/store/4qcwcvnyqnpa6b7my8aqrp6v2zadz91m-kmenuedit-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "libbluedevil-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/d7nkh5p51ab5ag94yi3ggxjpbwn2k6g3-libbluedevil-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/libbluedevil-5.2.0.tar.xz";
       sha256 = "0s06kn9aqkyyfj1n6cb2hhnnqymwzljavfwj0f88mrkjrdf65bq9";
       name = "libbluedevil-5.2.0.tar.xz";
-    store = "/nix/store/d7nkh5p51ab5ag94yi3ggxjpbwn2k6g3-libbluedevil-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "libkscreen-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/49pgxmxbn2qs5dzgf3iiwcaazj9ipiy3-libkscreen-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/libkscreen-5.2.0.tar.xz";
       sha256 = "1v75qi7b0m8fqdj5b38ypwgp1djkg408a4csn57y3pjgp7k69k53";
       name = "libkscreen-5.2.0.tar.xz";
-    store = "/nix/store/49pgxmxbn2qs5dzgf3iiwcaazj9ipiy3-libkscreen-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kde-gtk-config-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/vf2cvrr4p7ydz36ir0cjd3p0yqa3cwpj-kde-gtk-config-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kde-gtk-config-5.2.0.tar.xz";
       sha256 = "1gafqrb5sg6jm4g3kivnwax05lq6gilzg8pc8k6dsnchyqzilbki";
       name = "kde-gtk-config-5.2.0.tar.xz";
-    store = "/nix/store/vf2cvrr4p7ydz36ir0cjd3p0yqa3cwpj-kde-gtk-config-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kdeplasma-addons-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/4qgb1w08k6ffyipfwbrj19pgpihg3pk7-kdeplasma-addons-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kdeplasma-addons-5.2.0.tar.xz";
       sha256 = "168bl9g1s9piy0bwrx7f8pbvn3jamw1rp90rihydamm3s54p1ykw";
       name = "kdeplasma-addons-5.2.0.tar.xz";
-    store = "/nix/store/4qgb1w08k6ffyipfwbrj19pgpihg3pk7-kdeplasma-addons-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "plasma-desktop-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/sjqqnbp8s802rz6ydn3if77hr57njwpk-plasma-desktop-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/plasma-desktop-5.2.0.tar.xz";
       sha256 = "0xld7kxa8p78kw5f1a75nc0n69jn6vfp8nm40qqdhy2y3m5cc8p9";
       name = "plasma-desktop-5.2.0.tar.xz";
-    store = "/nix/store/sjqqnbp8s802rz6ydn3if77hr57njwpk-plasma-desktop-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "systemsettings-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/b0pjfkpqsvfywawinn6a3q42r675q0gw-systemsettings-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/systemsettings-5.2.0.tar.xz";
       sha256 = "0yk1zn0kkjb9rcmqa2n10igcnk2fm06gfn7fgb4mcb2vjvv7a8y0";
       name = "systemsettings-5.2.0.tar.xz";
-    store = "/nix/store/b0pjfkpqsvfywawinn6a3q42r675q0gw-systemsettings-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "polkit-kde-agent-1-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/ri0bgnblm2s7jsyvarvn0nrmnsgbv9wv-polkit-kde-agent-1-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/polkit-kde-agent-1-5.2.0.tar.xz";
       sha256 = "14b5z2ijlrv7h2bh6dxyd6r4qschzh1l2iqix63nbfa5nxyfc67q";
       name = "polkit-kde-agent-1-5.2.0.tar.xz";
-    store = "/nix/store/ri0bgnblm2s7jsyvarvn0nrmnsgbv9wv-polkit-kde-agent-1-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "milou-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/gsmn9sv15f7iwk8hbh074rnm03ig5yhi-milou-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/milou-5.2.0.tar.xz";
       sha256 = "02gd7012zbiaxhb6wliapfcb4spjrdgnhvhl3y64ixqrx2b032a5";
       name = "milou-5.2.0.tar.xz";
-    store = "/nix/store/gsmn9sv15f7iwk8hbh074rnm03ig5yhi-milou-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kinfocenter-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/xfnj3gy03ynfaazy82gkxijm9fykwk4x-kinfocenter-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kinfocenter-5.2.0.tar.xz";
       sha256 = "151flq4w6m94jgfrzbf3w3v11xybx92xd0nv0bdh5vvaxg97dac9";
       name = "kinfocenter-5.2.0.tar.xz";
-    store = "/nix/store/xfnj3gy03ynfaazy82gkxijm9fykwk4x-kinfocenter-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kdecoration-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/dqqb6cvwcd43yanifka0kmx1pdhryjcj-kdecoration-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kdecoration-5.2.0.tar.xz";
       sha256 = "135i1maqp0q9aa312l0dqfkmxjq12mri2zjwg03wzgmmy5b9wm52";
       name = "kdecoration-5.2.0.tar.xz";
-    store = "/nix/store/dqqb6cvwcd43yanifka0kmx1pdhryjcj-kdecoration-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kde-cli-tools-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/zfnbl0kbh4x3lpalc7irjgynl53mcf52-kde-cli-tools-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kde-cli-tools-5.2.0.tar.xz";
       sha256 = "0lr3ir8kfq1x0yn0ahhlks0ikxxqbyj6jdmkdlr8hz5ivcpr64mq";
       name = "kde-cli-tools-5.2.0.tar.xz";
-    store = "/nix/store/zfnbl0kbh4x3lpalc7irjgynl53mcf52-kde-cli-tools-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kscreen-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/w2gq2s7lgf637qn0f5a0dh06i7mkjhki-kscreen-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kscreen-5.2.0.tar.xz";
       sha256 = "09f77vszpni93ahm31gsb7lg4lidchppa1kd9s8q98yf2rb9hl55";
       name = "kscreen-5.2.0.tar.xz";
-    store = "/nix/store/w2gq2s7lgf637qn0f5a0dh06i7mkjhki-kscreen-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "plasma-workspace-wallpapers-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/3rzwgwlzbmin9sjpp614bavjmrqqwk9x-plasma-workspace-wallpapers-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-wallpapers-5.2.0.tar.xz";
       sha256 = "1xb500w5y9jn6xyayw5v28qsy6xp0pfb3ydciga77h1xd59wp0ym";
       name = "plasma-workspace-wallpapers-5.2.0.tar.xz";
-    store = "/nix/store/3rzwgwlzbmin9sjpp614bavjmrqqwk9x-plasma-workspace-wallpapers-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "sddm-kcm-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/q3wbyymqnxwcv9c58fxc4fg2c6pc2d5r-sddm-kcm-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/sddm-kcm-5.2.0.tar.xz";
       sha256 = "0ds4qlgwzbpa32w3mlhf64p64n1jifm6797v6jb5v3qjnamlpk96";
       name = "sddm-kcm-5.2.0.tar.xz";
-    store = "/nix/store/q3wbyymqnxwcv9c58fxc4fg2c6pc2d5r-sddm-kcm-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "libksysguard-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/n50iq06yz6z2n2n7wh10ww7cks22zz4z-libksysguard-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/libksysguard-5.2.0.tar.xz";
       sha256 = "0jfyy90zdajpxy5yy9w14n8r8jx7d6bdwss7h8rrkp5zljp9nzwp";
       name = "libksysguard-5.2.0.tar.xz";
-    store = "/nix/store/n50iq06yz6z2n2n7wh10ww7cks22zz4z-libksysguard-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "oxygen-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/60kb2hhwlmykfx5mc2s8hyd8zh6ngrpv-oxygen-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/oxygen-5.2.0.tar.xz";
       sha256 = "1wad5m36h31y99v4gwx19n3k14xxc0hvp9c4n3g67fyy8pjnr0ax";
       name = "oxygen-5.2.0.tar.xz";
-    store = "/nix/store/60kb2hhwlmykfx5mc2s8hyd8zh6ngrpv-oxygen-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "khelpcenter-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/dfi8w8dsk5cxbyhm5kznja6kxda23n8j-khelpcenter-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/khelpcenter-5.2.0.tar.xz";
       sha256 = "1a5z2bvxjdwp81jnyrdf7q591k6ql504argl7lg3pbvph08rc0rs";
       name = "khelpcenter-5.2.0.tar.xz";
-    store = "/nix/store/dfi8w8dsk5cxbyhm5kznja6kxda23n8j-khelpcenter-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "baloo-5.6.0.tar.xz" ".tar";
+    store = "/nix/store/sgm5dcgmw5cwz60hhhqnlgxq1ck1cffh-baloo-5.6.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/baloo-5.6.0.tar.xz";
       sha256 = "1py0npkf8s46zwbg23cn49f777fc9cid1njg8crc8h71md71j614";
       name = "baloo-5.6.0.tar.xz";
-    store = "/nix/store/sgm5dcgmw5cwz60hhhqnlgxq1ck1cffh-baloo-5.6.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "plasma-workspace-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/g2ar4zpsc36zalpd5frzdpxscgzg727b-plasma-workspace-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-5.2.0.tar.xz";
       sha256 = "1swii172mv32837kgcxnmafs1blpgpdn6hda07f1aanaz4scxvj3";
       name = "plasma-workspace-5.2.0.tar.xz";
-    store = "/nix/store/g2ar4zpsc36zalpd5frzdpxscgzg727b-plasma-workspace-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kwrited-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/r5qz9f2s7q0i00lsp86fv1b500cr2x0n-kwrited-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kwrited-5.2.0.tar.xz";
       sha256 = "0rg1ml7m6f2kql4qi9pg8dd66hr7rxqgyjg3rs66diibz383cjzb";
       name = "kwrited-5.2.0.tar.xz";
-    store = "/nix/store/r5qz9f2s7q0i00lsp86fv1b500cr2x0n-kwrited-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "libmm-qt-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/6fzkxwzqysgwjzmiyg16fdasp64gik52-libmm-qt-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/libmm-qt-5.2.0.tar.xz";
       sha256 = "07flvspy3qs2mhjxnwy3l8giw296p3501ad1hr3bnjidm2iykc6s";
       name = "libmm-qt-5.2.0.tar.xz";
-    store = "/nix/store/6fzkxwzqysgwjzmiyg16fdasp64gik52-libmm-qt-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "plasma-nm-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/9n79gfai09ydrjf12ckqviqaf5jkwar8-plasma-nm-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/plasma-nm-5.2.0.tar.xz";
       sha256 = "0br2mqx8g660jcs1hiwssg6fdiddn4zk78kdmcgkpq93y5ysdf5c";
       name = "plasma-nm-5.2.0.tar.xz";
-    store = "/nix/store/9n79gfai09ydrjf12ckqviqaf5jkwar8-plasma-nm-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kwayland-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/jidv4bi8f2iyg3zhdqip5f7lkwmgav94-kwayland-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kwayland-5.2.0.tar.xz";
       sha256 = "1w872ask0w9gbw46dx3si124gmzkapj7naysgrb5zdcdf8avcgqy";
       name = "kwayland-5.2.0.tar.xz";
-    store = "/nix/store/jidv4bi8f2iyg3zhdqip5f7lkwmgav94-kwayland-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "ksysguard-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/s4xb576g8hjpl39ysbmzlsw19a99zssy-ksysguard-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/ksysguard-5.2.0.tar.xz";
       sha256 = "0kd103kzxgsgrrhfjacy50gg6wsvqa9ix9xk5nb59bbdzj0b4km1";
       name = "ksysguard-5.2.0.tar.xz";
-    store = "/nix/store/s4xb576g8hjpl39ysbmzlsw19a99zssy-ksysguard-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kfilemetadata-5.6.0.tar.xz" ".tar";
+    store = "/nix/store/rvjxs89p415z52nhzrmci6s91nb0fy5a-kfilemetadata-5.6.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kfilemetadata-5.6.0.tar.xz";
       sha256 = "0vg9lc6d2q6bx53lixcmdhfgwqqr3hfl6g3pvgss237kd3fbb94n";
       name = "kfilemetadata-5.6.0.tar.xz";
-    store = "/nix/store/rvjxs89p415z52nhzrmci6s91nb0fy5a-kfilemetadata-5.6.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "bluedevil-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/w4s1zfgmallmqq400pvh6zy9qrss6206-bluedevil-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/bluedevil-5.2.0.tar.xz";
       sha256 = "01a3h0jp9nq9fs1zv4wp7jgmpv4nscflb3nkz93dg0g1bis1kgnh";
       name = "bluedevil-5.2.0.tar.xz";
-    store = "/nix/store/w4s1zfgmallmqq400pvh6zy9qrss6206-bluedevil-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "breeze-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/yyq50zwlb2xxahkb6w0zvz41rz2gg4k1-breeze-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/breeze-5.2.0.tar.xz";
       sha256 = "1s8381nhszb2d7b0r6rmngnkgw28xxsfhnginbcb6zkljgprnkkh";
       name = "breeze-5.2.0.tar.xz";
-    store = "/nix/store/yyq50zwlb2xxahkb6w0zvz41rz2gg4k1-breeze-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "oxygen-fonts-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/96is0p4rp0nqv9yllqrk9xhv4fa86gan-oxygen-fonts-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/oxygen-fonts-5.2.0.tar.xz";
       sha256 = "102hycnk4naysmyj87mv1sm41aq214f3wjzzi429r0i135wdblki";
       name = "oxygen-fonts-5.2.0.tar.xz";
-    store = "/nix/store/96is0p4rp0nqv9yllqrk9xhv4fa86gan-oxygen-fonts-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "powerdevil-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/lqny6rqbrgpadkm6d1s52i9959zwhjh8-powerdevil-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/powerdevil-5.2.0.tar.xz";
       sha256 = "1mi60xn4pgwrq4w3i45gxqjqqfwjxzkkyx89fkwwj1xv68bkwshs";
       name = "powerdevil-5.2.0.tar.xz";
-    store = "/nix/store/lqny6rqbrgpadkm6d1s52i9959zwhjh8-powerdevil-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "muon-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/f7i8c6ig71506aqcmj3mp8yapyid5zki-muon-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/muon-5.2.0.tar.xz";
       sha256 = "15vcrm7y5khpc0rngzqbhizg2w0rz6adf5v3cpwafmqaq3iqlcb7";
       name = "muon-5.2.0.tar.xz";
-    store = "/nix/store/f7i8c6ig71506aqcmj3mp8yapyid5zki-muon-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "khotkeys-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/6sqh6vy8i8xg5xqh0b2ic1a3wb1nv2p8-khotkeys-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/khotkeys-5.2.0.tar.xz";
       sha256 = "187757g70wjq1v9r7nf3fxc6233sb5m28s4aswlm7rjvys5lmkch";
       name = "khotkeys-5.2.0.tar.xz";
-    store = "/nix/store/6sqh6vy8i8xg5xqh0b2ic1a3wb1nv2p8-khotkeys-5.2.0.tar.xz";
+    };
   }
   {
+    name = stdenv.lib.nameFromURL "kwin-5.2.0.tar.xz" ".tar";
+    store = "/nix/store/hrv9ikwphl3mg8sk6i8b9q3wj5ca24ni-kwin-5.2.0.tar.xz";
+    src = fetchurl {
       url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.tar.xz";
       sha256 = "0ys76xllgr2034bxpr5m1qm5v8qp8wnzn09f6gghcvnm3lqki79q";
       name = "kwin-5.2.0.tar.xz";
-    store = "/nix/store/hrv9ikwphl3mg8sk6i8b9q3wj5ca24ni-kwin-5.2.0.tar.xz";
+    };
   }
 ]

pkgs/development/libraries/kde-frameworks-5.5/default.nix

@@ -1,185 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ autonix, fetchurl, pkgs, qt5, stdenv, debug ? false }:
-
-with stdenv.lib; with autonix;
-
-let
-
-  mkDerivation = drv:
-    stdenv.mkDerivation
-      (drv // {
-        src = fetchurl drv.src;
-
-        setupHook = ./setup-hook.sh;
-
-        enableParallelBuilding = drv.enableParallelBuilding or true;
-        cmakeFlags =
-          (drv.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF"
-            "-DKDE_DEFAULT_HOME=.kde5"
-            "-DKDE4_DEFAULT_HOME=.kde"
-          ]
-          ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta = drv.meta or
-          {
-            license = with stdenv.lib.licenses; [
-              lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-            ];
-            platforms = stdenv.lib.platforms.linux;
-            maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-            homepage = "http://www.kde.org";
-          };
-      });
-
-  renames = builtins.removeAttrs (import ./renames.nix {}) ["Backend" "CTest"];
-
-  scope =
-    # packages in this collection
-    (mapAttrs (dep: name: kf5."${name}") renames) //
-    # packages pinned to this version of Qt 5
-    {
-      Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      Qt5 = qt5;
-      Qt5Core = qt5;
-      Qt5DBus = qt5;
-      Qt5Test = qt5;
-      Qt5Widgets = qt5;
-      Qt5X11Extras = qt5;
-      dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
-    } //
-    # packages from the nixpkgs collection
-    (with pkgs;
-      {
-        inherit cmake;
-        Boost = boost;
-        GIF = giflib;
-        GLIB2 = glib;
-        Gpgme = gpgme;
-        JPEG = libjpeg;
-        LibGcrypt = libgcrypt;
-        LibGit2 = libgit2;
-        LibIntl = gettext;
-        LibLZMA = lzma;
-        Perl = perl;
-        PythonInterp = python;
-        QImageBlitz = qimageblitz;
-        SharedMimeInfo = shared_mime_info;
-        ZLIB = zlib;
-      }
-    );
-
-  mirror = "mirror://kde";
-
-  preResolve = super:
-    fold (f: x: f x) super
-      [
-        (userEnvPkg "SharedMimeInfo")
-        (userEnvPkg "SharedDesktopOntologies")
-      ];
-
-  postResolve = super:
-    super // {
-      extra-cmake-modules = {
-        inherit (super.extra-cmake-modules) name src;
-
-        propagatedNativeBuildInputs = with pkgs; [ cmake pkgconfig ];
-        cmakeFlags = ["-DBUILD_TESTING=OFF"];
-        patches =
-          [
-            ./extra-cmake-modules/0001-libdir-default.patch
-            ./extra-cmake-modules/0002-qt5-plugin-dir.patch
-          ];
-        meta = {
-          license = with stdenv.lib.licenses; [ bsd2 ];
-          platforms = stdenv.lib.platforms.linux;
-          maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-          homepage = "http://www.kde.org";
-        };
-      };
-
-      kauth = with pkgs; super.kauth // {
-        buildInputs = super.kauth.buildInputs ++ [polkit_qt5];
-        patches = [./kauth/kauth-policy-install.patch];
-      };
-
-      kcmutils = super.kcmutils // {
-        patches =
-          [./kcmutils/kcmutils-pluginselector-follow-symlinks.patch];
-      };
-
-      kconfigwidgets = super.kconfigwidgets // {
-        patches =
-          [./kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch];
-      };
-
-      kdelibs4support = with pkgs; super.kdelibs4support // {
-        buildInputs =
-          super.kdelibs4support.buildInputs
-          ++ [networkmanager xlibs.libSM];
-        cmakeFlags =
-          (super.kdelibs4support.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-          ];
-      };
-
-      kdoctools = with pkgs; super.kdoctools // {
-        cmakeFlags =
-          (super.kdoctools.cmakeFlags or [])
-          ++ [
-            "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-            "-DDocBookXML4_DTD_VERSION=4.5"
-            "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-          ];
-        patches = [./kdoctools/kdoctools-no-find-docbook-xml.patch];
-      };
-
-      ki18n = with pkgs; super.ki18n // {
-        propagatedNativeBuildInputs =
-          super.ki18n.propagatedNativeBuildInputs ++ [gettext python];
-      };
-
-      kimageformats = with pkgs; super.kimageformats // {
-        NIX_CFLAGS_COMPILE =
-          (super.kimageformats.NIX_CFLAGS_COMPILE or "")
-          + " -I${ilmbase}/include/OpenEXR";
-      };
-
-      kinit = super.kinit // { patches = [ ./kinit/kinit-libpath.patch ]; };
-
-      kservice = super.kservice // {
-        buildInputs = super.kservice.buildInputs ++ [kf5.kwindowsystem];
-        patches =
-          [
-            ./kservice/kservice-kbuildsycoca-follow-symlinks.patch
-            ./kservice/kservice-kbuildsycoca-no-canonicalize-path.patch
-          ];
-      };
-
-      plasma-framework = super.plasma-framework // {
-        patches = [ ./plasma-framework/plasma-framework-external-paths.patch ];
-      };
-    };
-
-  kf5 = generateCollection ./. {
-    inherit mirror mkDerivation preResolve postResolve renames scope;
-  };
-
-in
-
-  kf5 // { inherit mkDerivation qt5 scope; }

pkgs/development/libraries/kde-frameworks-5.5/dependencies.nix

@@ -1,484 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-  attica = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  extra-cmake-modules = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5Test" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kactivities = {
-    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kapidox = {
-    buildInputs = [  ];
-    nativeBuildInputs = [ "PythonInterp" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  karchive = {
-    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5Test" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kauth = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kbookmarks = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcodecs = {
-    buildInputs = [ "ECM" "Qt5Core" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcompletion = {
-    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfig = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kconfigwidgets = {
-    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kcoreaddons = {
-    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [ "SharedMimeInfo" ];
-  };
-
-  kcrash = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5Test" "Qt5X11Extras" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdeclarative = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kded = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5Init" "KF5Service" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesignerplugin = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Pty" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdewebkit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdnssd = {
-    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kdoctools = {
-    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Test" "Qt5Xml" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kglobalaccel = {
-    buildInputs = [ "ECM" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kguiaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5X11Extras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Gui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  khtml = {
-    buildInputs = [ "ECM" "GIF" "JPEG" "KDEWin" "KF5Archive" "KF5Codecs" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "OpenSSL" "PNG" "Phonon4Qt5" "Qt5" "Qt5Test" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Bookmarks" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5JS" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Sonnet" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ki18n = {
-    buildInputs = [ "ECM" "LibIntl" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kiconthemes = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Svg" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kidletime = {
-    buildInputs = [ "ECM" "Qt5" "X11" "X11_XCB" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kimageformats = {
-    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5PrintSupport" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kinit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5Crash" "KF5DocTools" "KF5I18n" "KF5KIO" "KF5Service" "KF5WindowSystem" "Libcap" "Qt5" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kio = {
-    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" "Qt5Widgets" "Strigi" "X11" "ZLIB" ];
-    nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5Script" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kitemviews = {
-    buildInputs = [ "ECM" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjobwidgets = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5X11Extras" "X11" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjs = {
-    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5Test" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kjsembed = {
-    buildInputs = [ "ECM" "KF5DocTools" "KF5I18n" "KF5JS" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5JS" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kmediaplayer = {
-    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Parts" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kparts = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kpty = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5I18n" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5CoreAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kross = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  krunner = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kservice = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" ];
-    nativeBuildInputs = [ "Perl" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  ktextwidgets = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwallet = {
-    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwidgetsaddons = {
-    buildInputs = [ "ECM" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kwindowsystem = {
-    buildInputs = [ "ECM" "Qt5" "Qt5WinExtras" "X11" "XCB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Widgets" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  kxmlgui = {
-    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  plasma-framework = {
-    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Test" "Qt5Widgets" "Solid" "X11" "XCB" ];
-    nativeBuildInputs = [ "SH" "cmake" ];
-    propagatedBuildInputs = [  ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  solid = {
-    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Qml" "UDev" ];
-    nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  sonnet = {
-    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5Test" "ZLIB" ];
-    nativeBuildInputs = [ "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-  threadweaver = {
-    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" ];
-    nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
-    propagatedBuildInputs = [ "Qt5Core" ];
-    propagatedNativeBuildInputs = [  ];
-    propagatedUserEnvPkgs = [  ];
-  };
-
-}

pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0001-libdir-default.patch

@@ -1,55 +0,0 @@
-From f1e22a65f94a231edfe01ac6a3fcf30d95b6329f Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 31 Dec 2014 07:16:45 -0600
-Subject: [PATCH 1/2] libdir default
-
----
- kde-modules/KDEInstallDirs.cmake | 31 +------------------------------
- 1 file changed, 1 insertion(+), 30 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index e255e87..a79a12a 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -162,37 +162,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- # Macro for variables that are relative to another variable. We store an empty
- # value in the cache (for documentation/GUI cache editor purposes), and store
--- 
-2.1.4
-

pkgs/development/libraries/kde-frameworks-5.5/extra-cmake-modules/0002-qt5-plugin-dir.patch

@@ -1,25 +0,0 @@
-From e4fb9d880cefa743df2b5da3a67db617d66faf63 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 31 Dec 2014 07:23:59 -0600
-Subject: [PATCH 2/2] qt5 plugin dir
-
----
- kde-modules/KDEInstallDirs.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index a79a12a..70dbe02 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -315,7 +315,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--- 
-2.1.4
-

pkgs/development/libraries/kde-frameworks-5.5/manifest.nix

@@ -1,364 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ mirror }:
-[
-  {
-    url = "${mirror}/stable/frameworks/5.5/extra-cmake-modules-1.5.0.tar.xz";
-    sha256 = "0rhvrpakahylfrnwkw5n32xh95609b3ca40qjkd1bcqh9mw8s8n7";
-    name = "extra-cmake-modules-1.5.0.tar.xz";
-    store = "/nix/store/adn9n0xazi0wdmc7ffwfbxdbm05wvlg9-extra-cmake-modules-1.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kdoctools-5.5.0.tar.xz";
-    sha256 = "19pzafqinngzyk52c2a3l8llfxqh77y436sj3rvkir1falvg7jqi";
-    name = "kdoctools-5.5.0.tar.xz";
-    store = "/nix/store/i624z246bj0iy36r9fwzwnfanggkp7kj-kdoctools-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/knotifications-5.5.0.tar.xz";
-    sha256 = "04fp1gkjv828464xs7y3wm5p8ww2n9alfds8bs76i49gpd42xjyh";
-    name = "knotifications-5.5.0.tar.xz";
-    store = "/nix/store/5dmvw3gp1hbq03pnp5llav77ggrya3qv-knotifications-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kdesu-5.5.0.tar.xz";
-    sha256 = "0m47ha6xwxv3w9hijdf6z4bb84rr0rw9p4sr5nmb9wdngzrmzcpd";
-    name = "kdesu-5.5.0.tar.xz";
-    store = "/nix/store/ixyfa6piyz5hcw8y9pkx75cg189y4qf8-kdesu-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kdnssd-5.5.0.tar.xz";
-    sha256 = "1j94162lvnc47y1nfjshpa28biaihyxghi7nz9rjdlr7cf40gp4r";
-    name = "kdnssd-5.5.0.tar.xz";
-    store = "/nix/store/z381zrhhyjk482arjnbra8pbwib9jrkp-kdnssd-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kdewebkit-5.5.0.tar.xz";
-    sha256 = "0y5d7mabkgc5676aax64hficjy06fqkm8a72jki1hl808pbapvwy";
-    name = "kdewebkit-5.5.0.tar.xz";
-    store = "/nix/store/xi41pfsfghkayasng6kqn5b65cfgs4vs-kdewebkit-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kparts-5.5.0.tar.xz";
-    sha256 = "0l6na645j2ijais4nqir54jxzn13csigivcg098m6m0mpiz8j4w6";
-    name = "kparts-5.5.0.tar.xz";
-    store = "/nix/store/l5011v85i02gqnk2hfkif5d7cwq5zm0s-kparts-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kdeclarative-5.5.0.tar.xz";
-    sha256 = "1pb9dlggdr0vzy9bhzsjncnkalvdbrjhgbp1hzba9pyzpmmhx6pq";
-    name = "kdeclarative-5.5.0.tar.xz";
-    store = "/nix/store/7527cdligx3667bjbjqcjxk3m6ifqldc-kdeclarative-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/ktextwidgets-5.5.0.tar.xz";
-    sha256 = "1iqssmpilzxgjs5b2q3f1dpcq4wrwa528an6z9h6rx66lrmbcwml";
-    name = "ktextwidgets-5.5.0.tar.xz";
-    store = "/nix/store/93xq5dl3xmb713rfv0imh261lb6jr3d8-ktextwidgets-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/solid-5.5.0.tar.xz";
-    sha256 = "1vcphw9fj0hqxr612p4dv8ggbb6vh7bnpa8b7l216ixqpg3wg1gs";
-    name = "solid-5.5.0.tar.xz";
-    store = "/nix/store/knsf1bxiymf8nh65w65bakb1cvzjq2il-solid-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kpty-5.5.0.tar.xz";
-    sha256 = "147zxsdyw4fwn0d99nkbjxgcs5vf6wzvgm9d9fpiyzq2747pmnin";
-    name = "kpty-5.5.0.tar.xz";
-    store = "/nix/store/yic1isk1ak0fwr9i3k3af986m1k8z87g-kpty-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/sonnet-5.5.0.tar.xz";
-    sha256 = "0ck2li0y9z2vlby4axhva409bn5nw06g84mm4g3s86mfjypii3gm";
-    name = "sonnet-5.5.0.tar.xz";
-    store = "/nix/store/qgqxm6plb4vfj3yja62s4xa62nkbqmyj-sonnet-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kguiaddons-5.5.0.tar.xz";
-    sha256 = "0wlhhwf59bwscj7c1skigglp1fchdxmi8y3rrmm4ss7avbpkbjvb";
-    name = "kguiaddons-5.5.0.tar.xz";
-    store = "/nix/store/iajck67nc69d2qcczd3hxz41flkb3d7v-kguiaddons-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kunitconversion-5.5.0.tar.xz";
-    sha256 = "0h8rwnfd4dib56q0gndi4rjkrnmpq2bv0nbycsrnhjxvrzbxdfh0";
-    name = "kunitconversion-5.5.0.tar.xz";
-    store = "/nix/store/7dflp9jdaplbx4xjvy364kmy9h27yq67-kunitconversion-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kconfigwidgets-5.5.0.tar.xz";
-    sha256 = "1816n5qzjh4kgcmkicmsmwv063rx81wxvn4flbnrqxw2nglwyx41";
-    name = "kconfigwidgets-5.5.0.tar.xz";
-    store = "/nix/store/jgsadidxnli619q5i9cs7qmgkgs8hgqz-kconfigwidgets-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kimageformats-5.5.0.tar.xz";
-    sha256 = "0fhgk4pl8vx77p6jvcwx8vddzdn701rvbpjy3p0250zgzw9qjkin";
-    name = "kimageformats-5.5.0.tar.xz";
-    store = "/nix/store/qhy1ldzhhr1lij4bg5hp5w97fncqabhq-kimageformats-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/knewstuff-5.5.0.tar.xz";
-    sha256 = "0w0j20jh10zpigm1s6x0n0jgpx9czwb72miyfl8cj3h2j07ghdpz";
-    name = "knewstuff-5.5.0.tar.xz";
-    store = "/nix/store/a49vair6af9159j7bsz9y0gn8q12i0np-knewstuff-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kdbusaddons-5.5.0.tar.xz";
-    sha256 = "1k2k1bwjiv1r5pbzn3ypydgva7kjj2z8csg01jc8p2qii221afjp";
-    name = "kdbusaddons-5.5.0.tar.xz";
-    store = "/nix/store/322m5kv9whdjgc21vlk2vcjaba8yfcbq-kdbusaddons-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kio-5.5.0.tar.xz";
-    sha256 = "13y7chcln71wk32bcd3h6qld901gnafksd9f4kb0nmnahdv6z73z";
-    name = "kio-5.5.0.tar.xz";
-    store = "/nix/store/p0xphwbx522h8xacg8bar3dp8fhd26h8-kio-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kwindowsystem-5.5.0.tar.xz";
-    sha256 = "1s243453d43fpnlykmv7ix6wzxhbyl92y8nrbyn73zfb5kc7z0yh";
-    name = "kwindowsystem-5.5.0.tar.xz";
-    store = "/nix/store/63g4qavmxcgw5njpy9fq2fji5p8ji804-kwindowsystem-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kcodecs-5.5.0.tar.xz";
-    sha256 = "0wh5rcnvkq9c8vf8kll02jpqid5hix17w2ywwpsjfmgi2a4bkjz7";
-    name = "kcodecs-5.5.0.tar.xz";
-    store = "/nix/store/33fpi9a2ggbj8dfpnzhs1w3jgj6hzw78-kcodecs-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kcoreaddons-5.5.0.tar.xz";
-    sha256 = "00fg1khdndacbd6msgjcz2yan04ib5h0l35a4l7bwpyd1crk6fdj";
-    name = "kcoreaddons-5.5.0.tar.xz";
-    store = "/nix/store/2p4mz7pxz94sddm7r4j82q4nriz16i3b-kcoreaddons-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/frameworkintegration-5.5.0.tar.xz";
-    sha256 = "1781l1wzip4w4inz69si5cqy6gr0vcwx9vmhv93925jga44drpaz";
-    name = "frameworkintegration-5.5.0.tar.xz";
-    store = "/nix/store/6v1s33dyv1qvzv8x7m9ak4qn79g52ygz-frameworkintegration-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kwidgetsaddons-5.5.0.tar.xz";
-    sha256 = "0s3aybvnlri8pdfms4dmbgzqan656pzlaghsy8065x19dn4hmwl2";
-    name = "kwidgetsaddons-5.5.0.tar.xz";
-    store = "/nix/store/4f6681v6fp9yzgclf9wbryy63xjvjfvc-kwidgetsaddons-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kidletime-5.5.0.tar.xz";
-    sha256 = "0rb29aqv8npsq161nmkrsxz2kra0jdi1xv2zw9xyapb1yyg4qsk6";
-    name = "kidletime-5.5.0.tar.xz";
-    store = "/nix/store/1d96ca5sy906lhh16hmv122lr8s3xxrp-kidletime-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/ktexteditor-5.5.0.tar.xz";
-    sha256 = "17sbdis5wnj13cxi713ncl1x4b61sdhx5i2j3fdk5gqycmrw93xf";
-    name = "ktexteditor-5.5.0.tar.xz";
-    store = "/nix/store/jy8cb6vscgzqb4gcsnh5b0b64f3pil0k-ktexteditor-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/knotifyconfig-5.5.0.tar.xz";
-    sha256 = "1vj39fsxmypdq5bf1a5sdpld3dfy0hg7k8ikzhy4b83wh5mjzsfy";
-    name = "knotifyconfig-5.5.0.tar.xz";
-    store = "/nix/store/lc1gdg5j1qk7pjg8spyz2wkrcpwqw0c7-knotifyconfig-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/attica-5.5.0.tar.xz";
-    sha256 = "10slxvfcfqxirrnwzfwdnbmlarkcc93d0rvb2110cfvghq3w676m";
-    name = "attica-5.5.0.tar.xz";
-    store = "/nix/store/53asp14pcyx5a47339g6sc3ni8wdh6l8-attica-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kxmlgui-5.5.0.tar.xz";
-    sha256 = "13n8jp7krsbajnaq8r8135xlqja9sawis7fr1z0li54hskfz18x9";
-    name = "kxmlgui-5.5.0.tar.xz";
-    store = "/nix/store/mb1fqb5w5c05yg2fsi31jfcc24hvv1jh-kxmlgui-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kglobalaccel-5.5.0.tar.xz";
-    sha256 = "1bkv7nn5x6im0d6mqr9v4grjc2p3vs481ckgcs6g28p7b4a0dfl3";
-    name = "kglobalaccel-5.5.0.tar.xz";
-    store = "/nix/store/i6dkz0bnw1yx9g8q49414pm9aszkvri3-kglobalaccel-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/plasma-framework-5.5.0.tar.xz";
-    sha256 = "0rhmybncdyy1drg08pjvshmfmzd694skc0n9kk535bm90af4ir26";
-    name = "plasma-framework-5.5.0.tar.xz";
-    store = "/nix/store/jxi0gr530wj58d93hwd9zi5irxy3wrxh-plasma-framework-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kplotting-5.5.0.tar.xz";
-    sha256 = "1gxmngxh1w7wqhy3p4l3lr6283zp8wzsj7sv8gbzd55s3z9vcvp8";
-    name = "kplotting-5.5.0.tar.xz";
-    store = "/nix/store/5nncccml3icr8i2rr7qc1ai5193wr4z6-kplotting-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kactivities-5.5.0.tar.xz";
-    sha256 = "0ypd2cp82z7gabzg96hpz5s24nmzyd2c7a95k74xibasd2fxld73";
-    name = "kactivities-5.5.0.tar.xz";
-    store = "/nix/store/n6553bypqcqpnk2yhv9h0jlfbg671c7d-kactivities-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kiconthemes-5.5.0.tar.xz";
-    sha256 = "1jdjhg38bp936qjxjx0xkdkc1b8rly453d3hyf7vki10cfkm8l9i";
-    name = "kiconthemes-5.5.0.tar.xz";
-    store = "/nix/store/308wv5wyvxdmr792b26ps8wrjxw0s2s1-kiconthemes-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kservice-5.5.0.tar.xz";
-    sha256 = "1hs8g3nnrahi9951xgk0sj5fvpcj572fjj219kj7knv9mwv346zx";
-    name = "kservice-5.5.0.tar.xz";
-    store = "/nix/store/bizwfxq4ap84fd1g8kr7zdqys2rxfzig-kservice-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kemoticons-5.5.0.tar.xz";
-    sha256 = "0yl2w3f6h4irrbf6kl8npz4jwlzmi4bglwjcqqwhs3s6qz2wni95";
-    name = "kemoticons-5.5.0.tar.xz";
-    store = "/nix/store/y5inglfgimmn51by0rf6gk9d2k7wrprc-kemoticons-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/ki18n-5.5.0.tar.xz";
-    sha256 = "11756hp266nssmkywnyh61pzd32k7y15323f5rlh8ap8hzs2cvjd";
-    name = "ki18n-5.5.0.tar.xz";
-    store = "/nix/store/06sviq6lrs60zg9541x99x57avrr460m-ki18n-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/karchive-5.5.0.tar.xz";
-    sha256 = "06bal0lk9r8nnc0vzqsxjhk6xm6yjapl9x883rhzl9r8y9jxfcx3";
-    name = "karchive-5.5.0.tar.xz";
-    store = "/nix/store/zdm1v5bc5jxbv4yc1k4brkbk2mw4srzb-karchive-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/portingAids/krunner-5.5.0.tar.xz";
-    sha256 = "139213rrkc0hmab4hy6mp501s0z59hjgsvkikcswli7wj1yvl1aj";
-    name = "krunner-5.5.0.tar.xz";
-    store = "/nix/store/ps29p1lprbpkqk77x623nfdks22sxz7a-krunner-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/portingAids/kdelibs4support-5.5.0.tar.xz";
-    sha256 = "07jb21is23mkb2yy6dncw70f6jdcn0bg2vz13mgc86f3glim35wh";
-    name = "kdelibs4support-5.5.0.tar.xz";
-    store = "/nix/store/i6wdad07jlbk9nw6khccq9ncc9y4w82f-kdelibs4support-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/portingAids/kross-5.5.0.tar.xz";
-    sha256 = "1nj4zfw6490saixhv3rwp5r7nrzvbskbhr1wvf4rxdbp0f1q20nb";
-    name = "kross-5.5.0.tar.xz";
-    store = "/nix/store/6yq7q3g76rbmdyn12rgi423jfakdzwps-kross-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/portingAids/kmediaplayer-5.5.0.tar.xz";
-    sha256 = "192sn5vqgaip2y6rl30q6y7gmasgfwq137bcalyc00di15xclp6z";
-    name = "kmediaplayer-5.5.0.tar.xz";
-    store = "/nix/store/mj667h3y2j1p9ilblv96f1k98f918hp2-kmediaplayer-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/portingAids/kjsembed-5.5.0.tar.xz";
-    sha256 = "1niqpbg33gzyxppgyxwrnlh3lrwz1wj8zym9z5lr7kimbyamw5xd";
-    name = "kjsembed-5.5.0.tar.xz";
-    store = "/nix/store/pn4w12z242ymbdq4zjg1fa1c3a0fblgc-kjsembed-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/portingAids/khtml-5.5.0.tar.xz";
-    sha256 = "078444gi0jnpn5qjnv8zv2p0p22h14sxx3rv5kzc3zgbs8c0zqq2";
-    name = "khtml-5.5.0.tar.xz";
-    store = "/nix/store/yvnwkm5pn8b93rv422082gj1iaqx4sbs-khtml-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/portingAids/kjs-5.5.0.tar.xz";
-    sha256 = "0wqvzrqd8c7mi90zf7if5cgqi7g42nmqj1ycn13kkds08varrjb6";
-    name = "kjs-5.5.0.tar.xz";
-    store = "/nix/store/55s4313gpm9qspabvq8kaahnyw03ybfv-kjs-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kauth-5.5.0.tar.xz";
-    sha256 = "03sf3cc4hg4drf9h118yqswk65f01q3q7mmj6pz8hhmsvf7rjpq0";
-    name = "kauth-5.5.0.tar.xz";
-    store = "/nix/store/bh72pjz74vhfwhk6zi7zfhrpaqrmj0gj-kauth-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kitemmodels-5.5.0.tar.xz";
-    sha256 = "0j7hifhxrmsdfbp68s4aahmn9jdfy6sy88d2p3z41cg4fw368g2v";
-    name = "kitemmodels-5.5.0.tar.xz";
-    store = "/nix/store/hx2gy0h93wqcrz0185k8blpvkgqb5rvp-kitemmodels-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kcmutils-5.5.0.tar.xz";
-    sha256 = "0na4dvj6qrh7wrdpf7k2gix8grsyj7a8ckvsrzsm35vmxkj1rppx";
-    name = "kcmutils-5.5.0.tar.xz";
-    store = "/nix/store/v93p482j7bqlcch6wh4wpmdbzm2rrb1f-kcmutils-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kconfig-5.5.0.tar.xz";
-    sha256 = "116ck6xz8j9mdz528qk2bj3yifi28jr9amdmjq10y8m67qsgfmdx";
-    name = "kconfig-5.5.0.tar.xz";
-    store = "/nix/store/y79vpd5m36ygn0ka1v030kzabkl1qnn8-kconfig-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kcrash-5.5.0.tar.xz";
-    sha256 = "1ckxphll3vcw3qf8cy3vibn177wc1zkx64g1yfj32ahvc2q5jmw9";
-    name = "kcrash-5.5.0.tar.xz";
-    store = "/nix/store/hybhzm8b650i2zah4ymzsqx5k23gnd93-kcrash-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kded-5.5.0.tar.xz";
-    sha256 = "102s41g2cd3addrqlvwj1a4q9j2rkla22pmjy535s1myk0s5zzbi";
-    name = "kded-5.5.0.tar.xz";
-    store = "/nix/store/dv5i4jlw5q7x9s2h64vgvi8lblwsiaw5-kded-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kitemviews-5.5.0.tar.xz";
-    sha256 = "1fwdl2hvp7nfbii38j89irc0cyfciji20kigzr9iiccips1j4w64";
-    name = "kitemviews-5.5.0.tar.xz";
-    store = "/nix/store/mica7hv5rmmhvdcazm7pknq57d9ln8jx-kitemviews-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kdesignerplugin-5.5.0.tar.xz";
-    sha256 = "1qdcr2gqym367g8w5k1bm6mjm4smc62p4k0aczmjhypa5f9ddkfb";
-    name = "kdesignerplugin-5.5.0.tar.xz";
-    store = "/nix/store/3qlwbyrnbv48swhsknlj319md1z1sdxl-kdesignerplugin-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kwallet-5.5.0.tar.xz";
-    sha256 = "1z2d5qv9722k27dwnj7ivpxa880jmaghh8vhfd9f1wld7lijwpgs";
-    name = "kwallet-5.5.0.tar.xz";
-    store = "/nix/store/a2n6x1kfs3qdixn7fsfy0f3rgf1bzb21-kwallet-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kapidox-5.5.0.tar.xz";
-    sha256 = "055fx8xvksz86gqldxcfbacq5kvb0f7qswaqcnipfcabqkny8vh4";
-    name = "kapidox-5.5.0.tar.xz";
-    store = "/nix/store/m6mp3qg9i6jxgb25ivwcfg0c66y06aay-kapidox-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/threadweaver-5.5.0.tar.xz";
-    sha256 = "05j5m7fscppskc9jss2pm7zab3w0glfic685ccvvabllccsvhkn7";
-    name = "threadweaver-5.5.0.tar.xz";
-    store = "/nix/store/jwq6jvla6bypm1xhh7wv1lh7f2zmx8md-threadweaver-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kcompletion-5.5.0.tar.xz";
-    sha256 = "1l2jaq5f1wjav2vfkfbrrlk4v79q5l3106ij2dyxr0q1m05jvh2v";
-    name = "kcompletion-5.5.0.tar.xz";
-    store = "/nix/store/pq6fv8xh0nr0q1ki1hyp4mpg58jldmps-kcompletion-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kbookmarks-5.5.0.tar.xz";
-    sha256 = "022w3qddbgz4195nxs7kq0xs66qcagrp57jhpm2x23kp6l92g87s";
-    name = "kbookmarks-5.5.0.tar.xz";
-    store = "/nix/store/72fld6sj34xhjpg6v64dpn1g7lqpybin-kbookmarks-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kinit-5.5.0.tar.xz";
-    sha256 = "1hw06jhm0bs3p878ij22k7lx9gzaqnd2260iihgg7glr45jxbspn";
-    name = "kinit-5.5.0.tar.xz";
-    store = "/nix/store/1p4h45a62xcvswk09qa00zs1kjl0f2mj-kinit-5.5.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.5/kjobwidgets-5.5.0.tar.xz";
-    sha256 = "0g849ggnwyw4w4lmdwv4mndgyc2kbdgavgf9hgwmqx0kr2anhi24";
-    name = "kjobwidgets-5.5.0.tar.xz";
-    store = "/nix/store/yfdc0p3mmk31plh50cpx89zfcm3jvx7y-kjobwidgets-5.5.0.tar.xz";
-  }
-]

pkgs/development/libraries/kde-frameworks-5.5/renames.nix

@@ -1,66 +0,0 @@
-# DO NOT EDIT! This file is generated automatically.
-{ }:
-{
-"Backend" = "plasma-framework";
-"CTest" = "attica";
-"ECM" = "extra-cmake-modules";
-"KDED" = "kded";
-"KF5Activities" = "kactivities";
-"KF5Archive" = "karchive";
-"KF5Attica" = "attica";
-"KF5Auth" = "kauth";
-"KF5Bookmarks" = "kbookmarks";
-"KF5Codecs" = "kcodecs";
-"KF5Completion" = "kcompletion";
-"KF5Config" = "kconfig";
-"KF5ConfigWidgets" = "kconfigwidgets";
-"KF5CoreAddons" = "kcoreaddons";
-"KF5Crash" = "kcrash";
-"KF5DBusAddons" = "kdbusaddons";
-"KF5DNSSD" = "kdnssd";
-"KF5Declarative" = "kdeclarative";
-"KF5DesignerPlugin" = "kdesignerplugin";
-"KF5DocTools" = "kdoctools";
-"KF5Emoticons" = "kemoticons";
-"KF5FrameworkIntegration" = "frameworkintegration";
-"KF5GlobalAccel" = "kglobalaccel";
-"KF5GuiAddons" = "kguiaddons";
-"KF5I18n" = "ki18n";
-"KF5IconThemes" = "kiconthemes";
-"KF5IdleTime" = "kidletime";
-"KF5Init" = "kinit";
-"KF5ItemModels" = "kitemmodels";
-"KF5ItemViews" = "kitemviews";
-"KF5JS" = "kjs";
-"KF5JobWidgets" = "kjobwidgets";
-"KF5JsEmbed" = "kjsembed";
-"KF5KCMUtils" = "kcmutils";
-"KF5KDE4Support" = "kdelibs4support";
-"KF5KDELibs4Support" = "kdelibs4support";
-"KF5KHtml" = "khtml";
-"KF5KIO" = "kio";
-"KF5Kross" = "kross";
-"KF5MediaPlayer" = "kmediaplayer";
-"KF5NewStuff" = "knewstuff";
-"KF5Notifications" = "knotifications";
-"KF5NotifyConfig" = "knotifyconfig";
-"KF5Parts" = "kparts";
-"KF5Plasma" = "plasma-framework";
-"KF5PlasmaQuick" = "plasma-framework";
-"KF5Plotting" = "kplotting";
-"KF5Pty" = "kpty";
-"KF5Runner" = "krunner";
-"KF5Service" = "kservice";
-"KF5Solid" = "solid";
-"KF5Sonnet" = "sonnet";
-"KF5Su" = "kdesu";
-"KF5TextEditor" = "ktexteditor";
-"KF5TextWidgets" = "ktextwidgets";
-"KF5ThreadWeaver" = "threadweaver";
-"KF5UnitConversion" = "kunitconversion";
-"KF5Wallet" = "kwallet";
-"KF5WebKit" = "kdewebkit";
-"KF5WidgetsAddons" = "kwidgetsaddons";
-"KF5WindowSystem" = "kwindowsystem";
-"KF5XmlGui" = "kxmlgui";
-}

pkgs/development/libraries/kde-frameworks-5.5/setup-hook.sh

@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share

pkgs/development/libraries/kde-frameworks-5.6/dependencies.sh

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script rebuilds dependencies.nix.
-# You must run manifest.sh first to download the packages.
-
-# Without arguments, this will use the version of autonix-deps-kf5 in nixpkgs.
-# If you are working on the packages, this is probably what you want.
-
-# You can also pass the path to a source tree where you have built
-# autonix-deps-kf5 yourself. If you are working on autonix-deps-kf5, this is
-# probably what you want.
-
-manifestXML=$(nix-build -E 'with (import ../../../.. {}); autonix.writeManifestXML ./manifest.nix')
-
-autonixDepsKf5=""
-if [[ -z $1 ]]; then
-    autonixDepsKF5=$(nix-build ../../../.. -A haskellngPackages.autonix-deps-kf5)/bin
-else
-    autonixDepsKF5="$1/dist/build/kf5-deps"
-fi
-
-exec ${autonixDepsKF5}/kf5-deps "${manifestXML}"

pkgs/development/libraries/kde-frameworks-5.6/extra-cmake-modules/0002-qt5-plugin-dir.patch

@@ -1,25 +0,0 @@
-From e4fb9d880cefa743df2b5da3a67db617d66faf63 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 31 Dec 2014 07:23:59 -0600
-Subject: [PATCH 2/2] qt5 plugin dir
-
----
- kde-modules/KDEInstallDirs.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index a79a12a..70dbe02 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -315,7 +315,7 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--- 
-2.1.4
-

pkgs/development/libraries/kde-frameworks-5.6/kauth/kauth-policy-install.patch

@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")

pkgs/development/libraries/kde-frameworks-5.6/kcmutils/kcmutils-pluginselector-follow-symlinks.patch

@@ -1,13 +0,0 @@
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index c63241b..2243f94 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -304,7 +304,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }

pkgs/development/libraries/kde-frameworks-5.6/kconfigwidgets/kconfigwidgets-helpclient-follow-symlinks.patch

@@ -1,13 +0,0 @@
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);

pkgs/development/libraries/kde-frameworks-5.6/kdoctools/kdoctools-no-find-docbook-xml.patch

@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED

pkgs/development/libraries/kde-frameworks-5.6/kinit/kinit-libpath.patch

@@ -1,30 +0,0 @@
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 3c3c913..f510620 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -652,15 +652,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/plugins, so the kdeinit5
-+                  // shared libraries should be in /lib/plugins/../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {

pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-follow-symlinks.patch

@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/kbuildsycoca.cpp b/src/kbuildsycoca/kbuildsycoca.cpp
-index 69b1427..9c37a49 100644
---- a/src/kbuildsycoca/kbuildsycoca.cpp
-+++ b/src/kbuildsycoca/kbuildsycoca.cpp
-@@ -227,7 +227,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, g_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...

pkgs/development/libraries/kde-frameworks-5.6/kservice/kservice-kbuildsycoca-no-canonicalize-path.patch

@@ -1,13 +0,0 @@
-diff --git a/src/kbuildsycoca/vfolder_menu.cpp b/src/kbuildsycoca/vfolder_menu.cpp
-index 2eb1275..e39a36f 100644
---- a/src/kbuildsycoca/vfolder_menu.cpp
-+++ b/src/kbuildsycoca/vfolder_menu.cpp
-@@ -412,7 +412,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+        QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }

pkgs/development/libraries/kde-frameworks-5.6/manifest.nix

@@ -1,382 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ mirror }:
-[
-  {
-    url = "${mirror}/stable/frameworks/5.6/kdbusaddons-5.6.0.tar.xz";
-    sha256 = "1gn4dm983d1nw7s8x3v9iq95glk0kpyj5zblylk76q8zjnxrx63r";
-    name = "kdbusaddons-5.6.0.tar.xz";
-    store = "/nix/store/l77sb2fblas9qd9g1fc01n53yipsg6fz-kdbusaddons-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kitemmodels-5.6.0.tar.xz";
-    sha256 = "0b40hyzp9rdgm2lr2nnqq229zy6xc3y04xgz47h4cngyz2ykiidm";
-    name = "kitemmodels-5.6.0.tar.xz";
-    store = "/nix/store/vzbgb344m8j1rsmwmvz08rrqswjqf2kn-kitemmodels-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kded-5.6.0.tar.xz";
-    sha256 = "16zl0a1yr5vy18gds1kvw5g1ndl4rv3xgfgwy4bnys65rqw9j4nh";
-    name = "kded-5.6.0.tar.xz";
-    store = "/nix/store/2cwmng27rxxnkilf5rl61nfmv7f5dwgh-kded-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/attica-5.6.0.tar.xz";
-    sha256 = "1qw3fg2pm1zwjc64dmwgqf3w6bn9nhbwa4j1r2mxmsgdvm3m6y80";
-    name = "attica-5.6.0.tar.xz";
-    store = "/nix/store/1z5gs5p4riv2rzc83np3z2lch6lscbif-attica-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kimageformats-5.6.0.tar.xz";
-    sha256 = "0g09cvgr7l4lfhmwscyri2ivndl3kp9w7rnwx9kmqyrbpaq7a5p6";
-    name = "kimageformats-5.6.0.tar.xz";
-    store = "/nix/store/6fw40sn37h6kb9z58cj08fi0gafpm7il-kimageformats-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kxmlgui-5.6.0.tar.xz";
-    sha256 = "18d4bbvygrgxln54xwk3cas8ncpxapwxr4566c2402fm03y1j3zw";
-    name = "kxmlgui-5.6.0.tar.xz";
-    store = "/nix/store/cz3994azp3y1c9pkybjb6n7vq1fvrrdx-kxmlgui-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kunitconversion-5.6.0.tar.xz";
-    sha256 = "1zwmw4m5fa5r48cf28bpygwy3x8vap2xsld1ixnydzzbwc4ry3ix";
-    name = "kunitconversion-5.6.0.tar.xz";
-    store = "/nix/store/2kx18zpi5vd0j7mdg9yrrqciqqa48bzk-kunitconversion-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kcompletion-5.6.0.tar.xz";
-    sha256 = "0zk50qbm7yfjh01c89xg19yc3qji1qdlan60ggwjqabdwfx097vj";
-    name = "kcompletion-5.6.0.tar.xz";
-    store = "/nix/store/hs0amwz5nrzzx9gc4qlvw23dvacd12ys-kcompletion-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kwallet-5.6.0.tar.xz";
-    sha256 = "032yi352fdigdbvlqf6pci9srl6hcfc5gq10s90hvfp25xvyvn1k";
-    name = "kwallet-5.6.0.tar.xz";
-    store = "/nix/store/6cy8nbhblz788i0sq19vddgmm7kw3vkh-kwallet-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kservice-5.6.0.tar.xz";
-    sha256 = "1amwp6vzr4br6a37q2d8krhsvnnhvk2pvccizgml8pmk2kg1jndf";
-    name = "kservice-5.6.0.tar.xz";
-    store = "/nix/store/cfy088igxfx9p3w0npffidyd53qcf1qz-kservice-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kiconthemes-5.6.0.tar.xz";
-    sha256 = "1q06hlgs1sxnklrhdw7qxyfi4fxxjhza4nwc02p2ym1mfgj76afq";
-    name = "kiconthemes-5.6.0.tar.xz";
-    store = "/nix/store/alg2frgkj7jjy0rgq8d9c9s7ayhsxgmb-kiconthemes-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/threadweaver-5.6.0.tar.xz";
-    sha256 = "1ilwwcfczhz60542ivyvr4a1723fliz5mxv75nb0a3nsd8qh662j";
-    name = "threadweaver-5.6.0.tar.xz";
-    store = "/nix/store/22135n73yf5bgxhpfigk4vbajgqbv8za-threadweaver-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/sonnet-5.6.0.tar.xz";
-    sha256 = "0pkc7sck4lpl1ig8xqam91809s49rr70wqhqjmyd823m35134k88";
-    name = "sonnet-5.6.0.tar.xz";
-    store = "/nix/store/7m3a4g6jbbkqssm1xjzq4qc0axmdlzvw-sonnet-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kcrash-5.6.0.tar.xz";
-    sha256 = "0ismn2phd1802hb0vpdc5fn3x8h8p8lzdx1zgg1j5mqx3jddhskz";
-    name = "kcrash-5.6.0.tar.xz";
-    store = "/nix/store/hbv92rvbxwhb4mbf7skqfq7hv23v39hy-kcrash-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kio-5.6.0.tar.xz";
-    sha256 = "06kxl1x96nxkf6pn0hqm5jlpgvj0nzj16d4s3yqh80y8mb3qmy5x";
-    name = "kio-5.6.0.tar.xz";
-    store = "/nix/store/2p8kx9b47zxcgar5n6cfllxrmxc68k8j-kio-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kapidox-5.6.0.tar.xz";
-    sha256 = "1jai9na4v2brvlcb4bc7dghwbii326lp01qn97n4k2gs6gbaz72d";
-    name = "kapidox-5.6.0.tar.xz";
-    store = "/nix/store/a1wj3qs2a7p9xbhpv1lnj0fp28wbrk0a-kapidox-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kdewebkit-5.6.0.tar.xz";
-    sha256 = "18q7z8ly3dgn3vnl42swlaqqhf2ajfa8azz5pjswmfhfnxdh1dw7";
-    name = "kdewebkit-5.6.0.tar.xz";
-    store = "/nix/store/vigpp6rha2r1062nlkld92cg1kdvdqk4-kdewebkit-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/plasma-framework-5.6.0.tar.xz";
-    sha256 = "16xfhqkq29jw9wx3h6s8m3alamqqfff676qdik9kh5xxm9kyf3rq";
-    name = "plasma-framework-5.6.0.tar.xz";
-    store = "/nix/store/6xm3arrwlsl0w3xrcjxwl55fvhpqy34a-plasma-framework-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kwidgetsaddons-5.6.0.tar.xz";
-    sha256 = "179pjyjc8raiga5wv44dwpcjw68b3sc0pyv19rkwdbbym6rwx34d";
-    name = "kwidgetsaddons-5.6.0.tar.xz";
-    store = "/nix/store/59s52d30qcmlvhrbvzbhkxdm0vbq66k5-kwidgetsaddons-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kglobalaccel-5.6.0.tar.xz";
-    sha256 = "12wgv3nhr2c54vh17mqm96hyfvzjbfmm335dqh2ajqg79w7bk46v";
-    name = "kglobalaccel-5.6.0.tar.xz";
-    store = "/nix/store/yg49hswx9kr7y4rby96yl62cg8qggcld-kglobalaccel-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kparts-5.6.0.tar.xz";
-    sha256 = "1fd8kmfg6vyii8s5fx968x404wmmly29xfjlgpc2y5phw26v0jm1";
-    name = "kparts-5.6.0.tar.xz";
-    store = "/nix/store/mlb24addakwmg79h8j42yaiavfdw3xcj-kparts-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kdesignerplugin-5.6.0.tar.xz";
-    sha256 = "0nnxcqzsr4x7z08hz54n30lrbsxcnc14yc64lf8avpjs1cbgg2f6";
-    name = "kdesignerplugin-5.6.0.tar.xz";
-    store = "/nix/store/9bk81cvs0y7nicnf4z2hggpc2s2iw9mq-kdesignerplugin-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kidletime-5.6.0.tar.xz";
-    sha256 = "1byyj89iy20mwy373z5rxhkjc1adbpjjl14a3vqvc80f87x08hd5";
-    name = "kidletime-5.6.0.tar.xz";
-    store = "/nix/store/8pqylp14nd42qyh42rxhszgnby8dzz69-kidletime-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/ki18n-5.6.0.tar.xz";
-    sha256 = "0g9qzisi9hlz61l6qls5xwqkj98h26f5gnphh8pha3rxkh1nzrzm";
-    name = "ki18n-5.6.0.tar.xz";
-    store = "/nix/store/zhg3dfsqm51137kyvyc0i1qda7vjb82n-ki18n-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kinit-5.6.0.tar.xz";
-    sha256 = "1k9frj2myzzjjgg98hh5003zqkch4id3nkc0kqdx113g7walm2xy";
-    name = "kinit-5.6.0.tar.xz";
-    store = "/nix/store/kwr5nfpm93ngvsp10h1spsz93bb92l07-kinit-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.0.tar.xz";
-    sha256 = "08nad0mb2bxp2alh562qvpma6f4mkhznfla9p1skdb06kb0gz5s6";
-    name = "extra-cmake-modules-1.6.0.tar.xz";
-    store = "/nix/store/r6qshq5hxyrrddg7gwgwkpvbci6sxrgi-extra-cmake-modules-1.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/knewstuff-5.6.0.tar.xz";
-    sha256 = "0h60fhpc3p4l8889spj33lvwzcqplnlbf2clbwiyjpa1j86sfdf0";
-    name = "knewstuff-5.6.0.tar.xz";
-    store = "/nix/store/m465k9rzic6ax36m3wpv22wr90d6sm9w-knewstuff-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kitemviews-5.6.0.tar.xz";
-    sha256 = "0mjwvi0n55x8xwnbmqw1z6av7vc0gfrs9ljpgi1na4mmk84yqhdd";
-    name = "kitemviews-5.6.0.tar.xz";
-    store = "/nix/store/vj0ssv01sn36280g64k2dk0pwgzbff9l-kitemviews-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kpackage-5.6.0.tar.xz";
-    sha256 = "1wpvg5s0y31iad874xpyw1z78r72b7w56lxbn732imp5bzajmq2v";
-    name = "kpackage-5.6.0.tar.xz";
-    store = "/nix/store/iq9739r7pzk7zfzvk0599liylkwn9ml4-kpackage-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kcmutils-5.6.0.tar.xz";
-    sha256 = "0wzzxq3nid80q4a4wzz2yd3vfc6mzjxbdair263kw1xkxcb2l3ng";
-    name = "kcmutils-5.6.0.tar.xz";
-    store = "/nix/store/gsamabw9mhda9d3b7zwravfhvviym7gd-kcmutils-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kdeclarative-5.6.0.tar.xz";
-    sha256 = "049bknjd383vc4jlmahjrs2mnwdn0jrvz3pkjywlwx7v7ja69l5l";
-    name = "kdeclarative-5.6.0.tar.xz";
-    store = "/nix/store/zna6r1vkms0ysigsw1xcp0brwmrkkj00-kdeclarative-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kcodecs-5.6.0.tar.xz";
-    sha256 = "1l647c89rs3w6laal28hx25s1215jhl911q85jyzhz528rkd1jx6";
-    name = "kcodecs-5.6.0.tar.xz";
-    store = "/nix/store/iq1vxp7qbyrfdqh1jvfi0iq9zg17bzrm-kcodecs-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kdesu-5.6.0.tar.xz";
-    sha256 = "0agr28m80b5rnk3l4sjfcwq9cx4krs8f7nxl9ll13zx62gknwjlk";
-    name = "kdesu-5.6.0.tar.xz";
-    store = "/nix/store/8vnnjbbpnr52av5cga5y8i5iphmv73r6-kdesu-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/extra-cmake-modules-1.6.1.tar.xz";
-    sha256 = "1ri6zvhd6k721y0wigl1928dwhg7bvcqs0ifaddvhn8ql694qvgz";
-    name = "extra-cmake-modules-1.6.1.tar.xz";
-    store = "/nix/store/vpcwwg988l2647laz0mm4j65szby7yya-extra-cmake-modules-1.6.1.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/karchive-5.6.0.tar.xz";
-    sha256 = "0ldgwzzl70k4kvhmzp70r63akyprspcrpdnlafa5irdmfcc3sfzj";
-    name = "karchive-5.6.0.tar.xz";
-    store = "/nix/store/m75chqjl74piz0miwxj14szwb6834r3z-karchive-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kwindowsystem-5.6.0.tar.xz";
-    sha256 = "04qgai4ib2jm2xsmpzm2iszrkma4ns6fn8nkn8m5lbihsrfp6lmz";
-    name = "kwindowsystem-5.6.0.tar.xz";
-    store = "/nix/store/4a0hdrjz0s172vqnxwz7khysp0yz8pd7-kwindowsystem-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/knotifications-5.6.0.tar.xz";
-    sha256 = "1fz0kq8azwc3gdvbr7p07zsrpdsb707cksnzjgnddxm741wzvfr0";
-    name = "knotifications-5.6.0.tar.xz";
-    store = "/nix/store/r9p9h0ma9v57jpz1iv4gy66jd3wmi0jn-knotifications-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kactivities-5.6.0.tar.xz";
-    sha256 = "1mr375w83y8ivcq9fvswwr637ilyrikyv56bkkchyb18y34f1v1i";
-    name = "kactivities-5.6.0.tar.xz";
-    store = "/nix/store/0yazfjf3kwj7yqh60napp8i1gwp7vssm-kactivities-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kdoctools-5.6.0.tar.xz";
-    sha256 = "02vbw530gy1d6mygzrpd5pqdqjww2749q0rkj4dl14va7rw9ksx5";
-    name = "kdoctools-5.6.0.tar.xz";
-    store = "/nix/store/73xzy82hqayfb303cxxvb0pd1xsm68qi-kdoctools-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/frameworkintegration-5.6.0.tar.xz";
-    sha256 = "0kh57h2sxpz8my1wb5xx8xhxsa08nfdg3551dphvabl6mpg1jsqh";
-    name = "frameworkintegration-5.6.0.tar.xz";
-    store = "/nix/store/vljg38z53y37xafjvv7xhfnhb2cfhwby-frameworkintegration-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kauth-5.6.0.tar.xz";
-    sha256 = "0rnwh9cnn3nsk980grl1ycldpr61ihksmphcvq1jj0lpdgw80zan";
-    name = "kauth-5.6.0.tar.xz";
-    store = "/nix/store/khb8pfz5qn40mrfh859n4fp6qcv593ib-kauth-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/knotifyconfig-5.6.0.tar.xz";
-    sha256 = "0ifsnj9gm7fgwd2rb34xqnfy4hxyxr2wgyjd8ryywnp1zf4b6hfi";
-    name = "knotifyconfig-5.6.0.tar.xz";
-    store = "/nix/store/3mn9094lflb8larwzgz7p8hgf40kgq1a-knotifyconfig-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/solid-5.6.0.tar.xz";
-    sha256 = "1lnn6134s2zagcy1qcyxsr4nv31fxafmyk2cil70a0pmpq7ywyw4";
-    name = "solid-5.6.0.tar.xz";
-    store = "/nix/store/550z8fj4vabpds4d3kzn04mmhi6rb813-solid-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/networkmanager-qt-5.6.0.tar.xz";
-    sha256 = "0iwdzb75psvw4b1rg7ijrgz9kijiik7n4grryyib2nvwwgzna3lv";
-    name = "networkmanager-qt-5.6.0.tar.xz";
-    store = "/nix/store/m48q6fc34yxmiv02qmww8xdh2nrpzk6g-networkmanager-qt-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/portingAids/khtml-5.6.0.tar.xz";
-    sha256 = "1i6v3m7wkdj8cpqdp74mxhyyhq1qq8k80vsxjm1nzaqxgwq8gfvq";
-    name = "khtml-5.6.0.tar.xz";
-    store = "/nix/store/mlrqylbwp2bj7l70fxlkw0a6dcgd3q6x-khtml-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/portingAids/kmediaplayer-5.6.0.tar.xz";
-    sha256 = "0z66a2yb4i9q2mk14szs4z8832jl33awaqima9b9xsdh5w4q6llk";
-    name = "kmediaplayer-5.6.0.tar.xz";
-    store = "/nix/store/47908hvamfll3wn0rbacp455zvs0sv4g-kmediaplayer-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/portingAids/kjsembed-5.6.0.tar.xz";
-    sha256 = "08g3ac02c4vi010036kz0jgsmhv7c0s4xxk05pmkm6i7hrnslv7g";
-    name = "kjsembed-5.6.0.tar.xz";
-    store = "/nix/store/m0is4ahl2rsv4gzwarim4bw1jzzrddmm-kjsembed-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/portingAids/kross-5.6.0.tar.xz";
-    sha256 = "0pwscrk89apvysfgr596yb9vywdc6l6dsrhgxmmsplh6v3nqknph";
-    name = "kross-5.6.0.tar.xz";
-    store = "/nix/store/54p2ms8fjiikpcz15amg1kkip7ddpqfq-kross-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/portingAids/krunner-5.6.0.tar.xz";
-    sha256 = "09c11c43pw4hm59h1nixs2bqs22iwvc728fgm7hhmp76xv8vw5sf";
-    name = "krunner-5.6.0.tar.xz";
-    store = "/nix/store/2bbpl3pkd9h9di2ihlj3ab8gaxjvkfx5-krunner-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/portingAids/kjs-5.6.0.tar.xz";
-    sha256 = "0gizs498q2rjmlqgpwh7p1kb3bwdfif28fscya1i6jakdgl8s94c";
-    name = "kjs-5.6.0.tar.xz";
-    store = "/nix/store/2y2dd7s775c1699g13fbaz5b3pgb079g-kjs-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/portingAids/kdelibs4support-5.6.0.tar.xz";
-    sha256 = "057zvf1b6k8gfs19yz90fxj1jzyc2f1pyh03mhbj3a77sph82qc9";
-    name = "kdelibs4support-5.6.0.tar.xz";
-    store = "/nix/store/flmn2ls5rqyj6hh98c2vvvzmb7lx36a3-kdelibs4support-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kcoreaddons-5.6.0.tar.xz";
-    sha256 = "07z29viwijwmgashwxhz3j9pw9ksvsjywz88871nmggbw8544x0r";
-    name = "kcoreaddons-5.6.0.tar.xz";
-    store = "/nix/store/8j6zx7269w1z64wblpg0p8f9kc046qrn-kcoreaddons-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kemoticons-5.6.0.tar.xz";
-    sha256 = "1hq1dqhnj8zvna37pbi9xavc3ad41q5ayxb4gn6rn4hglg94fv68";
-    name = "kemoticons-5.6.0.tar.xz";
-    store = "/nix/store/63488dvgv4qpf60wkhmwrwylq09gnkq2-kemoticons-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kdnssd-5.6.0.tar.xz";
-    sha256 = "0cpfazdq7l9v29bjq08dj6kf8d1g8fjfq4aqljqzlzn4grsmjksq";
-    name = "kdnssd-5.6.0.tar.xz";
-    store = "/nix/store/rwdp52gpbyaak9r89lkj27mgbjhk8dhn-kdnssd-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kplotting-5.6.0.tar.xz";
-    sha256 = "0hj66zshpnaabvjhi4183fh4xhqg95sv8jjlmzwdzac7ipn09r0c";
-    name = "kplotting-5.6.0.tar.xz";
-    store = "/nix/store/4jrjvkz1dclccnwhqzh0sjia79d0bs4s-kplotting-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kconfigwidgets-5.6.0.tar.xz";
-    sha256 = "0fb1sxjcqfgvli5ndm03sqadrhqgsk841y6cql0grpyyx42b2s3s";
-    name = "kconfigwidgets-5.6.0.tar.xz";
-    store = "/nix/store/40sc8j052cpqsk663icz6x426jac6v2b-kconfigwidgets-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kpty-5.6.0.tar.xz";
-    sha256 = "02n2i4q2wasjkrivc80srs208zlgkhi0v7xxcx49xv2djhcm71nb";
-    name = "kpty-5.6.0.tar.xz";
-    store = "/nix/store/zw7lvzy73w9ffv79jmckr52bw7xsgza6-kpty-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kbookmarks-5.6.0.tar.xz";
-    sha256 = "00qn6jgz1zzz0bbj0z6ki7wcb4q611szvnmif1n7sdmmcczd2b3l";
-    name = "kbookmarks-5.6.0.tar.xz";
-    store = "/nix/store/qbi1yankzvx098cfksx8wdxh0zv0jqx3-kbookmarks-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/ktexteditor-5.6.0.tar.xz";
-    sha256 = "1s57bpr7bb2c4xw384lkik7pbwa21v1ma4vriv3dz91q029qjxgs";
-    name = "ktexteditor-5.6.0.tar.xz";
-    store = "/nix/store/c4hfl2yny47mxa8iil5xxqwrzwwlfqpl-ktexteditor-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kguiaddons-5.6.0.tar.xz";
-    sha256 = "08md1bch0cdd9ywc1g46ia1h1vqv74s36ar5x9if12jfkhiss13i";
-    name = "kguiaddons-5.6.0.tar.xz";
-    store = "/nix/store/1riwgwy3yw3n0zi1q7k3rnf3s37d397f-kguiaddons-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/ktextwidgets-5.6.0.tar.xz";
-    sha256 = "0b6q7mbdfjfzi3hb2qbjqnmdhycabsiqnrz66l2xa78phmwydvss";
-    name = "ktextwidgets-5.6.0.tar.xz";
-    store = "/nix/store/442l5jhr4vij2gnnbhf30q98xmyzd6m2-ktextwidgets-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kjobwidgets-5.6.0.tar.xz";
-    sha256 = "16l2xhlqvavzjf9hfjdz3pssa3sjdv6bvmk9dp9prf7j39pxhnw6";
-    name = "kjobwidgets-5.6.0.tar.xz";
-    store = "/nix/store/9hxzz693csamkrx8x6m7lrm5m76vx0nb-kjobwidgets-5.6.0.tar.xz";
-  }
-  {
-    url = "${mirror}/stable/frameworks/5.6/kconfig-5.6.0.tar.xz";
-    sha256 = "06rx3hwc3hay0g8pnzm9l7mdwk4pqy3waspncdlknabaxcvqmf0a";
-    name = "kconfig-5.6.0.tar.xz";
-    store = "/nix/store/26q4zhd6m4jjshknmd2r0dgxmscbgncr-kconfig-5.6.0.tar.xz";
-  }
-]

pkgs/development/libraries/kde-frameworks-5.6/manifest.sh

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-if [ $# -eq 0 ]; then
-
-  # The extra slash at the end of the URL is necessary to stop wget
-  # from recursing over the whole server! (No, it's not a bug.)
-  $(nix-build ../../../.. -A autonix.manifest) \
-    http://download.kde.org/stable/frameworks/5.6/ \
-      -A '*.tar.xz'
-
-else
-
-  $(nix-build ../../../.. -A autonix.manifest) -A '*.tar.xz' "$@"
-
-fi

pkgs/development/libraries/kde-frameworks-5.6/plasma-framework/plasma-framework-external-paths.patch

@@ -1,13 +0,0 @@
-diff --git a/src/plasma/package.cpp b/src/plasma/package.cpp
-index 07b3c90..84417e3 100644
---- a/src/plasma/package.cpp
-+++ b/src/plasma/package.cpp
-@@ -791,7 +791,7 @@ PackagePrivate::PackagePrivate()
-       servicePrefix("plasma-applet-"),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {

pkgs/development/libraries/kde-frameworks-5.6/setup-hook.sh

@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share

pkgs/development/libraries/kde-frameworks-5.7/default.nix

@@ -21,8 +21,6 @@ let
   mkDerivation = drv:
     stdenv.mkDerivation
       (drv // {
-        src = fetchurl drv.src;
-
         setupHook = ./setup-hook.sh;
 
         enableParallelBuilding = drv.enableParallelBuilding or true;
@@ -53,18 +51,25 @@ let
     # packages pinned to this version of Qt 5
     {
       Phonon4Qt5 = pkgs.phonon_qt5.override { inherit qt5; };
-      Qt5 = qt5;
-      Qt5Core = qt5;
-      Qt5DBus = qt5;
-      Qt5Test = qt5;
-      Qt5Widgets = qt5;
-      Qt5X11Extras = qt5;
+      Qt5 = qt5.base;
+      Qt5Core = qt5.base;
+      Qt5DBus = qt5.base;
+      Qt5Gui = qt5.base;
+      Qt5LinguistTools = qt5.tools;
+      Qt5Qml = qt5.declarative;
+      Qt5Quick = qt5.quickcontrols;
+      Qt5Script = qt5.script;
+      Qt5Svg = qt5.svg;
+      Qt5WebkitWidgets = qt5.webkit;
+      Qt5Widgets = qt5.base;
+      Qt5X11Extras = qt5.x11extras;
+      Qt5XmlPatterns = qt5.xmlpatterns;
       dbusmenu-qt5 = pkgs.libdbusmenu_qt5.override { inherit qt5; };
     } //
     # packages from the nixpkgs collection
     (with pkgs;
       {
-        inherit cmake;
+        inherit cmake epoxy;
         Boost = boost155;
         GIF = giflib;
         GLIB2 = glib;
@@ -97,12 +102,11 @@ let
       extra-cmake-modules = {
         inherit (super.extra-cmake-modules) name src;
 
-        propagatedNativeBuildInputs = with pkgs; [ cmake pkgconfig ];
+        propagatedNativeBuildInputs = [ pkgs.cmake pkgs.pkgconfig qt5.tools ];
         cmakeFlags = ["-DBUILD_TESTING=OFF"];
         patches =
           [
-            ./extra-cmake-modules/0001-libdir-default.patch
-            ./extra-cmake-modules/0002-qt5-plugin-dir.patch
+            ./extra-cmake-modules/0001-extra-cmake-modules-paths.patch
           ];
         meta = {
           license = with stdenv.lib.licenses; [ bsd2 ];
@@ -112,8 +116,14 @@ let
         };
       };
 
-      kauth = with pkgs; super.kauth // {
-        buildInputs = super.kauth.buildInputs ++ [polkit_qt5];
+      frameworkintegration = super.frameworkintegration // {
+        buildInputs = with pkgs.xlibs; super.frameworkintegration.buildInputs ++ [ libXcursor ];
+      };
+
+      kauth = super.kauth // {
+        buildInputs =
+          super.kauth.buildInputs
+          ++ [(pkgs.polkit_qt5.override { inherit qt5; })];
         patches = [./kauth/kauth-policy-install.patch];
       };
 
@@ -174,11 +184,10 @@ let
           ];
       };
 
-      /*
-      plasma-framework = super.plasma-framework // {
-        patches = [ ./plasma-framework/plasma-framework-external-paths.patch ];
+      ktexteditor = super.ktexteditor // {
+        patches = [ ./ktexteditor/0001-no-qcoreapplication.patch ];
       };
-      */
+
     };
 
   kf5 = generateCollection ./. {

pkgs/development/libraries/kde-frameworks-5.7/dependencies.nix

@@ -2,7 +2,7 @@
 { }:
 {
   attica = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -10,7 +10,7 @@
   };
 
   extra-cmake-modules = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "Flex" "GObject" "GStreamer" "LCMS" "LibArt" "OpenEXR" "PCRE" "QCA2" "QImageBlitz" "Qt5Core" "Qt5LinguistTools" "Qt5QUIET" "Sqlite" "Strigi" "USB" "Xine" "Xmms" ];
     nativeBuildInputs = [ "LibXslt" "QCOLLECTIONGENERATOR_EXECUTABLE" "SPHINX_EXECUTABLE" "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -18,7 +18,7 @@
   };
 
   frameworkintegration = {
-    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5Test" "XCB" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5WidgetsAddons" "OxygenFont" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" ];
     propagatedNativeBuildInputs = [  ];
@@ -26,7 +26,7 @@
   };
 
   kactivities = {
-    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" ];
+    buildInputs = [ "Boost" "ECM" "KF5" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Declarative" "KF5GlobalAccel" "KF5I18n" "KF5KCMUtils" "KF5KIO" "KF5Service" "KF5WindowSystem" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5DBus" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Sql" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -42,7 +42,7 @@
   };
 
   karchive = {
-    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5Test" "ZLIB" ];
+    buildInputs = [ "BZip2" "ECM" "KF5Archive" "LibLZMA" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "ZLIB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -50,7 +50,7 @@
   };
 
   kauth = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5CoreAddons" "Qt5" "Qt5DBus" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5CoreAddons" ];
     propagatedNativeBuildInputs = [  ];
@@ -58,7 +58,7 @@
   };
 
   kbookmarks = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5IconThemes" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5XmlGui" "Qt5Widgets" "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
@@ -66,7 +66,7 @@
   };
 
   kcmutils = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" ];
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5IconThemes" "KF5ItemViews" "KF5Service" "KF5XmlGui" ];
     propagatedNativeBuildInputs = [  ];
@@ -74,7 +74,7 @@
   };
 
   kcodecs = {
-    buildInputs = [ "ECM" "Qt5Core" "Qt5Test" ];
+    buildInputs = [ "ECM" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -82,7 +82,7 @@
   };
 
   kcompletion = {
-    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5WidgetsAddons" "Qt5" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Config" "KF5WidgetsAddons" ];
     propagatedNativeBuildInputs = [  ];
@@ -90,7 +90,7 @@
   };
 
   kconfig = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5Test" "Qt5Xml" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Gui" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
@@ -98,7 +98,7 @@
   };
 
   kconfigwidgets = {
-    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Auth" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" "Qt5" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Auth" "KF5Codecs" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5WidgetsAddons" ];
     propagatedNativeBuildInputs = [  ];
@@ -106,7 +106,7 @@
   };
 
   kcoreaddons = {
-    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
+    buildInputs = [ "ECM" "FAM" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "SharedMimeInfo" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -114,7 +114,7 @@
   };
 
   kcrash = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WindowSystem" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5CoreAddons" "KF5WindowSystem" "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -122,7 +122,7 @@
   };
 
   kdbusaddons = {
-    buildInputs = [ "ECM" "Qt5DBus" "Qt5Test" "Qt5X11Extras" ];
+    buildInputs = [ "ECM" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5X11Extras" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5DBus" ];
     propagatedNativeBuildInputs = [  ];
@@ -130,7 +130,7 @@
   };
 
   kdeclarative = {
-    buildInputs = [ "ECM" "KF5" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Test" "epoxy" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5KIO" "Qt5Qml" ];
     propagatedNativeBuildInputs = [  ];
@@ -146,7 +146,7 @@
   };
 
   kdelibs4support = {
-    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
+    buildInputs = [ "AGG" "Blitz" "BlueZ" "DocBookXML4" "ECM" "ENCHANT" "Eigen2" "FFmpeg" "Flac" "GObject" "GStreamer" "KDEWin" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Notifications" "KF5Parts" "KF5Service" "KF5TextWidgets" "KF5UnitConversion" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LCMS" "LibArt" "NetworkManager" "OpenEXR" "OpenSSL" "PCRE" "QCA2" "QImageBlitz" "QNtrack" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Designer" "Qt5NO_MODULE" "Qt5Network" "Qt5PrintSupport" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Sqlite" "USB" "X11" "Xine" "Xmms" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KDEWin" "KF5Auth" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DesignerPlugin" "KF5DocTools" "KF5Emoticons" "KF5GuiAddons" "KF5IconThemes" "KF5Init" "KF5ItemModels" "KF5KDELibs4Support" "KF5Notifications" "KF5Parts" "KF5TextWidgets" "KF5UnitConversion" "KF5WindowSystem" "Qt5DBus" "Qt5PrintSupport" "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
@@ -154,7 +154,7 @@
   };
 
   kdesignerplugin = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5Test" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DocTools" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5Plotting" "KF5Sonnet" "KF5TextWidgets" "KF5WebKit" "KF5WidgetsAddons" "KF5XmlGui" "Qt5Core" "Qt5Designer" "Qt5NO_MODULE" "Qt5QUIET" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -162,7 +162,7 @@
   };
 
   kdesu = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "X11" ];
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5Pty" "KF5Service" "Qt5Core" "Qt5NO_MODULE" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Pty" ];
     propagatedNativeBuildInputs = [  ];
@@ -170,7 +170,7 @@
   };
 
   kdewebkit = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5JobWidgets" "KF5KIO" "KF5Parts" "KF5Service" "KF5Wallet" "Qt5" "Qt5Core" "Qt5Network" "Qt5WebKitWidgets" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5WebKitWidgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -178,7 +178,7 @@
   };
 
   kdnssd = {
-    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" ];
+    buildInputs = [ "Avahi" "DNSSD" "ECM" "Qt5" "Qt5DBus" "Qt5Network" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Network" ];
     propagatedNativeBuildInputs = [  ];
@@ -186,7 +186,7 @@
   };
 
   kdoctools = {
-    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" ];
+    buildInputs = [ "DocBookXML4" "DocBookXSL" "ECM" "KF5Archive" "KF5DocTools" "KF5I18n" "LibXml2" "Qt5Core" "Qt5NO_MODULE" ];
     nativeBuildInputs = [ "LibXslt" "cmake" ];
     propagatedBuildInputs = [ "KF5Archive" "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -194,7 +194,7 @@
   };
 
   kemoticons = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Test" "Qt5Xml" ];
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5Service" "Qt5" "Qt5Gui" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Archive" "KF5Service" "Qt5Gui" ];
     propagatedNativeBuildInputs = [  ];
@@ -202,7 +202,7 @@
   };
 
   kglobalaccel = {
-    buildInputs = [ "ECM" "Qt5" "X11" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5I18n" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5DBus" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -210,7 +210,7 @@
   };
 
   kguiaddons = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5X11Extras" "X11" "XCB" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Gui" ];
     propagatedNativeBuildInputs = [  ];
@@ -226,7 +226,7 @@
   };
 
   ki18n = {
-    buildInputs = [ "ECM" "LibIntl" "Qt5" ];
+    buildInputs = [ "ECM" "LibIntl" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -234,7 +234,7 @@
   };
 
   kiconthemes = {
-    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5Svg" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Svg" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5ConfigWidgets" "KF5I18n" "KF5ItemViews" "KF5WidgetsAddons" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -242,7 +242,7 @@
   };
 
   kidletime = {
-    buildInputs = [ "ECM" "Qt5" "X11" "X11_XCB" "XCB" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5DBus" "Qt5Widgets" "Qt5X11Extras" "X11" "X11_XCB" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -250,7 +250,7 @@
   };
 
   kimageformats = {
-    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5PrintSupport" "Qt5Test" ];
+    buildInputs = [ "ECM" "Jasper" "OpenEXR" "Qt5Gui" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5QUIET" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -266,15 +266,15 @@
   };
 
   kio = {
-    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5Script" "Qt5Test" "Qt5Widgets" "Strigi" "X11" "ZLIB" ];
+    buildInputs = [ "ACL" "ECM" "GSSAPI" "KF5Archive" "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5JobWidgets" "KF5Notifications" "KF5Service" "KF5Solid" "KF5TextWidgets" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "LibXml2" "OpenSSL" "Qt5" "Qt5Concurrent" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Qt5Xml" "Strigi" "X11" "ZLIB" ];
     nativeBuildInputs = [ "LibXslt" "cmake" ];
-    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
+    propagatedBuildInputs = [ "KF5Bookmarks" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5ItemViews" "KF5JobWidgets" "KF5Service" "KF5Solid" "KF5XmlGui" "Qt5Network" ];
     propagatedNativeBuildInputs = [  ];
     propagatedUserEnvPkgs = [  ];
   };
 
   kitemmodels = {
-    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5Script" ];
+    buildInputs = [ "ECM" "Grantlee" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Script" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -282,7 +282,7 @@
   };
 
   kitemviews = {
-    buildInputs = [ "ECM" "Qt5" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -290,7 +290,7 @@
   };
 
   kjobwidgets = {
-    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5X11Extras" "X11" ];
+    buildInputs = [ "ECM" "KF5CoreAddons" "KF5WidgetsAddons" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5CoreAddons" "KF5WidgetsAddons" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -298,7 +298,7 @@
   };
 
   kjs = {
-    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5Test" ];
+    buildInputs = [ "ECM" "PCRE" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
     nativeBuildInputs = [ "Perl" "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -314,7 +314,7 @@
   };
 
   kmediaplayer = {
-    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KF5Parts" "KF5XmlGui" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Parts" ];
     propagatedNativeBuildInputs = [  ];
@@ -322,7 +322,7 @@
   };
 
   knewstuff = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5Archive" "KF5Attica" "KF5Completion" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5KIO" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Archive" "KF5Attica" "KF5KIO" "KF5XmlGui" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -330,7 +330,7 @@
   };
 
   knotifications = {
-    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
+    buildInputs = [ "ECM" "KF5Codecs" "KF5Config" "KF5CoreAddons" "KF5IconThemes" "KF5Service" "KF5WindowSystem" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "X11" "dbusmenu-qt5" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5WindowSystem" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -338,7 +338,7 @@
   };
 
   knotifyconfig = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5KIO" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Phonon4Qt5" "Qt5" "Qt5DBus" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5I18n" "KF5KIO" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -346,7 +346,7 @@
   };
 
   kpackage = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -354,7 +354,7 @@
   };
 
   kparts = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Test" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5IconThemes" "KF5JobWidgets" "KF5KIO" "KF5Notifications" "KF5Service" "KF5TextWidgets" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5KIO" "KF5Notifications" "KF5TextWidgets" "KF5XmlGui" ];
     propagatedNativeBuildInputs = [  ];
@@ -362,7 +362,7 @@
   };
 
   kplotting = {
-    buildInputs = [ "ECM" "Qt5" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -378,7 +378,7 @@
   };
 
   kross = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Completion" "KF5CoreAddons" "KF5DocTools" "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5Service" "KF5WidgetsAddons" "KF5XmlGui" "Qt5" "Qt5Core" "Qt5QUIET" "Qt5Script" "Qt5Test" "Qt5UiTools" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5I18n" "KF5IconThemes" "KF5KIO" "KF5Parts" "KF5WidgetsAddons" "Qt5Script" "Qt5Widgets" "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
@@ -386,7 +386,7 @@
   };
 
   krunner = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5I18n" "KF5KIO" "KF5Plasma" "KF5Service" "KF5Solid" "KF5ThreadWeaver" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Quick" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Plasma" "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -394,7 +394,7 @@
   };
 
   kservice = {
-    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Config" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5DocTools" "KF5I18n" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Test" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5I18n" ];
     propagatedNativeBuildInputs = [  ];
@@ -402,7 +402,7 @@
   };
 
   ktexteditor = {
-    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Archive" "KF5Config" "KF5GuiAddons" "KF5I18n" "KF5KIO" "KF5Parts" "KF5Sonnet" "LibGit2" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5PrintSupport" "Qt5Script" "Qt5Test" "Qt5Widgets" "Qt5Xml" "Qt5XmlPatterns" ];
     nativeBuildInputs = [ "Perl" "cmake" ];
     propagatedBuildInputs = [  ];
     propagatedNativeBuildInputs = [  ];
@@ -410,7 +410,7 @@
   };
 
   ktextwidgets = {
-    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Completion" "KF5ConfigWidgets" "KF5I18n" "KF5IconThemes" "KF5Service" "KF5Sonnet" "KF5WindowSystem" "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -418,7 +418,7 @@
   };
 
   kunitconversion = {
-    buildInputs = [ "ECM" "KF5I18n" "Qt5" ];
+    buildInputs = [ "ECM" "KF5I18n" "Qt5" "Qt5Core" "Qt5Network" "Qt5Test" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Config" "KF5I18n" "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -426,7 +426,7 @@
   };
 
   kwallet = {
-    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" ];
+    buildInputs = [ "ECM" "Gpgme" "KF5Config" "KF5CoreAddons" "KF5DBusAddons" "KF5Gpgmepp" "KF5I18n" "KF5IconThemes" "KF5Notifications" "KF5Service" "KF5WidgetsAddons" "KF5WindowSystem" "LibGcrypt" "Qt5" "Qt5DBus" "Qt5Gui" "Qt5Test" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Config" "KF5WindowSystem" "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -434,7 +434,7 @@
   };
 
   kwidgetsaddons = {
-    buildInputs = [ "ECM" "Qt5" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5UiTools" "Qt5Widgets" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -442,7 +442,7 @@
   };
 
   kwindowsystem = {
-    buildInputs = [ "ECM" "Qt5" "Qt5WinExtras" "X11" "XCB" ];
+    buildInputs = [ "ECM" "Qt5" "Qt5Test" "Qt5Widgets" "Qt5WinExtras" "Qt5X11Extras" "X11" "XCB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Widgets" ];
     propagatedNativeBuildInputs = [  ];
@@ -450,7 +450,7 @@
   };
 
   kxmlgui = {
-    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" ];
+    buildInputs = [ "ECM" "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5I18n" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WidgetsAddons" "KF5WindowSystem" "Qt5" "Qt5DBus" "Qt5Network" "Qt5PrintSupport" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "KF5Attica" "KF5Config" "KF5ConfigWidgets" "KF5GlobalAccel" "KF5IconThemes" "KF5ItemViews" "KF5TextWidgets" "KF5WindowSystem" "Qt5DBus" "Qt5Xml" ];
     propagatedNativeBuildInputs = [  ];
@@ -458,7 +458,7 @@
   };
 
   networkmanager-qt = {
-    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" ];
+    buildInputs = [ "ECM" "KF5NetworkManagerQt" "NetworkManager" "Qt4" "Qt5" "Qt5Core" "Qt5DBus" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -466,7 +466,7 @@
   };
 
   plasma-framework = {
-    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Test" "Qt5Widgets" "Solid" "X11" "XCB" ];
+    buildInputs = [ "ECM" "EGL" "Gpgme" "KActivities" "KCoreAddons" "KDE4Support" "KDESu" "KDeclarative" "KF5" "KF5Activities" "KF5Archive" "KF5Auth" "KF5Bookmarks" "KF5Codecs" "KF5Completion" "KF5Config" "KF5ConfigWidgets" "KF5CoreAddons" "KF5Crash" "KF5DBusAddons" "KF5Declarative" "KF5DocTools" "KF5GlobalAccel" "KF5GuiAddons" "KF5I18n" "KF5IconThemes" "KF5IdleTime" "KF5Init" "KF5ItemModels" "KF5ItemViews" "KF5JS" "KF5JobWidgets" "KF5KArchive" "KF5KAuth" "KF5KBookmarks" "KF5KCodecs" "KF5KCompletion" "KF5KConfig" "KF5KConfigWidgets" "KF5KCoreAddons" "KF5KCrash" "KF5KDBusAddons" "KF5KDE4Support" "KF5KDESu" "KF5KDeclarative" "KF5KDocTools" "KF5KF5GlobalAccel" "KF5KGuiAddons" "KF5KI18n" "KF5KIO" "KF5KIconThemes" "KF5KIdleTime" "KF5KInit" "KF5KJS" "KF5KJobWidgets" "KF5KNotifications" "KF5KParts" "KF5KService" "KF5KTextWidgets" "KF5KUnitConversion" "KF5KWallet" "KF5KWidgetsAddons" "KF5KWindowSystem" "KF5Kross" "KF5NO_MODULE" "KF5Notifications" "KF5Package" "KF5Parts" "KF5Service" "KF5Solid" "KF5Sonnet" "KF5Su" "KF5TextWidgets" "KF5ThreadWeaver" "KF5UnitConversion" "KF5Wallet" "KF5WidgetsAddons" "KF5WindowSystem" "KF5XmlGui" "KdepimLibs" "OpenGL" "QCA2" "Qt5" "Qt5Gui" "Qt5NO_MODULE" "Qt5Qml" "Qt5Quick" "Qt5Script" "Qt5Sql" "Qt5Svg" "Qt5Test" "Qt5Widgets" "Qt5X11Extras" "Solid" "X11" "XCB" ];
     nativeBuildInputs = [ "SH" "cmake" ];
     propagatedBuildInputs = [ "KF5Package" ];
     propagatedNativeBuildInputs = [  ];
@@ -474,7 +474,7 @@
   };
 
   solid = {
-    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Qml" "UDev" ];
+    buildInputs = [ "ECM" "IOKit" "MediaPlayerInfo" "Qt5" "Qt5Concurrent" "Qt5DBus" "Qt5Network" "Qt5QUIET" "Qt5Qml" "Qt5Test" "Qt5Widgets" "Qt5Xml" "UDev" ];
     nativeBuildInputs = [ "BISON" "FLEX" "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -482,7 +482,7 @@
   };
 
   sonnet = {
-    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5Test" "ZLIB" ];
+    buildInputs = [ "ASPELL" "ECM" "ENCHANT" "HSPELL" "HUNSPELL" "Qt5" "Qt5NO_MODULE" "Qt5Test" "Qt5Widgets" "ZLIB" ];
     nativeBuildInputs = [ "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];
@@ -490,7 +490,7 @@
   };
 
   threadweaver = {
-    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5Test" "Qt5Widgets" ];
+    buildInputs = [ "ECM" "KF5ThreadWeaver" "Qt5" "Qt5Core" "Qt5NO_MODULE" "Qt5Network" "Qt5Test" "Qt5Widgets" "Qt5Xml" ];
     nativeBuildInputs = [ "SNIPPETEXTRACTOR" "cmake" ];
     propagatedBuildInputs = [ "Qt5Core" ];
     propagatedNativeBuildInputs = [  ];

pkgs/development/libraries/kde-frameworks-5.7/extra-cmake-modules/0001-extra-cmake-modules-paths.patch

@@ -1,17 +1,17 @@
-From f1e22a65f94a231edfe01ac6a3fcf30d95b6329f Mon Sep 17 00:00:00 2001
+From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
 From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 31 Dec 2014 07:16:45 -0600
-Subject: [PATCH 1/2] libdir default
+Date: Fri, 20 Feb 2015 23:17:39 -0600
+Subject: [PATCH] extra-cmake-modules paths
 
 ---
- kde-modules/KDEInstallDirs.cmake | 31 +------------------------------
- 1 file changed, 1 insertion(+), 30 deletions(-)
+ kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
+ 1 file changed, 4 insertions(+), 33 deletions(-)
 
 diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index e255e87..a79a12a 100644
+index b7cd34d..2f868ac 100644
 --- a/kde-modules/KDEInstallDirs.cmake
 +++ b/kde-modules/KDEInstallDirs.cmake
-@@ -162,37 +162,8 @@
+@@ -193,37 +193,8 @@
  # (To distribute this file outside of extra-cmake-modules, substitute the full
  #  License text for the above reference.)
  
@@ -48,8 +48,27 @@ index e255e87..a79a12a 100644
 -  endif()
 -endif()
  
- # Macro for variables that are relative to another variable. We store an empty
- # value in the cache (for documentation/GUI cache editor purposes), and store
--- 
-2.1.4
+ set(_gnu_install_dirs_vars
+     BINDIR
+@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ else()
+-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
++    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
+         "Qt plugins"
+         QT_PLUGIN_INSTALL_DIR)
+ 
+-    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
++    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
+         "QtQuick1 imports"
+         IMPORTS_INSTALL_DIR)
+ 
+-    _define_relative(QMLDIR LIBDIR "qml"
++    _define_relative(QMLDIR LIBDIR "qt5/qml"
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ endif()
+-- 
+2.3.0
 

pkgs/development/libraries/kde-frameworks-5.7/ktexteditor/0001-no-qcoreapplication.patch

@@ -0,0 +1,48 @@
+From 71e28c7c6fdd1142f04c662f45cc8f779e457cda Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 15 Feb 2015 19:09:17 -0600
+Subject: [PATCH] no qcoreapplication
+
+---
+ src/syntax/data/katehighlightingindexer.cpp | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp
+index 3f02e8c..d1a865b 100644
+--- a/src/syntax/data/katehighlightingindexer.cpp
++++ b/src/syntax/data/katehighlightingindexer.cpp
+@@ -49,19 +49,16 @@ QStringList readListing(const QString &fileName)
+ 
+ int main(int argc, char *argv[])
+ {
+-    // get app instance
+-    QCoreApplication app(argc, argv);
+-    
+     // ensure enough arguments are passed
+-    if (app.arguments().size() < 3)
++    if (argc < 3)
+         return 1;
+ 
+     // open schema
+     QXmlSchema schema;
+-    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
++    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
+         return 2;
+ 
+-    const QString hlFilenamesListing = app.arguments().value(3);
++    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
+     if (hlFilenamesListing.isEmpty()) {
+         return 1;
+     }
+@@ -127,7 +124,7 @@ int main(int argc, char *argv[])
+         return anyError;
+     
+     // create outfile, after all has worked!
+-    QFile outFile(app.arguments().at(1));
++    QFile outFile(QString::fromLocal8Bit(argv[1]));
+     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+         return 7;
+ 
+-- 
+2.1.4
+

pkgs/development/libraries/kde-frameworks-5.7/manifest.nix

@@ -0,0 +1,562 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "kplotting-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/qldfj7r4gfnwd9137m5x282kn9clghvc-kplotting-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kplotting-5.7.0.tar.xz";
+      sha256 = "0257ydhyq0f5r2yl0va4y8zcb7vxll1jdz6ykaskg413hm2qxkpi";
+      name = "kplotting-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktextwidgets-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/kpbcn842lgx6h7cj7rblc60h656qqv49-ktextwidgets-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/ktextwidgets-5.7.0.tar.xz";
+      sha256 = "0yhhm9cgn2lbj2ca64szyy11xviaqj5kil5kwivwnndzvaap9ja5";
+      name = "ktextwidgets-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ki18n-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/x5y7xgpn24rw7ax1xm5m3z0kd1db3k5p-ki18n-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/ki18n-5.7.0.tar.xz";
+      sha256 = "16vz9hrm1j5gl5k0mbx36rxxngxbfwwlg7sznplybcghdzf5xwpc";
+      name = "ki18n-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "attica-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/fa5fimm0kc5yymlj05hcljz4lnyx15xz-attica-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/attica-5.7.0.tar.xz";
+      sha256 = "1xxd3062bv65npc3kxpsaw3805sg12fq76wy3qa1mqqy3074hvwh";
+      name = "attica-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesignerplugin-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/0nd3wx3gkln1bdpa956b8yjcs7k9ia4j-kdesignerplugin-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kdesignerplugin-5.7.0.tar.xz";
+      sha256 = "0y6yjm9zqi9plfbwqc7p8r0vsxj28drfymsdx4wvwqzfv8nby57q";
+      name = "kdesignerplugin-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kservice-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/claqclndc0kz33g5nkbpa3w38mh9jqqh-kservice-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kservice-5.7.0.tar.xz";
+      sha256 = "1aziycv2r0y02lcc3hv7kzzlk9sc3c5fmh02sgm4px2wknfd12ja";
+      name = "kservice-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kbookmarks-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/ww9xz56sdx2i3q8bipgf83gzdisihv0c-kbookmarks-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kbookmarks-5.7.0.tar.xz";
+      sha256 = "1vv3wirszsr5a2parbr6k4wkbp7lhcjqhbadr4fyhq62cvr7ya8l";
+      name = "kbookmarks-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kidletime-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/qiihgxjbhx39pc1p6g5w933ifzc3gdp8-kidletime-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kidletime-5.7.0.tar.xz";
+      sha256 = "15i9rj7fs6nc40axd19a8ba21wcbzvivwlsr49h27vfbhca4h5x3";
+      name = "kidletime-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpty-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/ij41pg9l8j47f42yhycv8nqh7lf2zjv8-kpty-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kpty-5.7.0.tar.xz";
+      sha256 = "0sg11pzrgmdyqxbvd8rbcljmjcacnpnf6wwjqb5rj92fvrd30av0";
+      name = "kpty-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdesu-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/yxxr5ldkg551dydqjwxds5fm0nsjszwp-kdesu-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kdesu-5.7.0.tar.xz";
+      sha256 = "0bjvkzgkmzxk4wlpk5hcxykf2nidg1c5c65mlhabddg0bns67axd";
+      name = "kdesu-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcodecs-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/4dx78zbckkn5hyrjmch1wh5n3vkzz8lc-kcodecs-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kcodecs-5.7.0.tar.xz";
+      sha256 = "0pnf435jdm8lifvq8gdy4195vq653ffqrqdw0qh36qn9242csqhj";
+      name = "kcodecs-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kinit-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/laps2gv18vnzirpm4il51m1kw2p7hslq-kinit-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kinit-5.7.0.tar.xz";
+      sha256 = "1fzmizq877f124kal9vali5a910kv3fx6pwpza502h6rdhslpsx2";
+      name = "kinit-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwindowsystem-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/b4c3rpfikpk4bl9y87862h2fvfv22nvx-kwindowsystem-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kwindowsystem-5.7.0.tar.xz";
+      sha256 = "1h3snqhlri98645nyc2p5jbz0s98yrppn3ipd7nyklnwk220prkk";
+      name = "kwindowsystem-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kxmlgui-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/sb8f1fy08m738adnajy1dd0xz5ipmwkr-kxmlgui-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kxmlgui-5.7.0.tar.xz";
+      sha256 = "1zpwih2v8416r3pn4rklr6xzhcn1jf3zlj4sd75xbnx6y5fbm1q6";
+      name = "kxmlgui-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifyconfig-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/an7xgl36n79n038b9i9dg7r1ngg0vncg-knotifyconfig-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/knotifyconfig-5.7.0.tar.xz";
+      sha256 = "0psv2k6p7d04s3icjw10hxi7676a9kphqcd2pzmcxg4wk50ikqns";
+      name = "knotifyconfig-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kunitconversion-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/161vcj6bf51i82rmpd9xws4h72xbcypg-kunitconversion-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kunitconversion-5.7.0.tar.xz";
+      sha256 = "1fhh2db23q0d6g9rqsbgv5wbzyzj72x9pjda5vqa549sx8yq04is";
+      name = "kunitconversion-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdbusaddons-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/lq4kzjg64c30yrinbgmkp5w596bg2121-kdbusaddons-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kdbusaddons-5.7.0.tar.xz";
+      sha256 = "1bn5ayywnhak0933y11lzkw39rkrmrm9m73knvgb46l7x1cchr3v";
+      name = "kdbusaddons-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "threadweaver-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/9gnqmwvy7pm5sjpfhqqk8grz1mjb2701-threadweaver-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/threadweaver-5.7.0.tar.xz";
+      sha256 = "1ab208awll2gnrs37p7k9nwp44sc30swibw75x9jh1w16nklpapa";
+      name = "threadweaver-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kparts-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/xjiy5yxbmd4g4l61qyrbdrakzxgsrhlb-kparts-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kparts-5.7.0.tar.xz";
+      sha256 = "0ws8mk1q0sd36b3ac39s4xyzhlbh897s0hkw9kyp8yk0779g09sg";
+      name = "kparts-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "sonnet-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/zz72jdhabwv1wj8mr910lfl17w11ap3i-sonnet-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/sonnet-5.7.0.tar.xz";
+      sha256 = "11q0zfpcmvjs994cdcp5rg49lzibi7jaz0jb8h7s5kf27nc96w0r";
+      name = "sonnet-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdewebkit-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/vyjpw6zsscf23xq0c4dgbldn3vizh4pj-kdewebkit-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kdewebkit-5.7.0.tar.xz";
+      sha256 = "04zb2a6dj89inxppf081hzkzwlyxcsrb3j4x2y6jz8zfpsnnhkxz";
+      name = "kdewebkit-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kguiaddons-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/1gns8ry1kiiww0lfs8m5yc8ki2sh550c-kguiaddons-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kguiaddons-5.7.0.tar.xz";
+      sha256 = "0f63vn1f5wafzxhc50lr59qd31jav512nwh7y37jl95mrc5yjjrb";
+      name = "kguiaddons-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "plasma-framework-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/mmwxm2jyi8lyir7g6ws8hjhzcmxkkb08-plasma-framework-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/plasma-framework-5.7.0.tar.xz";
+      sha256 = "0r5kks3a0b4cl599r2qlsigdr83psbgjw5xki480xs6caznmqd1m";
+      name = "plasma-framework-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdoctools-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/d1vx0maspgndbczfshwh3498qxwk9ca5-kdoctools-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kdoctools-5.7.0.tar.xz";
+      sha256 = "01lshra3jjqklbvld004pnj4pic8yrrpgbsy1yxfdfsccnrdf9di";
+      name = "kdoctools-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjobwidgets-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/r9q0s6cpwbhjkgrji86gylmj4mfwvikl-kjobwidgets-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kjobwidgets-5.7.0.tar.xz";
+      sha256 = "033y6cmdc8gzckqmxmasmpirfzsg0ga58hf88crrp8y21a03hary";
+      name = "kjobwidgets-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcrash-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/12105y95jb4xyf4c1z8ya6d81k7z5bji-kcrash-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kcrash-5.7.0.tar.xz";
+      sha256 = "0jq4rqicrvzmj8fra1zhk9b76b0x043z1ny5hf3ikyy9k4axay8z";
+      name = "kcrash-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemviews-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/2wrbbn9rr9xwqkiagiccpmr7v37c6icd-kitemviews-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kitemviews-5.7.0.tar.xz";
+      sha256 = "1ib6hlj7nv84all4j7p6k5ai5n4yslf2i2h2gwyiff2h55p2a686";
+      name = "kitemviews-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kio-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/fv1l1v4ld92shbih8cjlxyab272aygmq-kio-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kio-5.7.0.tar.xz";
+      sha256 = "0xf43ff41rgrqhici0mw2y2n4h97gkbgdngfngyzgm1vs3xq8wpl";
+      name = "kio-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwidgetsaddons-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/difsiryniivbnlh4j2jwssywv2ijb03s-kwidgetsaddons-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kwidgetsaddons-5.7.0.tar.xz";
+      sha256 = "19z5wr5dyq4kmry6iss85zpvjhh9a3pa6vmhbcag61sdid0nfsqx";
+      name = "kwidgetsaddons-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kapidox-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/d7f0aaamjvv67g9p5dhw98zwqg5sdl3q-kapidox-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kapidox-5.7.0.tar.xz";
+      sha256 = "1zv91a68lzh1rb12if7c67y0gy2004kh3jlcvfy270cd9rxmkywd";
+      name = "kapidox-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kimageformats-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/09c46cmhryzqnn32kxwfjblmf5fnm7pm-kimageformats-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kimageformats-5.7.0.tar.xz";
+      sha256 = "00gga2yhpdrc9y73zhs3r6vpqb5blc9r7by72i0cap5ac040a4la";
+      name = "kimageformats-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdeclarative-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/ylm05pqs3izryr45qqa37r82r76l1h3l-kdeclarative-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kdeclarative-5.7.0.tar.xz";
+      sha256 = "13m1pf92508sk4rl54v2pwic99snj2r0sjvmxvzv11cfrddjkr5g";
+      name = "kdeclarative-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kemoticons-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/msbryhpxvbp8165gyf4cp27f2fjrk09z-kemoticons-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kemoticons-5.7.0.tar.xz";
+      sha256 = "1k5436xc0fv4xx66lzpy2kx7qgzbdv6n56xif1jl85x66gfvfvdv";
+      name = "kemoticons-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcompletion-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/pnvb112ryqxy1q2yrrz72jak5lhm374p-kcompletion-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kcompletion-5.7.0.tar.xz";
+      sha256 = "1d8q2b8rdk7dmmhnjnkg16dc6bgnq2ahss2n1z2l6fcm305zvyfh";
+      name = "kcompletion-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfig-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/cq1lbqzf4ihy8jnk2jab31wb3dljmpdz-kconfig-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kconfig-5.7.0.tar.xz";
+      sha256 = "0mvdz5vxzqb1vxiy7llgnyi1yyl5jmdyq35v1sf55gb84gyghrgh";
+      name = "kconfig-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kpackage-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/ph932zwlra3rsjxh37rx0i1pshk08icc-kpackage-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kpackage-5.7.0.tar.xz";
+      sha256 = "0w6ljqs2knm9jvy3hkyk0iiy295mc0dpifvxyqcq4fqj9yvkrxgq";
+      name = "kpackage-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knotifications-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/6ppkdiwvy2y3wwxrja117pinmc4lv92a-knotifications-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/knotifications-5.7.0.tar.xz";
+      sha256 = "0z9bs21mn9i5jya0dh1sr0vvn362bz64nhbwnwkb5vgy0sl2n923";
+      name = "knotifications-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcoreaddons-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/63phhh1pcqlsqiqs9399vqfz7c7yw6ry-kcoreaddons-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kcoreaddons-5.7.0.tar.xz";
+      sha256 = "00byxkbwm3gvlharmqvn94jw7l1c1yjv4naczqgqcppl97h0zqyb";
+      name = "kcoreaddons-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kitemmodels-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/cgxjl2p9p0qmmn6vsb357pvn01zyblr2-kitemmodels-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kitemmodels-5.7.0.tar.xz";
+      sha256 = "0y3zis7rh40nrv135zb3lvl4ix4bqqvby6kcy3b1llxcmhvaglph";
+      name = "kitemmodels-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kded-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/icy79l7w5vqwmwmg21zji3y8sqpzwcq2-kded-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kded-5.7.0.tar.xz";
+      sha256 = "0146ldipacy43xypl5zshbf751bfi2mkaa5m8hcva4ygmps0xzp3";
+      name = "kded-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kconfigwidgets-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/lz8kkfgzz18myibj3wcijai5qs0jw03p-kconfigwidgets-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kconfigwidgets-5.7.0.tar.xz";
+      sha256 = "073rv7i04p21ifwfbhikib555067iivzybnrxw6mgb5hxgph8ggv";
+      name = "kconfigwidgets-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdelibs4support-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/3p606b334sbng7a1ppc9wc9gjw4v0y59-kdelibs4support-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/portingAids/kdelibs4support-5.7.0.tar.xz";
+      sha256 = "1vl6s0bd0ykzbbnd6fq7vfxg7aly0k04wr15wlikkapgx3v0h9b5";
+      name = "kdelibs4support-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "khtml-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/vrdx48h2r0fvjc7h2xzsjihs57gnny38-khtml-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/portingAids/khtml-5.7.0.tar.xz";
+      sha256 = "0flr8qz6nws5h52ghxrzxzmn9y85mlms4n0wzh1kski1sszv62i6";
+      name = "khtml-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjs-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/sipm1kyl3lwy2fw7lcjn2n2s8qpxhag7-kjs-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/portingAids/kjs-5.7.0.tar.xz";
+      sha256 = "1wjhl4j5y8q55bcgzlq3m0w1kafkivfgcdvi96f9rqyr7ij5ry9h";
+      name = "kjs-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "krunner-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/vid0xggxw5liig84p5jgwf3mafkyk7n5-krunner-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/portingAids/krunner-5.7.0.tar.xz";
+      sha256 = "113bxzzvjw1xxkq54nizb4g4rvbbaj58zfwcz6x0pvz5jfz65b7c";
+      name = "krunner-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kmediaplayer-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/629r99dj85wah0cqvpljy45n3zniqys3-kmediaplayer-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/portingAids/kmediaplayer-5.7.0.tar.xz";
+      sha256 = "1bdws01m37bbip4j897nwi49jakwl9j4hp3xxls15r2h5q4wylc3";
+      name = "kmediaplayer-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kross-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/8m4vp5riqrj4b1n2wvydvlz43902f01y-kross-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/portingAids/kross-5.7.0.tar.xz";
+      sha256 = "1larhjl2mi5v5a9a5m216idnyvxkbb9ln1czfvsg18nizai9b0bj";
+      name = "kross-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kjsembed-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/vcmsl5zz6lv1p92vw1k30wlzp0cr43f0-kjsembed-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/portingAids/kjsembed-5.7.0.tar.xz";
+      sha256 = "1717d4q4wf182s8rlf76wj7pgzmrh6j1na9myg2pqpa9564nmald";
+      name = "kjsembed-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "networkmanager-qt-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/rnixw65cmqlkkxmcn21rc73zwk4b0zg2-networkmanager-qt-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/networkmanager-qt-5.7.0.tar.xz";
+      sha256 = "1lx1vjsp25hfrg8pvpw3k17sxr9y57m4mgzikaxkh704z826npjk";
+      name = "networkmanager-qt-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "ktexteditor-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/m5spysm05hv2ncy392msym59jxd056qi-ktexteditor-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/ktexteditor-5.7.0.tar.xz";
+      sha256 = "0ii2aw2kzvxqwlm3cjil8shkr1yfmfcwr3hvrvk99zv6mw0j8kq3";
+      name = "ktexteditor-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kdnssd-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/pabbzdlfgyl58llh6m0l1j5w3r4anpv7-kdnssd-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kdnssd-5.7.0.tar.xz";
+      sha256 = "120rclq82fnjz5z8q3rn9jbmql3fqpr64yspggl6ccv0f2v513dy";
+      name = "kdnssd-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "karchive-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/z31cgnvxh50m6m7xcpv087zmpdn1la8q-karchive-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/karchive-5.7.0.tar.xz";
+      sha256 = "0ppq4ml77bf9n9q216dcsmw9ipmqqaazbaaxxvqn5hmqx9j63mmq";
+      name = "karchive-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kauth-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/6axbcm8958m691k3jsk3ci41h97aymq3-kauth-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kauth-5.7.0.tar.xz";
+      sha256 = "1254rbagpcp3dpdfjcxr7b07n5dqc0iw93xgpafkhxzn0h687hg2";
+      name = "kauth-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kwallet-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/7p63gkx0brvnwhzsg2laqnbrq7lgdggr-kwallet-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kwallet-5.7.0.tar.xz";
+      sha256 = "19bmdc7hdvr6bxwrmlhnkclqn6dzlrdg7k870y6p4rhyrj3nvc1h";
+      name = "kwallet-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kiconthemes-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/h02fsp21lh2dbd3yvpavqh1vgwc6m87v-kiconthemes-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kiconthemes-5.7.0.tar.xz";
+      sha256 = "111rdj347sf1g09zdnss4cq68ks71jxw0b22hnczqq9p60qcj1jg";
+      name = "kiconthemes-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "frameworkintegration-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/khjj7d173y5qlqqi2z6sc7zmkv5cx5lc-frameworkintegration-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/frameworkintegration-5.7.0.tar.xz";
+      sha256 = "0d0s03y99nk8cqnsz4w5v1d06bq5dl5395wgkcrchzcwqspk7z72";
+      name = "frameworkintegration-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "extra-cmake-modules-1.7.0.tar.xz" ".tar";
+    store = "/nix/store/ga7k0viqdz58drznxba2mjjq4qf0gnj1-extra-cmake-modules-1.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/extra-cmake-modules-1.7.0.tar.xz";
+      sha256 = "1lgx13y00b9mv2p10p7bbzx12aav65i4ggcnyaqmp7pv867y33f8";
+      name = "extra-cmake-modules-1.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "solid-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/rl9gv6hcsxalys9mnm00x34grsclnzh2-solid-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/solid-5.7.0.tar.xz";
+      sha256 = "0adzqbcwnqg0f2jbrsy4sqv0p94ikijm6id1yrd89nvn0iiiip14";
+      name = "solid-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kcmutils-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/dql6c4ljy6jkr7zsksrq5wpmqhxsgz37-kcmutils-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kcmutils-5.7.0.tar.xz";
+      sha256 = "1b0rzydyhbv7jk9amj45iryl4r2iy5k2zh8g7qwbwig8jywfhwqs";
+      name = "kcmutils-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "knewstuff-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/jwckk8a1mpy4mp785mbssy0mkn3zc6b6-knewstuff-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/knewstuff-5.7.0.tar.xz";
+      sha256 = "0wg3fg2kyq2j8n2qmahw30binm9pxaqvvydsxpcj97fl0wcaffgl";
+      name = "knewstuff-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kactivities-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/1s1bl23mrah31k3vqw40vfs6f79b0wnp-kactivities-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kactivities-5.7.0.tar.xz";
+      sha256 = "1d42i0a015qsr4d4rhr574xixfw1w0dgl4qag6slsj6fm5asny19";
+      name = "kactivities-5.7.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "kglobalaccel-5.7.0.tar.xz" ".tar";
+    store = "/nix/store/i6ja196cyzixsxbyg6bdivizs75y8pvb-kglobalaccel-5.7.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.7/kglobalaccel-5.7.0.tar.xz";
+      sha256 = "0jlknk3g07x9y4vl4n82hy4msfaavqy51fpj1yffya8zbb59c29y";
+      name = "kglobalaccel-5.7.0.tar.xz";
+    };
+  }
+]

pkgs/development/libraries/kde-frameworks-5.7/manifest.sh

@@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../../.. -A autonix.manifest) \
-    http://download.kde.org/stable/frameworks/5.5/ \
+    http://download.kde.org/stable/frameworks/5.7/ \
       -A '*.tar.xz'
 
 else

pkgs/development/libraries/libdbusmenu-qt/qt5.nix

@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     sha256 = "1dbhaljyivbv3wc184zpjfjmn24zb6aj72wgg1gg1xl5f783issd";
   };
 
-  buildInputs = [ qt5 ];
+  buildInputs = [ qt5.base ];
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = "-DWITH_DOC=OFF";
@@ -18,6 +18,6 @@ stdenv.mkDerivation {
     homepage = "http://launchpad.net/libdbusmenu-qt";
     description = "Provides a Qt implementation of the DBusMenu spec";
     maintainers = [ maintainers.ttuegel ];
-    inherit (qt5.meta) platforms;
+    inherit (qt5.base.meta) platforms;
   };
 }

pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix

@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, cmake, qt5, pkgconfig, phonon_qt5, gst_all_1 }:
+{ stdenv, fetchurl, cmake, gst_all_1, phonon_qt5, pkgconfig, qt5, debug ? false }:
+
+with stdenv.lib;
 
 let
   version = "4.8.2";
@@ -13,14 +15,15 @@ stdenv.mkDerivation rec {
     sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
   };
 
-  buildInputs = with gst_all_1; [ phonon_qt5 qt5 gstreamer gst-plugins-base ];
+  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon_qt5 qt5.base ];
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"
     "-DPHONON_BUILD_PHONON4QT5=ON"
-  ];
+  ]
+  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
 
   meta = with stdenv.lib; {
     homepage = http://phonon.kde.org/;

pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix

@@ -11,7 +11,6 @@ let
     qt4 = null;
     withQt5 = true;
   };
-  phonon_ = phonon.override { inherit qt4 qt5 withQt5; };
 in
 
 stdenv.mkDerivation {
@@ -24,7 +23,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake pkgconfig xz ];
 
-  buildInputs = [ vlc_ phonon_qt5 qt5];
+  buildInputs = [ vlc_ phonon_qt5 qt5.base ];
 
   cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
 

pkgs/development/libraries/phonon/qt5/default.nix

@@ -1,24 +1,28 @@
-{ stdenv, fetchurl, cmake, automoc4, pulseaudio, qt5 }:
+{ stdenv, fetchurl, cmake, mesa, pkgconfig, pulseaudio, qt5, debug ? false }:
 
 with stdenv.lib;
 
 let
-  v = "4.8.1";
+  v = "4.8.3";
 in
 
 stdenv.mkDerivation rec {
   name = "phonon-${v}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
-    sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn";
+    url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz";
+    sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
   };
 
-  buildInputs = [ qt5 pulseaudio ];
+  buildInputs = [ mesa qt5.base qt5.quick1 qt5.tools pulseaudio ];
 
-  nativeBuildInputs = [ cmake automoc4 ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
+  cmakeFlags = [
+    "-DPHONON_BUILD_PHONON4QT5=ON"
+    "-DCMAKE_INSTALL_LIBDIR=lib"
+  ]
+  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
 
   meta = {
     homepage = http://phonon.kde.org/;

pkgs/development/libraries/polkit-qt-1/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ cmake automoc4 pkgconfig ];
 
-  propagatedBuildInputs = [ polkit glib (if withQt5 then qt5 else qt4) ];
+  propagatedBuildInputs = [ polkit glib ] ++ (if withQt5 then [qt5.base] else [qt4]);
 
   meta = {
     description = "A Qt wrapper around PolKit";

pkgs/development/libraries/poppler/default.nix

@@ -72,7 +72,7 @@ let
   };
 
   poppler_qt5 = poppler_drv "qt5" {
-    propagatedBuildInputs = [ qt5 poppler_glib ];
+    propagatedBuildInputs = [ qt5.base poppler_glib ];
     postConfigure = ''
       mkdir -p "$out/lib/pkgconfig"
       install -c -m 644 poppler-qt5.pc "$out/lib/pkgconfig"

pkgs/development/libraries/qt-5/5.3-submodules/manifest.nix

@@ -1,166 +0,0 @@
-# This file is generated automatically. DO NOT EDIT!
-{ mirror }:
-[
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qttranslations-opensource-src-5.3.2.tar.xz";
-    sha256 = "1kf52crdg4a0p2pvm15slr2akiv5vcaj2g4f9iqqirg90pq4idi9";
-    name = "qttranslations-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/b49c2shv2x09l8887x9xd78j30azaihg-qttranslations-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtconnectivity-opensource-src-5.3.2.tar.xz";
-    sha256 = "0vq9v7dw8d3p2x45zzm96wvp8l1n76af3xzjs8p7bscpasw75f9f";
-    name = "qtconnectivity-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/7282a9bbvk9yvbp47yp3rh708cc6a2ic-qtconnectivity-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwinextras-opensource-src-5.3.2.tar.xz";
-    sha256 = "06g5ny3vfwfvh8aa6dhgypy446bj486ks6a3hwah2mzz911ywfgn";
-    name = "qtwinextras-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/iy9p8g3x5jl4ysxsm0zac8ac32x8xh45-qtwinextras-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtmultimedia-opensource-src-5.3.2.tar.xz";
-    sha256 = "02qf98kv48bvpff85sz49y965if7jlfx98vxf0y78crzr5kaqpr5";
-    name = "qtmultimedia-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/q7nvs99p642dwv1lzxay1hws4x5apsf8-qtmultimedia-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtquick1-opensource-src-5.3.2.tar.xz";
-    sha256 = "1yvkcbgcccy4bzf6xglnbjh23l5p9785lysfxphy7r40a64jwywv";
-    name = "qtquick1-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/baqff20xa58d4njisddi6s97g4pjhfki-qtquick1-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtgraphicaleffects-opensource-src-5.3.2.tar.xz";
-    sha256 = "1z3zpa3lj2kx9999ycg0ixffwr3k0g5wlnizgm41ja9xl5c2d3v8";
-    name = "qtgraphicaleffects-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/vkm87abgwl8hpvfamjnnn6cj5gpxzqrf-qtgraphicaleffects-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qttools-opensource-src-5.3.2.tar.xz";
-    sha256 = "0glq97mivf5mwqxanbg2j4n2nky2lpcigr8p8naizbj37p3csfax";
-    name = "qttools-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/l9gccd50sxj01bsz30z6ncby9s24bf3y-qttools-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtimageformats-opensource-src-5.3.2.tar.xz";
-    sha256 = "1m7283m1py4h11qj0rgz8bi7f474n2bnppnvrz0fsx1pnz7cn0yk";
-    name = "qtimageformats-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/ikpxw4qp50w7cs54f90njz5llv0xza2l-qtimageformats-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtsvg-opensource-src-5.3.2.tar.xz";
-    sha256 = "03z33bkkaxcnpnmk4klb775c1nrp835c4bf8r0678mgf0zrw5i8y";
-    name = "qtsvg-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/wkp9660hiqavzimc88birm0ww7x5yycx-qtsvg-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwebkit-opensource-src-5.3.2.tar.xz";
-    sha256 = "0nrfv57xpzgjk5420jhk2mr46mn0mjdxhg0vw4rcrqg82pnj4wg4";
-    name = "qtwebkit-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/9zvifykqvxic9f10672n7lxwxkl90886-qtwebkit-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtsensors-opensource-src-5.3.2.tar.xz";
-    sha256 = "1r1sjl41v8yij5b5lph7jkb2yxxaj1p8dyx1qzp0awdx5z29sdgr";
-    name = "qtsensors-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/x551nn8q8cflm99v2q3gk78vhayqb0bb-qtsensors-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtmacextras-opensource-src-5.3.2.tar.xz";
-    sha256 = "023q4v6drichy6s6mn3jd2lxzj2cma7y35wyzx3wa7rhvznplzlb";
-    name = "qtmacextras-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/kfb05hiq7dc1djiy92nxvskshfjzyydx-qtmacextras-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtlocation-opensource-src-5.3.2.tar.xz";
-    sha256 = "1mqlk09kccjxzrxxd5kv2w343kmnk8jxgfyb7adkhd8wacmhgd1p";
-    name = "qtlocation-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/pcfivvnnw5j5p3gk5r3gdf4iv974l323-qtlocation-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtscript-opensource-src-5.3.2.tar.xz";
-    sha256 = "1gnpsvlkqfws3rsgzlxnd63w2h9f142hfg4bsb3h4d4rihn0063f";
-    name = "qtscript-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/fjsvvkw7a39v85r8mwbpvki9zps1qcms-qtscript-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtquickcontrols-opensource-src-5.3.2.tar.xz";
-    sha256 = "0knryszjfhk2x7h5d9b07cil0mzqn4hlp5d8maq42w889l0hz2az";
-    name = "qtquickcontrols-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/2mlnavd1zjsp1vwnvi2gwgvw6wl3fpgc-qtquickcontrols-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtactiveqt-opensource-src-5.3.2.tar.xz";
-    sha256 = "07sbgibmj4m9jywdz3ilmz1s6zh57himqhc2a62k78r0xx48chz1";
-    name = "qtactiveqt-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/x1zpipa51v97w16dphdbbxn1mg096g2g-qtactiveqt-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qt5-opensource-src-5.3.2.tar.xz";
-    sha256 = "0xj18bbamg921y8y8pzjxs2sciyrwvvr7wzh43pjpkiacs13r08a";
-    name = "qt5-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/y1gks060bhnzan3af703i00l50kbmn4z-qt5-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtxmlpatterns-opensource-src-5.3.2.tar.xz";
-    sha256 = "1fqsxkbzf2iwzc2m5qccw1gan2ddbr15xjgjr9sp84cy0c3h7axc";
-    name = "qtxmlpatterns-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/z4g2py09bn400hfxh9n6ssqn9xnr5g7g-qtxmlpatterns-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtdoc-opensource-src-5.3.2.tar.xz";
-    sha256 = "17ahdsj8hssi1dfwxbxq11mi0lpy75c3z5mwswd13l9lnvpm6d0b";
-    name = "qtdoc-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/78sa59m008x9vcpiky2i2maql6d20wa8-qtdoc-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwebkit-examples-opensource-src-5.3.2.tar.xz";
-    sha256 = "10k45492afbqffx5jab8784spp9ihclgxqn0kviy5n5pcc41l268";
-    name = "qtwebkit-examples-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/39809byxmwz1wzchr6fd0b4qqd2p18mj-qtwebkit-examples-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtenginio-opensource-src-5.3.2.tar.xz";
-    sha256 = "027pdbgiaf1ypcb054x1mgdn5r9ph6hr09p4h2rrsd3avib4df6m";
-    name = "qtenginio-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/dmng42dg4s3sllzv27pz03gj8ys6i3a8-qtenginio-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtwebsockets-opensource-src-5.3.2.tar.xz";
-    sha256 = "1hiq7bkpffjpmx4kvp4xldgq8sm7r9xyfak410g7p8hg7d0kslv0";
-    name = "qtwebsockets-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/74gkwn4mqmq8if54492fk3mv0bgjjs12-qtwebsockets-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtandroidextras-opensource-src-5.3.2.tar.xz";
-    sha256 = "0a66f8s4wgb9s0k5bqc98kd5qf6qypxn1qhzcwqc3qqrfv69pwmy";
-    name = "qtandroidextras-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/0121pysghq6bxjx0l0isjfhjc283ncci-qtandroidextras-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtserialport-opensource-src-5.3.2.tar.xz";
-    sha256 = "0jsszlv4v45wx8m9rj0398c6i534dwfcjvb7b1wyaq5y135y11m8";
-    name = "qtserialport-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/7xkgwk3l565bvcmzadywjcpbydgbv688-qtserialport-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtx11extras-opensource-src-5.3.2.tar.xz";
-    sha256 = "0lbjq6014nz68xhg0mzmm92pm9r45jgaw82a1c41igz0bg4jhsna";
-    name = "qtx11extras-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/93rdyp4p1qz8cd7cn7gixjch23m71xqf-qtx11extras-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtdeclarative-opensource-src-5.3.2.tar.xz";
-    sha256 = "10i3id206vzvxc3rwa4mykwmbxc13mf8psapq6a06b34p69q2404";
-    name = "qtdeclarative-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/kf843n3710cancfcdicb17s8hxg628yr-qtdeclarative-opensource-src-5.3.2.tar.xz";
-  }
-  {
-    url = "${mirror}/official_releases/qt/5.3/5.3.2/submodules/qtbase-opensource-src-5.3.2.tar.xz";
-    sha256 = "1f3chbblfwyhj4qll6gd05jw7qgvcmqc12xbvpb9kbkdqid0j5ls";
-    name = "qtbase-opensource-src-5.3.2.tar.xz";
-    store = "/nix/store/l38yd5yrm35r812pdigxczqzv2h3k7r9-qtbase-opensource-src-5.3.2.tar.xz";
-  }
-]

pkgs/development/libraries/qt-5/5.4/default.nix

@@ -1,3 +1,16 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL.
+#  2. Run ./manifest.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions. Be sure to check if
+#  any new components have been added and package them as necessary.
+
 { autonix, fetchurl, newScope, stdenv
 
 , bison2
@@ -15,10 +28,9 @@ with stdenv.lib;
 let
   manifest =
     importManifest ./manifest.nix { mirror = "http://download.qt.io"; };
-  srcs =
-    mapAttrs (name: src: fetchurl { inherit (src) url sha256 name; }) manifest;
+  srcs = mapAttrs (name: manifest: manifest.src) manifest;
 
-  version = "5.3.2";
+  version = "5.4.0";
 
   callPackage = newScope (self // { inherit qtSubmodule; });
 
@@ -30,6 +42,8 @@ let
   self =
     {
 
+      qmake = callPackage ./qmake.nix { inherit (self) base; };
+
       activeqt = callPackage
         (
           { qtSubmodule, base }:
@@ -41,6 +55,8 @@ let
         )
         {};
 
+      /* androidextras = not packaged */
+
       base = callPackage ./qtbase.nix {
         mesa = mesa_noglu;
         cups = if stdenv.isLinux then cups else null;
@@ -128,6 +144,8 @@ let
         )
         {};
 
+      /* macextras = not packaged */
+
       multimedia = callPackage
         (
           { qtSubmodule, base, declarative
@@ -236,6 +254,12 @@ let
         )
         {};
 
+      /* wayland = not packaged */
+
+      /* webchannel = not packaged */
+
+      /* webengine = not packaged */
+
       webkit = callPackage
         (
           { qtSubmodule, declarative, location, multimedia, sensors
@@ -303,6 +327,8 @@ let
         )
         {};
 
+      /* winextras = not packaged */
+
       x11extras = callPackage
         (
           { qtSubmodule, base }:

pkgs/development/libraries/qt-5/5.4/manifest.nix

@@ -0,0 +1,274 @@
+# This file is generated automatically. DO NOT EDIT!
+{ stdenv, fetchurl, mirror }:
+[
+  {
+    name = stdenv.lib.nameFromURL "qtwebengine-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/108ywq0s80nanyrjs95nmfxvxmp1ijv2-qtwebengine-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebengine-opensource-src-5.4.0.tar.xz";
+      sha256 = "0fqmwhl2pxs0w33lqhcwgwdyrj61b8jmd3hc668xwirzsv0ab4db";
+      name = "qtwebengine-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtwebkit-examples-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/dgy0bd4382cak76d34ins8v1rxvcg2zg-qtwebkit-examples-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebkit-examples-opensource-src-5.4.0.tar.xz";
+      sha256 = "1xp9y3q0p5w3gj372hwbzb606akf6ynic94ppwzyhrhy70yjyamh";
+      name = "qtwebkit-examples-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtsensors-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/3ddk1slwp3sl11q3vrh14vczz1g3k77c-qtsensors-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtsensors-opensource-src-5.4.0.tar.xz";
+      sha256 = "0ng1mbvv2ffhk7rs3djiz2i7j297flnn1jkgqk6zpfbjyp6363wa";
+      name = "qtsensors-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtandroidextras-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/h77c86qj0fxr233x0b4n669mfd1kd14k-qtandroidextras-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtandroidextras-opensource-src-5.4.0.tar.xz";
+      sha256 = "0j40409x68bj6hbfrz0vqzafkbplzfcnlb7b7m72ddav0jm4ad3w";
+      name = "qtandroidextras-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtxmlpatterns-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/l30dh38cmmhz1laiwawfyx88d2njnf7s-qtxmlpatterns-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtxmlpatterns-opensource-src-5.4.0.tar.xz";
+      sha256 = "09albq9qj82hzphb3y4ivkkly6gjyxmcbghd7m73i9f7kdxnj73r";
+      name = "qtxmlpatterns-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtactiveqt-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/02axrl74rym70hs4ncwbpx520a6y5lfk-qtactiveqt-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtactiveqt-opensource-src-5.4.0.tar.xz";
+      sha256 = "1kvn8dqyr3iw5w55yba9ljldgc15zsa1ibdkhfwj3rk3579mfxba";
+      name = "qtactiveqt-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtx11extras-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/xqd394dy8j57iwvixy09a8mlklllf817-qtx11extras-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtx11extras-opensource-src-5.4.0.tar.xz";
+      sha256 = "0k27q46khwf3hzygb145akns37s8cmwbqyzjff810xxqwb4npim3";
+      name = "qtx11extras-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qttranslations-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/hafxaps23gqkpaq1ryh142jc9fh71kxp-qttranslations-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qttranslations-opensource-src-5.4.0.tar.xz";
+      sha256 = "12zrldi5jw6zknwg6p573gvz0f4v22wvwwc5mykj26j8g28qv9xc";
+      name = "qttranslations-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtwayland-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/ffs7rhirwgyqijcwkv2rn9i0f3126qwp-qtwayland-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwayland-opensource-src-5.4.0.tar.xz";
+      sha256 = "0abgsf67whdppg9q35b359wllz2pfzx6vw2gld6hhnhlx7rgf7k0";
+      name = "qtwayland-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtmultimedia-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/7ap1klckqnjx03i1024jd1nfw1kbdib3-qtmultimedia-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtmultimedia-opensource-src-5.4.0.tar.xz";
+      sha256 = "0ldgz677apqj8jm6b7cmma18jv97va26hjqjs3r26hg6gaidpfas";
+      name = "qtmultimedia-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtmacextras-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/w526ln2xj4bfqw2xbarhidain51idf3k-qtmacextras-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtmacextras-opensource-src-5.4.0.tar.xz";
+      sha256 = "0vq4dhsxwi1csy5qnbbjp3fmgmhqb7ah0nzrsickvv37vyfv85hn";
+      name = "qtmacextras-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtimageformats-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/yp6paa7psi4fwaih9mcvfxj9vldlmk5k-qtimageformats-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtimageformats-opensource-src-5.4.0.tar.xz";
+      sha256 = "0ip0iyn8fz96w5xi8w6dlxx0lhv1glmkdy5myz7zhi0yyy6ng6y8";
+      name = "qtimageformats-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qttools-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/1x2lvbyc2h25zmjyvawrfzn5yya13fjl-qttools-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qttools-opensource-src-5.4.0.tar.xz";
+      sha256 = "06klc0vdqfnj8dwqq64602x0wl8ackcim1y33mw6616kzyba11as";
+      name = "qttools-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtconnectivity-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/33mxdwaih2ysjzyvjgfgq86ys9bd9s8x-qtconnectivity-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtconnectivity-opensource-src-5.4.0.tar.xz";
+      sha256 = "0f0hkgqr606q4jj8g70xq72lp9q6kdyfw6rdiin8zhnarjxqark3";
+      name = "qtconnectivity-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtwebchannel-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/bx82yn9n0srdzlid1blwg196jqyhhgpp-qtwebchannel-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebchannel-opensource-src-5.4.0.tar.xz";
+      sha256 = "0k2r0qrqrxhw2mjyd9f8r36f04yxfkgw1dmbbdczhw4234jh3sr4";
+      name = "qtwebchannel-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtserialport-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/3q6b9l2cwszm9jz5csx2jsfqk08nz9nh-qtserialport-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtserialport-opensource-src-5.4.0.tar.xz";
+      sha256 = "1hsqs1dy8x5v3l4z8zk9rjprz14w8nv13j4yy47r4nsgf7pikihg";
+      name = "qtserialport-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtdoc-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/bbqvydxnaw4asp2a9j4pq0d5zi1zaqsf-qtdoc-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtdoc-opensource-src-5.4.0.tar.xz";
+      sha256 = "06gx7b3xq3jdprmwfzsy2c1x7klry1wsrfs1iyjgfq9sdja9d1nm";
+      name = "qtdoc-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtwinextras-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/by4v18v2k0xaz9znh18qfr8fvy8n67qg-qtwinextras-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwinextras-opensource-src-5.4.0.tar.xz";
+      sha256 = "01p3haicfbsg0nb654s16pxl9hr57dksk2w5h2ijghpivqhlzbh3";
+      name = "qtwinextras-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtbase-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/01rpn59v04bx5f9mw92v6zq2hl4bigcr-qtbase-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtbase-opensource-src-5.4.0.tar.xz";
+      sha256 = "1lciiq64qzbgg8kvc2fl98ykpn7fcjv2q6n2ivbw4yz7ll5j9sns";
+      name = "qtbase-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtdeclarative-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/mc0dz5hbaqf3sannvg4j7zxwqcsj3g0f-qtdeclarative-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtdeclarative-opensource-src-5.4.0.tar.xz";
+      sha256 = "1dnpz86asklm3qvm1wyjm3w1kyr319yas8w03ry9m1pnn1sr4z76";
+      name = "qtdeclarative-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtgraphicaleffects-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/r7hpzw01dxh31px5lm1jv6pz753sawrd-qtgraphicaleffects-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtgraphicaleffects-opensource-src-5.4.0.tar.xz";
+      sha256 = "06cblcjd6c7nbq1lc8b7mydambf16qmpargc1x0bh3hq6bji0gx4";
+      name = "qtgraphicaleffects-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtquick1-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/f449vw01acb5jjf74fhfjrjhp8z00dby-qtquick1-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtquick1-opensource-src-5.4.0.tar.xz";
+      sha256 = "1p1js3ck3310kbgvnzsfd0gfd4p9c3fccfas7hzkhcj83iybga6m";
+      name = "qtquick1-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qt5-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/6nh8apj4l1xpqcjq1lkb9g1n50wd6xsz-qt5-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qt5-opensource-src-5.4.0.tar.xz";
+      sha256 = "0gw782dvmvz6c8lpgvn7fi0d8wydjrrfarhjrbbwmswa37492s5r";
+      name = "qt5-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtscript-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/zc0k3d4s867p17bas7clvabdsh2xblhh-qtscript-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtscript-opensource-src-5.4.0.tar.xz";
+      sha256 = "1l0f6g1m5p9zgc4pbx6xm5b31ygcl4dayj43hwblpwinxh15gwzm";
+      name = "qtscript-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtwebsockets-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/camx69vrzl5ciwmc7rygax1iphcdk474-qtwebsockets-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebsockets-opensource-src-5.4.0.tar.xz";
+      sha256 = "1pybyksa8gwm98f65l3pa8dxbplz882r13b7i0idsg4q9952gk9a";
+      name = "qtwebsockets-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtquickcontrols-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/y0n7c5safk5174b14a9p6kqw2p2n3vrs-qtquickcontrols-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtquickcontrols-opensource-src-5.4.0.tar.xz";
+      sha256 = "07p6z9c1cgyx9qx81mpgnh8dim4q9im714lzk8zyghwi68rl77xm";
+      name = "qtquickcontrols-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtenginio-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/afpm16dyv3bis6xfr4lnhnd0xrflpi86-qtenginio-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtenginio-opensource-src-5.4.0.tar.xz";
+      sha256 = "0k4j5nc33ijifjpii074bar105z1mn98qg1vzn8q5lq0y7jm82gs";
+      name = "qtenginio-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtwebkit-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/v0l3znjnhnnlbvbdb33ns3npz1p7dlzw-qtwebkit-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtwebkit-opensource-src-5.4.0.tar.xz";
+      sha256 = "1hc8s6l70ikf7ld2x84p6d2wwyxdfqw2pdqlma42wpaxfq3j4rvc";
+      name = "qtwebkit-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtlocation-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/kbgbnl01j85iab7a88x4gi3q2n40n9zr-qtlocation-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtlocation-opensource-src-5.4.0.tar.xz";
+      sha256 = "0mnlh6z8hq9j32sxqsd8al811p4iv99wd8bsm97w9nyxbwdhqhp8";
+      name = "qtlocation-opensource-src-5.4.0.tar.xz";
+    };
+  }
+  {
+    name = stdenv.lib.nameFromURL "qtsvg-opensource-src-5.4.0.tar.xz" ".tar";
+    store = "/nix/store/h9qfbbj46sc2nhx24354b9cgq9hnssdc-qtsvg-opensource-src-5.4.0.tar.xz";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.4/5.4.0/submodules/qtsvg-opensource-src-5.4.0.tar.xz";
+      sha256 = "12dpqb67mm1h1x3f4811zvk4dbnswsg58ipl57m3mdn7mhmpdvk8";
+      name = "qtsvg-opensource-src-5.4.0.tar.xz";
+    };
+  }
+]

pkgs/development/libraries/qt-5/5.4/manifest.sh

@@ -5,7 +5,7 @@ if [ $# -eq 0 ]; then
   # The extra slash at the end of the URL is necessary to stop wget
   # from recursing over the whole server! (No, it's not a bug.)
   $(nix-build ../../../../.. -A autonix.manifest) \
-    http://download.qt.io/official_releases/qt/5.3/5.3.2/submodules/ \
+    http://download.qt.io/official_releases/qt/5.4/5.4.0/submodules/ \
       -A '*.tar.xz'
 
 else

pkgs/development/libraries/qt-5/5.4/qt-submodule.nix

@@ -15,39 +15,35 @@ mkDerivation (args // {
 
   srcs = args.srcs or [srcs."${args.name}-opensource-src"];
 
-  preConfigure = ''
-    mkdir -p "$out"
-
-    for qtInput in ${concatStringsSep " " args.qtInputs}; do
-      lndir "$qtInput" "$out"
-    done
-
-    # Only this package's nix-support files go in $out
-    rm -fr $out/nix-support
-
-    # Override hardcoded paths in qmake
-    rm -f $out/bin/qmake
-    cp "${base}/bin/qmake" "$out/bin/qmake"
-    rm -f $out/bin/qt.conf
-    cat <<EOF >$out/bin/qt.conf
-[Paths]
-Prefix = $out
-EOF
-    export PATH=$out/bin:$PATH
-  '' + (args.preConfigure or "");
-
+  qtSubmodule = args.qtSubmodule or true;
   dontAddPrefix = args.dontAddPrefix or true;
   dontFixLibtool = args.dontFixLibtool or true;
   configureScript = args.configureScript or "qmake";
 
+  preConfigure = ''
+    export PATH="$out/bin:$PATH"
+  '';
+
   postInstall = ''
     rm "$out/bin/qmake" "$out/bin/qt.conf"
+
+    cat "$out/nix-support/qt-inputs" | while read file; do
+      if [[ -h "$out/$file" ]]; then
+        rm "$out/$file"
+      fi
+    done
+
+    cat "$out/nix-support/qt-inputs" | while read file; do
+      if [[ -d "$out/$file" ]]; then
+        rmdir --ignore-fail-on-non-empty -p "$out/$file"
+      fi
+    done
+
+    rm "$out/nix-support/qt-inputs"
   '';
 
   propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
 
-  nativeBuildInputs = [ lndir ] ++ (args.nativeBuildInputs or []);
-
   enableParallelBuilding =
     args.enableParallelBuilding or true; # often fails on Hydra, as well as qt4
 

pkgs/development/libraries/qt-5/5.4/qtbase.nix

@@ -6,7 +6,7 @@
 , fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre
 , zlib, libjpeg, libpng, libtiff, sqlite, icu
 
-, coreutils, bison, flex, gdb, gperf, ruby
+, coreutils, bison, flex, gdb, gperf, lndir, ruby
 , python, perl, pkgconfig
 
 # optional dependencies
@@ -72,6 +72,13 @@ stdenv.mkDerivation {
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
+
+    sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
+    sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
+    sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in"
+    sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
+
+    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
   '';
 
   prefixKey = "-prefix ";
@@ -159,6 +166,10 @@ stdenv.mkDerivation {
 
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
+
+      mkdir -p "$out/nix-support"
+      substitute ${./setup-hook.sh} "$out/nix-support/setup-hook" \
+        --subst-var out --subst-var-by lndir "${lndir}"
     '';
 
   enableParallelBuilding = true; # often fails on Hydra, as well as qt4

pkgs/development/libraries/qt-5/5.4/setup-hook.sh

@@ -0,0 +1,58 @@
+addQtModule() {
+    if [[ -d "$1/mkspecs" ]]; then
+
+        @lndir@/bin/lndir -silent "$1/mkspecs" "$qtOut/mkspecs"
+        if [[ -n $qtSubmodule ]]; then
+            find "$1/mkspecs" -printf 'mkspecs/%P\n' >> "$qtOut/nix-support/qt-inputs"
+        fi
+
+        if [[ -d "$1/bin" ]]; then
+            @lndir@/bin/lndir -silent "$1/bin" "$qtOut/bin"
+            if [[ -n $qtSubmodule ]]; then
+                find "$1/bin" -printf 'bin/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            fi
+        fi
+
+        if [[ -d "$1/include" ]]; then
+            @lndir@/bin/lndir -silent "$1/include" "$qtOut/include"
+            if [[ -n $qtSubmodule ]]; then
+                find "$1/include" -printf 'include/%P\n' >> "$qtOut/nix-support/qt-inputs"
+            fi
+        fi
+
+        if [[ -n $qtSubmodule ]] && [[ -d "$1/lib" ]]; then
+            @lndir@/bin/lndir -silent "$1/lib" "$qtOut/lib"
+            find "$1/lib" -printf 'lib/%P\n' >> "$qtOut/nix-support/qt-inputs"
+        fi
+
+        propagatedBuildInputs+=" $1"
+    fi
+
+    if [[ -f "$1/bin/qmake" ]]; then
+        addToSearchPath PATH "$qtOut/bin"
+    fi
+
+    if [[ -d "$1/lib/qt5/qml" ]] || [[ -d "$1/lib/qt5/plugins" ]] || [[ -d "$1/lib/qt5/imports" ]]; then
+        propagatedUserEnvPkgs+=" $1"
+    fi
+}
+
+qtOut=""
+if [[ -z $qtSubmodule ]]; then
+    qtOut="$PWD/qmake-$name"
+else
+    qtOut=$out
+fi
+
+mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib"
+
+cp "@out@/bin/qmake" "$qtOut/bin"
+cat >"$qtOut/bin/qt.conf" <<EOF
+[Paths]
+Prefix = $qtOut
+Plugins = $qtOut/lib/qt5/plugins
+Imports = $qtOut/lib/qt5/imports
+Qml2Imports = $qtOut/lib/qt5/qml
+EOF
+
+envHooks+=(addQtModule)

pkgs/top-level/all-packages.nix

@@ -5937,12 +5937,11 @@ let
     automake = automake111x;
   };
 
-  kf55 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.5 {
-    stdenv = overrideCC stdenv gccStdInc;
+  kf57 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.7 {
+    qt5 = qt54;
   });
-  kf56 = recurseIntoAttrs (callPackage ../development/libraries/kde-frameworks-5.6 {});
-  kf5_latest = kf56;
-  kf5_stable = kf55;
+  kf5_latest = kf57;
+  kf5_stable = kf57;
 
   krb5 = callPackage ../development/libraries/kerberos/krb5.nix {
     openldap = openldap.override {
@@ -6075,7 +6074,9 @@ let
   };
 
   libdbusmenu_qt = callPackage ../development/libraries/libdbusmenu-qt { };
-  libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix {};
+  libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt5.nix {
+    qt5 = qt54;
+  };
 
   libdc1394 = callPackage ../development/libraries/libdc1394 { };
 
@@ -6971,10 +6972,16 @@ let
 
   phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
 
-  phonon_qt5 = callPackage ../development/libraries/phonon/qt5 {};
+  phonon_qt5 = callPackage ../development/libraries/phonon/qt5 {
+    qt5 = qt54;
+  };
 
-  phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 {};
-  phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {};
+  phonon_qt5_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 {
+    qt5 = qt54;
+  };
+  phonon_qt5_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 {
+    qt5 = qt54;
+  };
 
   physfs = callPackage ../development/libraries/physfs { };
 
@@ -6999,15 +7006,15 @@ let
   };
 
   polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 {
-    inherit qt5;
     withQt5 = true;
+    qt5 = qt54;
   };
 
   policykit = callPackage ../development/libraries/policykit { };
 
   poppler = callPackage ../development/libraries/poppler { lcms = lcms2; };
   popplerQt4 = poppler.poppler_qt4;
-  popplerQt5 = poppler.poppler_qt5;
+  poppler_qt5 = poppler.poppler_qt5;
 
   popt = callPackage ../development/libraries/popt { };
 
@@ -7087,7 +7094,7 @@ let
     bison = bison2; # error: too few arguments to function 'int yylex(...
   };
 
-  qt5split = callPackage ../development/libraries/qt-5/5.3-submodules {};
+  qt54 = callPackage ../development/libraries/qt-5/5.4 {};
 
   qt5Full = appendToName "full" (qt5.override {
     buildDocs = true;
@@ -9451,6 +9458,8 @@ let
 
   miscfiles = callPackage ../data/misc/miscfiles { };
 
+  media-player-info = callPackage ../data/misc/media-player-info {};
+
   mobile_broadband_provider_info = callPackage ../data/misc/mobile-broadband-provider-info { };
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };
@@ -10601,11 +10610,11 @@ let
   };
 
   kdeApps_14_12 = recurseIntoAttrs (callPackage ../applications/kde-apps-14.12 {
-    kf5 = kf55;
-    stdenv = overrideCC stdenv gccStdInc;
+    kf5 = kf57;
+    qt5 = qt54;
   });
-  kdeApps_latest = kdeApps_14_12;
   kdeApps_stable = kdeApps_14_12;
+  kdeApps_latest = kdeApps_14_12;
 
   keepnote = callPackage ../applications/office/keepnote {
     pygtk = pyGtkGlade;
@@ -11178,7 +11187,7 @@ let
     client = false;
     withKDE = false;
     useQt5 = true;
-    qt = qt5;
+    qt = qt54;
     dconf = gnome3.dconf;
     tag = "-qt5";
   };
@@ -11719,6 +11728,12 @@ let
     ffmpeg = ffmpeg_2_2;
   };
 
+  vlc_qt5 = vlc.override {
+    qt4 = null;
+    qt5 = qt54;
+    withQt5 = true;
+  };
+
   vmpk = callPackage ../applications/audio/vmpk { };
 
   vnstat = callPackage ../applications/networking/vnstat { };
@@ -12739,14 +12754,14 @@ let
 
   mate-themes = callPackage ../misc/themes/mate-themes { };
 
-  plasma51 = recurseIntoAttrs (callPackage ../desktops/plasma-5.1 {
-    stdenv = overrideCC stdenv gccStdInc;
+  plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {
+    qt5 = qt54;
+    kf5 = kf57;
   });
-  plasma52 = recurseIntoAttrs (callPackage ../desktops/plasma-5.2 {});
   plasma5_latest = plasma52;
-  plasma5_stable = plasma51;
+  plasma5_stable = plasma52;
 
-  kde5 = kf55 // plasma51 // kdeApps_14_12;
+  kde5 = kf5_stable // plasma5_stable // kdeApps_stable;
 
   xfce = xfce4_10;
   xfce4_10 = recurseIntoAttrs (import ../desktops/xfce { inherit config pkgs newScope; });