update various packages to use Qt 5.4

3 files changed, 260 insertions, 146 deletions

diff --git a/pkgs/desktops/plasma-5.2/default.nix b/pkgs/desktops/plasma-5.2/default.nix
index f647d2c553b1..2384d926fc48 100644
--- a/pkgs/desktops/plasma-5.2/default.nix
+++ b/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
+let kf5Orig = kf5; in
 
-  kf5 = kf56.override { inherit debug; };
+let
 
-  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;
diff --git a/pkgs/desktops/plasma-5.2/dependencies.nix b/pkgs/desktops/plasma-5.2/dependencies.nix
index 74e519927d0b..fe0b72c0daa2 100644
--- a/pkgs/desktops/plasma-5.2/dependencies.nix
+++ b/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 = [  ];
diff --git a/pkgs/desktops/plasma-5.2/manifest.nix b/pkgs/desktops/plasma-5.2/manifest.nix
index 5eb5d3ff78f7..23bfa7867bee 100644
--- a/pkgs/desktops/plasma-5.2/manifest.nix
+++ b/pkgs/desktops/plasma-5.2/manifest.nix
@@ -1,214 +1,328 @@
 # This file is generated automatically. DO NOT EDIT!
-{ mirror }:
+{ stdenv, fetchurl, mirror }:
 [
   {
-    url = "${mirror}/stable/plasma/5.2.0/ksshaskpass-5.2.0.tar.xz";
-    sha256 = "17xjlb1gwxcdxzfadv0brr6ainnw25m681p013na182zigx9f9bv";
-    name = "ksshaskpass-5.2.0.tar.xz";
+    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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kio-extras-5.2.0.tar.xz";
-    sha256 = "1c5qhp6axzbn5mla9q6qk0aalm0n4hvs6c4d9pclbcv58ysv3vw5";
-    name = "kio-extras-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kmenuedit-5.2.0.tar.xz";
-    sha256 = "1qg7dh42lyp6mrckxjz07mmhk589d3wr080vljbm6hkgqm3aq7zr";
-    name = "kmenuedit-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/libbluedevil-5.2.0.tar.xz";
-    sha256 = "0s06kn9aqkyyfj1n6cb2hhnnqymwzljavfwj0f88mrkjrdf65bq9";
-    name = "libbluedevil-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/libkscreen-5.2.0.tar.xz";
-    sha256 = "1v75qi7b0m8fqdj5b38ypwgp1djkg408a4csn57y3pjgp7k69k53";
-    name = "libkscreen-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";
+    };
   }
   {
-    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";
+    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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kdeplasma-addons-5.2.0.tar.xz";
-    sha256 = "168bl9g1s9piy0bwrx7f8pbvn3jamw1rp90rihydamm3s54p1ykw";
-    name = "kdeplasma-addons-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/plasma-desktop-5.2.0.tar.xz";
-    sha256 = "0xld7kxa8p78kw5f1a75nc0n69jn6vfp8nm40qqdhy2y3m5cc8p9";
-    name = "plasma-desktop-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/systemsettings-5.2.0.tar.xz";
-    sha256 = "0yk1zn0kkjb9rcmqa2n10igcnk2fm06gfn7fgb4mcb2vjvv7a8y0";
-    name = "systemsettings-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";
+    };
   }
   {
-    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";
+    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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/milou-5.2.0.tar.xz";
-    sha256 = "02gd7012zbiaxhb6wliapfcb4spjrdgnhvhl3y64ixqrx2b032a5";
-    name = "milou-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kinfocenter-5.2.0.tar.xz";
-    sha256 = "151flq4w6m94jgfrzbf3w3v11xybx92xd0nv0bdh5vvaxg97dac9";
-    name = "kinfocenter-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kdecoration-5.2.0.tar.xz";
-    sha256 = "135i1maqp0q9aa312l0dqfkmxjq12mri2zjwg03wzgmmy5b9wm52";
-    name = "kdecoration-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";
+    };
   }
   {
-    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";
+    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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kscreen-5.2.0.tar.xz";
-    sha256 = "09f77vszpni93ahm31gsb7lg4lidchppa1kd9s8q98yf2rb9hl55";
-    name = "kscreen-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";
+    };
   }
   {
-    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";
+    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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/sddm-kcm-5.2.0.tar.xz";
-    sha256 = "0ds4qlgwzbpa32w3mlhf64p64n1jifm6797v6jb5v3qjnamlpk96";
-    name = "sddm-kcm-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/libksysguard-5.2.0.tar.xz";
-    sha256 = "0jfyy90zdajpxy5yy9w14n8r8jx7d6bdwss7h8rrkp5zljp9nzwp";
-    name = "libksysguard-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/oxygen-5.2.0.tar.xz";
-    sha256 = "1wad5m36h31y99v4gwx19n3k14xxc0hvp9c4n3g67fyy8pjnr0ax";
-    name = "oxygen-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/khelpcenter-5.2.0.tar.xz";
-    sha256 = "1a5z2bvxjdwp81jnyrdf7q591k6ql504argl7lg3pbvph08rc0rs";
-    name = "khelpcenter-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/baloo-5.6.0.tar.xz";
-    sha256 = "1py0npkf8s46zwbg23cn49f777fc9cid1njg8crc8h71md71j614";
-    name = "baloo-5.6.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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/plasma-workspace-5.2.0.tar.xz";
-    sha256 = "1swii172mv32837kgcxnmafs1blpgpdn6hda07f1aanaz4scxvj3";
-    name = "plasma-workspace-5.2.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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kwrited-5.2.0.tar.xz";
-    sha256 = "0rg1ml7m6f2kql4qi9pg8dd66hr7rxqgyjg3rs66diibz383cjzb";
-    name = "kwrited-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/libmm-qt-5.2.0.tar.xz";
-    sha256 = "07flvspy3qs2mhjxnwy3l8giw296p3501ad1hr3bnjidm2iykc6s";
-    name = "libmm-qt-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/plasma-nm-5.2.0.tar.xz";
-    sha256 = "0br2mqx8g660jcs1hiwssg6fdiddn4zk78kdmcgkpq93y5ysdf5c";
-    name = "plasma-nm-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kwayland-5.2.0.tar.xz";
-    sha256 = "1w872ask0w9gbw46dx3si124gmzkapj7naysgrb5zdcdf8avcgqy";
-    name = "kwayland-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/ksysguard-5.2.0.tar.xz";
-    sha256 = "0kd103kzxgsgrrhfjacy50gg6wsvqa9ix9xk5nb59bbdzj0b4km1";
-    name = "ksysguard-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kfilemetadata-5.6.0.tar.xz";
-    sha256 = "0vg9lc6d2q6bx53lixcmdhfgwqqr3hfl6g3pvgss237kd3fbb94n";
-    name = "kfilemetadata-5.6.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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/bluedevil-5.2.0.tar.xz";
-    sha256 = "01a3h0jp9nq9fs1zv4wp7jgmpv4nscflb3nkz93dg0g1bis1kgnh";
-    name = "bluedevil-5.2.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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/breeze-5.2.0.tar.xz";
-    sha256 = "1s8381nhszb2d7b0r6rmngnkgw28xxsfhnginbcb6zkljgprnkkh";
-    name = "breeze-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/oxygen-fonts-5.2.0.tar.xz";
-    sha256 = "102hycnk4naysmyj87mv1sm41aq214f3wjzzi429r0i135wdblki";
-    name = "oxygen-fonts-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/powerdevil-5.2.0.tar.xz";
-    sha256 = "1mi60xn4pgwrq4w3i45gxqjqqfwjxzkkyx89fkwwj1xv68bkwshs";
-    name = "powerdevil-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/muon-5.2.0.tar.xz";
-    sha256 = "15vcrm7y5khpc0rngzqbhizg2w0rz6adf5v3cpwafmqaq3iqlcb7";
-    name = "muon-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/khotkeys-5.2.0.tar.xz";
-    sha256 = "187757g70wjq1v9r7nf3fxc6233sb5m28s4aswlm7rjvys5lmkch";
-    name = "khotkeys-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";
+    };
   }
   {
-    url = "${mirror}/stable/plasma/5.2.0/kwin-5.2.0.tar.xz";
-    sha256 = "0ys76xllgr2034bxpr5m1qm5v8qp8wnzn09f6gghcvnm3lqki79q";
-    name = "kwin-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";
+    };
   }
 ]