kde5: move files around to simplify merge

It is analogous to 98d8e1a160d3.

177 files changed, 11 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index 74de941b768..dba957f7662 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 36a1ca7cfbd..36a1ca7cfbd 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 a24928160df..a24928160df 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 15982cb5d64..15982cb5d64 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 72a08c73261..72a08c73261 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 3218146f510..3218146f510 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 93da9d332f7..93da9d332f7 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 53e9d807d64..53e9d807d64 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/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
index ac14573dcaa..ac14573dcaa 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 732ac11e96d..732ac11e96d 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 91eeb2314a4..91eeb2314a4 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/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
index 2f1fdc1d643..2f1fdc1d643 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 e83794c60d8..e83794c60d8 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 772ebe37e44..772ebe37e44 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 520bad0d066..520bad0d066 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 b7d7300e9a8..b7d7300e9a8 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 ff0306ea148..ff0306ea148 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 a79d7b2b7d1..a79d7b2b7d1 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 389362deecc..389362deecc 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 e0a75dc8acd..e0a75dc8acd 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 4e99a43b391..4e99a43b391 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 3ee92519718..3ee92519718 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 77b42f1fc58..77b42f1fc58 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 4b4cba2a377..4b4cba2a377 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 a0605e3bd55..a0605e3bd55 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 319c7fc6583..319c7fc6583 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 afb1ac83653..afb1ac83653 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 c23cd8578fb..c23cd8578fb 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 0691325d7a5..0691325d7a5 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 b4eab372789..b4eab372789 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 849334fb736..849334fb736 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 cd123f49f76..cd123f49f76 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 98721876c12..98721876c12 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 38c41d9271d..38c41d9271d 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 f981b0516f7..f981b0516f7 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 44cc99daf26..44cc99daf26 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 bb96048d6ff..bb96048d6ff 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/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
index 1c2ea70442d..1c2ea70442d 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/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
index a74340a6dc9..a74340a6dc9 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
index b4569e50a5f..b4569e50a5f 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
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 56ed09f4ea5..56ed09f4ea5 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 7937e6f8bed..7937e6f8bed 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 26987c385ad..26987c385ad 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 3225098f439..3225098f439 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 647be8f052c..647be8f052c 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 a8d9a0003c3..a8d9a0003c3 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/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
index c66f5ecd008..c66f5ecd008 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
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 1352d8c5821..1352d8c5821 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/series b/pkgs/desktops/kde-5/frameworks-5.19/kauth/series
index d2689425c38..d2689425c38 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kauth/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
index 1a469ab4db6..1a469ab4db6 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 0d861fa9501..0d861fa9501 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 dbbb783ac61..dbbb783ac61 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 53a69a69b69..53a69a69b69 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 e393774f16a..e393774f16a 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 e132afe5988..e132afe5988 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 7a6c0ee9053..7a6c0ee9053 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 0e14d06edd3..0e14d06edd3 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 f3a1db7bd48..f3a1db7bd48 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 bbab78ccb40..bbab78ccb40 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 d2ceab31d14..d2ceab31d14 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 74d107466cf..74d107466cf 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 47ae2d68c68..47ae2d68c68 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/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
index 843db83a99b..843db83a99b 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
index eabb7025448..eabb7025448 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
index 9b08ab20877..9b08ab20877 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
index 21ac2e83b5d..21ac2e83b5d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
index cbc114ccca0..cbc114ccca0 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 364fbd6a720..364fbd6a720 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 d361313d1d4..d361313d1d4 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 f00432b0c9c..f00432b0c9c 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 f67c19f4239..f67c19f4239 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 4e3a33efab3..4e3a33efab3 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/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
index d165f84e3a2..d165f84e3a2 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/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
index 732f7b69c82..732f7b69c82 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
index 9bb4831cf8d..9bb4831cf8d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
index d2689425c38..d2689425c38 100644
--- a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
index c535b3590a3..c535b3590a3 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 bc4e9ab1184..bc4e9ab1184 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 d40df466ebb..d40df466ebb 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 268006512e7..268006512e7 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 5b3b15d5d5b..5b3b15d5d5b 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 b78b25582be..b78b25582be 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 ab5cc8a3edb..ab5cc8a3edb 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 fc086560023..fc086560023 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 49d66bbcc2c..49d66bbcc2c 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 9c76079a382..9c76079a382 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 5f644d7c424..5f644d7c424 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 a2131ff3385..a2131ff3385 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 c9ad46b41bb..c9ad46b41bb 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 77ca1545004..77ca1545004 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 a9024d771cc..a9024d771cc 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 931019ce495..931019ce495 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 746edf12eea..746edf12eea 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 768720f178c..768720f178c 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 22eef2d47bd..22eef2d47bd 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 460458b2232..460458b2232 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 5bcd6f30146..5bcd6f30146 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 7e301dd0f26..7e301dd0f26 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 dd99d2d4f1e..dd99d2d4f1e 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 e9d74444814..e9d74444814 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 aea1b0d31a0..aea1b0d31a0 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 ddbf17d0006..ddbf17d0006 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 9b7f076efc7..9b7f076efc7 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 1c3e0b2cbc5..1c3e0b2cbc5 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 4c3877e7efd..4c3877e7efd 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 c16f51b5ac3..c16f51b5ac3 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 2e34e6f674c..2e34e6f674c 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 7c6f079feaa..7c6f079feaa 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 12d2b54d0eb..12d2b54d0eb 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 3d8397d8ee2..3d8397d8ee2 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 685c6852611..685c6852611 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 3a27d85b916..3a27d85b916 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/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
index b8df6a5f4c0..b8df6a5f4c0 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 19ab1e1e551..19ab1e1e551 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 46cd23829a2..46cd23829a2 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 e332d4ff9a8..e332d4ff9a8 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 3cf0f847d83..3cf0f847d83 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 5ade5f63a8d..5ade5f63a8d 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 d95f44d3fec..d95f44d3fec 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 09ab1f2200d..09ab1f2200d 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 f081d5f9170..f081d5f9170 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 20a300b68bc..20a300b68bc 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 7d7f769d6a9..7d7f769d6a9 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 333378bd143..333378bd143 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 ee350f8e153..ee350f8e153 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 d8846f77723..d8846f77723 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 afd125e3c59..afd125e3c59 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 943fe04a1c9..943fe04a1c9 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 b86c0b71224..b86c0b71224 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 52817921cc7..52817921cc7 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 6596c246202..6596c246202 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 179f15dc876..179f15dc876 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 f8092bc9d37..f8092bc9d37 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 63ade168805..63ade168805 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 384fa6f6d27..384fa6f6d27 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 714e0fc7509..714e0fc7509 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 7f19af6959e..7f19af6959e 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 759eda4cc13..759eda4cc13 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 ab8867520b3..ab8867520b3 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 eb65f7f90af..eb65f7f90af 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 d6a96a3276d..d6a96a3276d 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 965c33e6eef..965c33e6eef 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 6ba860b9dfb..6ba860b9dfb 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 141320e6b3e..141320e6b3e 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 ed717790cd0..ed717790cd0 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 3834ca1328f..3834ca1328f 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 a521a799362..a521a799362 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 562797b546e..562797b546e 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 f274512e027..f274512e027 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 d47f9215a41..d47f9215a41 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 e4d6eb631f9..e4d6eb631f9 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 797a32fc5f8..797a32fc5f8 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 2e86068b486..2e86068b486 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 a6ed9d9bb28..a6ed9d9bb28 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 9fccbd6834c..9fccbd6834c 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 fbbb11ae755..fbbb11ae755 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 373221b2b30..373221b2b30 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 760de2d79ab..760de2d79ab 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 02918100408..02918100408 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 ead7452daa8..ead7452daa8 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 17b01486d92..17b01486d92 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 aba97b032f8..aba97b032f8 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 5f27efc7f24..5f27efc7f24 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 7088f45d64e..7088f45d64e 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 79b5cfb437e..79b5cfb437e 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 249c6d8aac9..249c6d8aac9 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 ff56d1199b1..ff56d1199b1 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 bc87abcad15..bc87abcad15 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 01c5c63ce0a..01c5c63ce0a 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 1d34001be59..1d34001be59 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 88b54af793e..88b54af793e 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 17c0ccf0ca9..17c0ccf0ca9 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 3fc3a441ac3..3fc3a441ac3 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 475e8878206..475e8878206 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/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
index 3b63c864045..3b63c864045 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 a921e153dbc..a921e153dbc 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 f7d7c8f03f0..7e3cd07e46f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15015,12 +15015,17 @@ 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);