175 files changed, 21 insertions, 13 deletions

diff --git a/.gitignore b/.gitignore
index 74de941b7685..dba957f76620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,5 @@ result-*
 
 .DS_Store
 
-/pkgs/applications/kde-apps-*/tmp/
-/pkgs/development/libraries/kde-frameworks-*/tmp/
 /pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/plasma-*/tmp/
\ No newline at end of file
+/pkgs/desktops/kde-5/*/tmp/
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.12/ark.nix b/pkgs/desktops/kde-5/applications-15.12/ark.nix
index 36a1ca7cfbd7..36a1ca7cfbd7 100644
--- a/pkgs/applications/kde-apps-15.12/ark.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/ark.nix
diff --git a/pkgs/applications/kde-apps-15.12/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
index a24928160df1..a24928160df1 100644
--- a/pkgs/applications/kde-apps-15.12/baloo-widgets.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/desktops/kde-5/applications-15.12/default.nix
index 5db80b45b8f5..5db80b45b8f5 100644
--- a/pkgs/applications/kde-apps-15.12/default.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
index 72a08c732614..72a08c732614 100644
--- a/pkgs/applications/kde-apps-15.12/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
index 3218146f510e..3218146f510e 100644
--- a/pkgs/applications/kde-apps-15.12/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
index 93da9d332f7c..93da9d332f7c 100755
--- a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh
+++ b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
diff --git a/pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
index 53e9d807d647..53e9d807d647 100644
--- a/pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
diff --git a/pkgs/applications/kde-apps-15.12/filelight.nix b/pkgs/desktops/kde-5/applications-15.12/filelight.nix
index df5e097a540e..df5e097a540e 100644
--- a/pkgs/applications/kde-apps-15.12/filelight.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/filelight.nix
diff --git a/pkgs/applications/kde-apps-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
index ac14573dcaa3..ac14573dcaa3 100644
--- a/pkgs/applications/kde-apps-15.12/gpgmepp.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
diff --git a/pkgs/applications/kde-apps-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
index 732ac11e96d0..732ac11e96d0 100644
--- a/pkgs/applications/kde-apps-15.12/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
diff --git a/pkgs/applications/kde-apps-15.12/kate.nix b/pkgs/desktops/kde-5/applications-15.12/kate.nix
index 91eeb2314a4c..91eeb2314a4c 100644
--- a/pkgs/applications/kde-apps-15.12/kate.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kate.nix
diff --git a/pkgs/applications/kde-apps-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
index a1f0316825da..a1f0316825da 100644
--- a/pkgs/applications/kde-apps-15.12/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
index 242f3d9c793d..242f3d9c793d 100644
--- a/pkgs/applications/kde-apps-15.12/kde-app.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
index 4b612ee3e3c2..4b612ee3e3c2 100644
--- a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
index 522fc542aeb2..522fc542aeb2 100644
--- a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
index 520bad0d066a..520bad0d066a 100644
--- a/pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
index b7d7300e9a84..b7d7300e9a84 100644
--- a/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
index ff0306ea1488..ff0306ea1488 100644
--- a/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
index a79d7b2b7d16..a79d7b2b7d16 100644
--- a/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
index a30b19774f2a..a30b19774f2a 100644
--- a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
index e0a75dc8acd0..e0a75dc8acd0 100644
--- a/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh
+++ b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
index 4e99a43b3913..4e99a43b3913 100644
--- a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
diff --git a/pkgs/applications/kde-apps-15.12/kgpg.nix b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
index 3ee925197189..3ee925197189 100644
--- a/pkgs/applications/kde-apps-15.12/kgpg.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
index 77b42f1fc586..77b42f1fc586 100644
--- a/pkgs/applications/kde-apps-15.12/kio-extras.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
diff --git a/pkgs/applications/kde-apps-15.12/konsole.nix b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
index 4b4cba2a3779..4b4cba2a3779 100644
--- a/pkgs/applications/kde-apps-15.12/konsole.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
diff --git a/pkgs/applications/kde-apps-15.12/l10n.nix b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
index a0605e3bd55d..a0605e3bd55d 100644
--- a/pkgs/applications/kde-apps-15.12/l10n.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkdcraw.nix b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
index 319c7fc6583d..319c7fc6583d 100644
--- a/pkgs/applications/kde-apps-15.12/libkdcraw.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkexiv2.nix b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
index afb1ac836537..afb1ac836537 100644
--- a/pkgs/applications/kde-apps-15.12/libkexiv2.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkipi.nix b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
index c23cd8578fb9..c23cd8578fb9 100644
--- a/pkgs/applications/kde-apps-15.12/libkipi.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
diff --git a/pkgs/applications/kde-apps-15.12/okular.nix b/pkgs/desktops/kde-5/applications-15.12/okular.nix
index 0691325d7a52..0691325d7a52 100644
--- a/pkgs/applications/kde-apps-15.12/okular.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/okular.nix
diff --git a/pkgs/applications/kde-apps-15.12/print-manager.nix b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
index b4eab372789d..b4eab372789d 100644
--- a/pkgs/applications/kde-apps-15.12/print-manager.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
diff --git a/pkgs/applications/kde-apps-15.12/spectacle.nix b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
index 849334fb7364..849334fb7364 100644
--- a/pkgs/applications/kde-apps-15.12/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
index cd123f49f76b..cd123f49f76b 100644
--- a/pkgs/applications/kde-apps-15.12/srcs.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
index 98721876c120..98721876c120 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
index 38c41d9271d8..38c41d9271d8 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
index f981b0516f72..f981b0516f72 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
index 879262c56a41..879262c56a41 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/default.nix
index cd314e27cacb..cd314e27cacb 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
index 9717716faf5b..9717716faf5b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
index 4e1b1aff3bd1..4e1b1aff3bd1 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
index a6fa6189240b..a6fa6189240b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
index 7937e6f8bed9..7937e6f8bed9 100755
--- a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
index 26987c385ad5..26987c385ad5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
index 3225098f4398..3225098f4398 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
index 647be8f052c3..647be8f052c3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
index a8d9a0003c3b..a8d9a0003c3b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
index 2b000ff3c041..2b000ff3c041 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
index 340155256f28..340155256f28 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
index 1a469ab4db6d..1a469ab4db6d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
index 0d861fa95012..0d861fa95012 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
index dbbb783ac615..dbbb783ac615 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
index 53a69a69b69c..53a69a69b69c 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
index e393774f16a5..e393774f16a5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
index e132afe59886..e132afe59886 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
index 7a6c0ee90534..7a6c0ee90534 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
index 0e14d06edd36..0e14d06edd36 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
index f3a1db7bd484..f3a1db7bd484 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
index bbab78ccb409..bbab78ccb409 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
index d2ceab31d14b..d2ceab31d14b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
index 74d107466cfc..74d107466cfc 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
index 47ae2d68c68e..47ae2d68c68e 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
index e61c4bb86e7c..e61c4bb86e7c 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
index cbc114ccca03..cbc114ccca03 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
index 364fbd6a720b..364fbd6a720b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
index d361313d1d49..d361313d1d49 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
index f00432b0c9ce..f00432b0c9ce 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
index 138c3fc33b94..138c3fc33b94 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
index 4e3a33efab32..4e3a33efab32 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
index 5cfffbd622d1..5cfffbd622d1 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
index d165f84e3a2d..d165f84e3a2d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
index be99c58d5504..be99c58d5504 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
index c535b3590a38..c535b3590a38 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
index bc4e9ab11843..bc4e9ab11843 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
index d40df466ebbd..d40df466ebbd 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
index 268006512e7c..268006512e7c 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
index 5b3b15d5d5b5..5b3b15d5d5b5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
index b78b25582beb..b78b25582beb 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
index ab5cc8a3edb2..ab5cc8a3edb2 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
index fc0865600239..fc0865600239 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
index 49d66bbcc2c6..49d66bbcc2c6 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
index 9c76079a382a..9c76079a382a 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
index 5f644d7c424e..5f644d7c424e 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
index a2131ff33850..a2131ff33850 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
index c9ad46b41bb7..c9ad46b41bb7 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/desktops/kde-5/frameworks-5.19/kio/series
index 77ca15450047..77ca15450047 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kio/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
index a9024d771cc3..a9024d771cc3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
index 931019ce495d..931019ce495d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
index 746edf12eea0..746edf12eea0 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
index 768720f178c8..768720f178c8 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
index 22eef2d47bde..22eef2d47bde 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
index 460458b22323..460458b22323 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
index 5bcd6f301462..5bcd6f301462 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
index 7e301dd0f268..7e301dd0f268 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
index dd99d2d4f1e5..dd99d2d4f1e5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
index e9d744448148..e9d744448148 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
index aea1b0d31a0d..aea1b0d31a0d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
index ddbf17d00064..ddbf17d00064 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
index 9b7f076efc70..9b7f076efc70 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
index 1c3e0b2cbc51..1c3e0b2cbc51 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
index 4c3877e7efd2..4c3877e7efd2 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
index c16f51b5ac3c..c16f51b5ac3c 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
index 2e34e6f674ce..2e34e6f674ce 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
index 7c6f079feaa7..7c6f079feaa7 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
index 12d2b54d0eb3..12d2b54d0eb3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
index 3d8397d8ee2d..3d8397d8ee2d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
index 685c68526119..685c68526119 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
index 03b7c7c2f51d..03b7c7c2f51d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
index c28e862ff8ae..c28e862ff8ae 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
index b8df6a5f4c0d..b8df6a5f4c0d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
index 19ab1e1e5513..19ab1e1e5513 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
index 46cd23829a2f..46cd23829a2f 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
index e332d4ff9a83..e332d4ff9a83 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
index 3cf0f847d83d..3cf0f847d83d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
index 46e3cb37d112..46e3cb37d112 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
index d95f44d3fecf..d95f44d3fecf 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
index 09ab1f2200de..09ab1f2200de 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
index f081d5f9170e..f081d5f9170e 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
index 20a300b68bc8..20a300b68bc8 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
index 7d7f769d6a9b..7d7f769d6a9b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
index 333378bd1431..333378bd1431 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
index ee350f8e1536..ee350f8e1536 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
index d8846f777231..d8846f777231 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
index afd125e3c597..afd125e3c597 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
index 943fe04a1c92..943fe04a1c92 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
index b86c0b71224d..b86c0b71224d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
index 52817921cc72..52817921cc72 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
index 6596c246202f..6596c246202f 100644
--- a/pkgs/desktops/plasma-5.5/bluedevil.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
index 179f15dc8763..179f15dc8763 100644
--- a/pkgs/desktops/plasma-5.5/breeze-gtk.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
index f8092bc9d376..f8092bc9d376 100644
--- a/pkgs/desktops/plasma-5.5/breeze-qt4.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
index 63ade168805d..63ade168805d 100644
--- a/pkgs/desktops/plasma-5.5/breeze-qt5.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix
index c9fcbdd8e6a0..c9fcbdd8e6a0 100644
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/default.nix
diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
index 714e0fc75097..714e0fc75097 100755
--- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh
+++ b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
diff --git a/pkgs/desktops/plasma-5.5/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
index 7f19af6959ec..7f19af6959ec 100644
--- a/pkgs/desktops/plasma-5.5/kde-cli-tools.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
index 759eda4cc134..759eda4cc134 100644
--- a/pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
index 6b41599994d5..6b41599994d5 100644
--- a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
index eb65f7f90afb..eb65f7f90afb 100644
--- a/pkgs/desktops/plasma-5.5/kdecoration.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
diff --git a/pkgs/desktops/plasma-5.5/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
index d6a96a3276d7..d6a96a3276d7 100644
--- a/pkgs/desktops/plasma-5.5/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/plasma-5.5/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
index 965c33e6eef8..965c33e6eef8 100644
--- a/pkgs/desktops/plasma-5.5/kgamma5.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
diff --git a/pkgs/desktops/plasma-5.5/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
index 6ba860b9dfb2..6ba860b9dfb2 100644
--- a/pkgs/desktops/plasma-5.5/khelpcenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
diff --git a/pkgs/desktops/plasma-5.5/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
index 141320e6b3e6..141320e6b3e6 100644
--- a/pkgs/desktops/plasma-5.5/khotkeys.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
diff --git a/pkgs/desktops/plasma-5.5/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
index ed717790cd0d..ed717790cd0d 100644
--- a/pkgs/desktops/plasma-5.5/kinfocenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
diff --git a/pkgs/desktops/plasma-5.5/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
index 3834ca1328f8..3834ca1328f8 100644
--- a/pkgs/desktops/plasma-5.5/kmenuedit.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
index 2cfd0df2e1d3..2cfd0df2e1d3 100644
--- a/pkgs/desktops/plasma-5.5/kscreen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
index 562797b546e9..562797b546e9 100644
--- a/pkgs/desktops/plasma-5.5/kscreenlocker.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
diff --git a/pkgs/desktops/plasma-5.5/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
index f274512e027a..f274512e027a 100644
--- a/pkgs/desktops/plasma-5.5/ksshaskpass.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
diff --git a/pkgs/desktops/plasma-5.5/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
index d47f9215a41a..d47f9215a41a 100644
--- a/pkgs/desktops/plasma-5.5/ksysguard.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
diff --git a/pkgs/desktops/plasma-5.5/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
index e4d6eb631f95..e4d6eb631f95 100644
--- a/pkgs/desktops/plasma-5.5/kwayland.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
diff --git a/pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
index 797a32fc5f83..797a32fc5f83 100644
--- a/pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
index 2e86068b486f..2e86068b486f 100644
--- a/pkgs/desktops/plasma-5.5/kwin/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
index a6ed9d9bb287..a6ed9d9bb287 100644
--- a/pkgs/desktops/plasma-5.5/kwrited.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
diff --git a/pkgs/desktops/plasma-5.5/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
index 9fccbd6834c3..9fccbd6834c3 100644
--- a/pkgs/desktops/plasma-5.5/libkscreen/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
index fbbb11ae7556..fbbb11ae7556 100644
--- a/pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
index 402b3ce3beee..402b3ce3beee 100644
--- a/pkgs/desktops/plasma-5.5/libksysguard/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
diff --git a/pkgs/desktops/plasma-5.5/milou.nix b/pkgs/desktops/kde-5/plasma-5.5/milou.nix
index 760de2d79ab4..760de2d79ab4 100644
--- a/pkgs/desktops/plasma-5.5/milou.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/milou.nix
diff --git a/pkgs/desktops/plasma-5.5/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
index 02918100408a..02918100408a 100644
--- a/pkgs/desktops/plasma-5.5/oxygen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
index ead7452daa84..ead7452daa84 100644
--- a/pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
index 17b01486d928..17b01486d928 100644
--- a/pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
index aba97b032f8a..aba97b032f8a 100644
--- a/pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
index a73060ad1af1..a73060ad1af1 100644
--- a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
index afd8a18bbbd6..afd8a18bbbd6 100644
--- a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
index 79b5cfb437e2..79b5cfb437e2 100644
--- a/pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
index 249c6d8aac94..249c6d8aac94 100644
--- a/pkgs/desktops/plasma-5.5/plasma-nm/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
index ff56d1199b15..ff56d1199b15 100644
--- a/pkgs/desktops/plasma-5.5/plasma-pa.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
index bc87abcad153..bc87abcad153 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
index 2d9364d446eb..2d9364d446eb 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
index 1d34001be597..1d34001be597 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
index 88b54af793e7..88b54af793e7 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/series
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
index 802c92da64d0..802c92da64d0 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
diff --git a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
index 3fc3a441ac34..3fc3a441ac34 100644
--- a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/plasma-5.5/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
index 475e8878206a..475e8878206a 100644
--- a/pkgs/desktops/plasma-5.5/powerdevil.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
diff --git a/pkgs/desktops/plasma-5.5/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
index a8d9b7e0e36f..a8d9b7e0e36f 100644
--- a/pkgs/desktops/plasma-5.5/setup-hook.sh
+++ b/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
index 3b63c864045d..3b63c864045d 100644
--- a/pkgs/desktops/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
diff --git a/pkgs/desktops/plasma-5.5/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
index a921e153dbc2..a921e153dbc2 100644
--- a/pkgs/desktops/plasma-5.5/systemsettings.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 804230e05b09..5b295d1d77ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15188,23 +15188,33 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
   kde5_latest =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);