about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-03-08 08:31:34 +0100
committerVladimír Čunát <vcunat@gmail.com>2016-03-08 09:42:41 +0100
commitf306e67e15bdbe9a8358c9f81319fc4fcbadc2eb (patch)
tree713f81c97b15d54e3daf42fedb9349d72b63b07e
parent4e2fe6e5794a78173f415dfb3d2afa3d499065db (diff)
kde5: move files around to simplify merge
It is analogous to 98d8e1a160d3.
-rw-r--r--.gitignore4
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/ark.nix (renamed from pkgs/applications/kde-apps-15.12/ark.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix (renamed from pkgs/applications/kde-apps-15.12/baloo-widgets.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/default.nix (renamed from pkgs/applications/kde-apps-15.12/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix (renamed from pkgs/applications/kde-apps-15.12/dolphin-plugins.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/dolphin.nix (renamed from pkgs/applications/kde-apps-15.12/dolphin.nix)0
-rwxr-xr-xpkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh (renamed from pkgs/applications/kde-apps-15.12/fetchsrcs.sh)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix (renamed from pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix (renamed from pkgs/applications/kde-apps-15.12/gpgmepp.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/gwenview.nix (renamed from pkgs/applications/kde-apps-15.12/gwenview.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kate.nix (renamed from pkgs/applications/kde-apps-15.12/kate.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kde-app.nix (renamed from pkgs/applications/kde-apps-15.12/kde-app.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix (renamed from pkgs/applications/kde-apps-15.12/kde-locale-4.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix (renamed from pkgs/applications/kde-apps-15.12/kde-locale-5.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix (renamed from pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch (renamed from pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch (renamed from pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch (renamed from pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix (renamed from pkgs/applications/kde-apps-15.12/kdelibs/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh (renamed from pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix (renamed from pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kgpg.nix (renamed from pkgs/applications/kde-apps-15.12/kgpg.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/kio-extras.nix (renamed from pkgs/applications/kde-apps-15.12/kio-extras.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/konsole.nix (renamed from pkgs/applications/kde-apps-15.12/konsole.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/l10n.nix (renamed from pkgs/applications/kde-apps-15.12/l10n.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix (renamed from pkgs/applications/kde-apps-15.12/libkdcraw.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix (renamed from pkgs/applications/kde-apps-15.12/libkexiv2.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/libkipi.nix (renamed from pkgs/applications/kde-apps-15.12/libkipi.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/okular.nix (renamed from pkgs/applications/kde-apps-15.12/okular.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/print-manager.nix (renamed from pkgs/applications/kde-apps-15.12/print-manager.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/spectacle.nix (renamed from pkgs/applications/kde-apps-15.12/spectacle.nix)0
-rw-r--r--pkgs/desktops/kde-5/applications-15.12/srcs.nix (renamed from pkgs/applications/kde-apps-15.12/srcs.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/attica.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/attica.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/baloo.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/baloo.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh (renamed from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh)0
-rwxr-xr-xpkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh (renamed from pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/karchive.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/karchive.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kauth/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/kauth/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kded.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kded.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/khtml.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/khtml.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kio/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/kio/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kjs.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kjs.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kpackage/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/kpackage/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kparts.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kparts.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kpty.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kpty.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kross.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kross.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/krunner.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/krunner.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch (renamed from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series (renamed from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/solid.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/solid.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/srcs.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/srcs.nix)0
-rw-r--r--pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix (renamed from pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix (renamed from pkgs/desktops/plasma-5.5/bluedevil.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix (renamed from pkgs/desktops/plasma-5.5/breeze-gtk.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix (renamed from pkgs/desktops/plasma-5.5/breeze-qt4.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix (renamed from pkgs/desktops/plasma-5.5/breeze-qt5.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/default.nix (renamed from pkgs/desktops/plasma-5.5/default.nix)0
-rwxr-xr-xpkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh (renamed from pkgs/desktops/plasma-5.5/fetchsrcs.sh)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix (renamed from pkgs/desktops/plasma-5.5/kde-cli-tools.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch (renamed from pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix (renamed from pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix (renamed from pkgs/desktops/plasma-5.5/kdecoration.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix (renamed from pkgs/desktops/plasma-5.5/kdeplasma-addons.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix (renamed from pkgs/desktops/plasma-5.5/kgamma5.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix (renamed from pkgs/desktops/plasma-5.5/khelpcenter.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix (renamed from pkgs/desktops/plasma-5.5/khotkeys.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix (renamed from pkgs/desktops/plasma-5.5/kinfocenter.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix (renamed from pkgs/desktops/plasma-5.5/kmenuedit.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kscreen.nix (renamed from pkgs/desktops/plasma-5.5/kscreen.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix (renamed from pkgs/desktops/plasma-5.5/kscreenlocker.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix (renamed from pkgs/desktops/plasma-5.5/ksshaskpass.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix (renamed from pkgs/desktops/plasma-5.5/ksysguard.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kwayland.nix (renamed from pkgs/desktops/plasma-5.5/kwayland.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix (renamed from pkgs/desktops/plasma-5.5/kwin/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/kwrited.nix (renamed from pkgs/desktops/plasma-5.5/kwrited.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix (renamed from pkgs/desktops/plasma-5.5/libkscreen/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix (renamed from pkgs/desktops/plasma-5.5/libksysguard/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/milou.nix (renamed from pkgs/desktops/plasma-5.5/milou.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/oxygen.nix (renamed from pkgs/desktops/plasma-5.5/oxygen.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (renamed from pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch (renamed from pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch (renamed from pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix (renamed from pkgs/desktops/plasma-5.5/plasma-desktop/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix (renamed from pkgs/desktops/plasma-5.5/plasma-mediacenter.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch (renamed from pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix (renamed from pkgs/desktops/plasma-5.5/plasma-nm/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix (renamed from pkgs/desktops/plasma-5.5/plasma-pa.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix (renamed from pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix (renamed from pkgs/desktops/plasma-5.5/plasma-workspace/default.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch (renamed from pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series (renamed from pkgs/desktops/plasma-5.5/plasma-workspace/series)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch (renamed from pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix (renamed from pkgs/desktops/plasma-5.5/polkit-kde-agent.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix (renamed from pkgs/desktops/plasma-5.5/powerdevil.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/srcs.nix (renamed from pkgs/desktops/plasma-5.5/srcs.nix)0
-rw-r--r--pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix (renamed from pkgs/desktops/plasma-5.5/systemsettings.nix)0
-rw-r--r--pkgs/top-level/all-packages.nix15
177 files changed, 11 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 74de941b76855..dba957f766205 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 36a1ca7cfbd71..36a1ca7cfbd71 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 a24928160df17..a24928160df17 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 15982cb5d64cb..15982cb5d64cb 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 72a08c7326143..72a08c7326143 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 3218146f510e9..3218146f510e9 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 93da9d332f7c7..93da9d332f7c7 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 53e9d807d647a..53e9d807d647a 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 ac14573dcaa3f..ac14573dcaa3f 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 732ac11e96d0e..732ac11e96d0e 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 91eeb2314a4c4..91eeb2314a4c4 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 2f1fdc1d643c5..2f1fdc1d643c5 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 e83794c60d818..e83794c60d818 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 772ebe37e44f1..772ebe37e44f1 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 520bad0d066a4..520bad0d066a4 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 b7d7300e9a84d..b7d7300e9a84d 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 ff0306ea1488b..ff0306ea1488b 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 a79d7b2b7d168..a79d7b2b7d168 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 389362deecc61..389362deecc61 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 e0a75dc8acd0d..e0a75dc8acd0d 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 4e99a43b3913a..4e99a43b3913a 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 3ee925197189e..3ee925197189e 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 77b42f1fc5862..77b42f1fc5862 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 4b4cba2a37795..4b4cba2a37795 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 a0605e3bd55db..a0605e3bd55db 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 319c7fc6583d7..319c7fc6583d7 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 afb1ac8365378..afb1ac8365378 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 c23cd8578fb96..c23cd8578fb96 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 0691325d7a52c..0691325d7a52c 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 b4eab372789d6..b4eab372789d6 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 849334fb73643..849334fb73643 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 cd123f49f76bc..cd123f49f76bc 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 98721876c1204..98721876c1204 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 38c41d9271d86..38c41d9271d86 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 f981b0516f720..f981b0516f720 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 44cc99daf261b..44cc99daf261b 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 bb96048d6ff56..bb96048d6ff56 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 1c2ea70442d32..1c2ea70442d32 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 a74340a6dc969..a74340a6dc969 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 b4569e50a5f73..b4569e50a5f73 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 56ed09f4ea59e..56ed09f4ea59e 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 7937e6f8bed92..7937e6f8bed92 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 26987c385ad5d..26987c385ad5d 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 3225098f43980..3225098f43980 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 647be8f052c39..647be8f052c39 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 a8d9a0003c3b8..a8d9a0003c3b8 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 c66f5ecd008f8..c66f5ecd008f8 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 1352d8c5821f5..1352d8c5821f5 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 d2689425c3876..d2689425c3876 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 1a469ab4db6da..1a469ab4db6da 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 0d861fa95012d..0d861fa95012d 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 dbbb783ac6152..dbbb783ac6152 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 53a69a69b69c4..53a69a69b69c4 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 e393774f16a52..e393774f16a52 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 e132afe598866..e132afe598866 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 7a6c0ee90534f..7a6c0ee90534f 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 0e14d06edd367..0e14d06edd367 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 f3a1db7bd4841..f3a1db7bd4841 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 bbab78ccb4090..bbab78ccb4090 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 d2ceab31d14bb..d2ceab31d14bb 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 74d107466cfc4..74d107466cfc4 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 47ae2d68c68e4..47ae2d68c68e4 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 843db83a99b23..843db83a99b23 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 eabb702544830..eabb702544830 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 9b08ab208774a..9b08ab208774a 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 21ac2e83b5dae..21ac2e83b5dae 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 cbc114ccca036..cbc114ccca036 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 364fbd6a720bd..364fbd6a720bd 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 d361313d1d494..d361313d1d494 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 f00432b0c9ce4..f00432b0c9ce4 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 f67c19f42395a..f67c19f42395a 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 4e3a33efab32b..4e3a33efab32b 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 d165f84e3a2dd..d165f84e3a2dd 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 732f7b69c828d..732f7b69c828d 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 9bb4831cf8da2..9bb4831cf8da2 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 d2689425c3876..d2689425c3876 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 c535b3590a388..c535b3590a388 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 bc4e9ab11843a..bc4e9ab11843a 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 d40df466ebbdc..d40df466ebbdc 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 268006512e7c3..268006512e7c3 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 5b3b15d5d5b5b..5b3b15d5d5b5b 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 b78b25582bebd..b78b25582bebd 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 ab5cc8a3edb27..ab5cc8a3edb27 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 fc0865600239f..fc0865600239f 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 49d66bbcc2c64..49d66bbcc2c64 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 9c76079a382a8..9c76079a382a8 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 5f644d7c424e2..5f644d7c424e2 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 a2131ff338505..a2131ff338505 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 c9ad46b41bb76..c9ad46b41bb76 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 77ca154500474..77ca154500474 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 a9024d771cc33..a9024d771cc33 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 931019ce495d7..931019ce495d7 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 746edf12eea03..746edf12eea03 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 768720f178c87..768720f178c87 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 22eef2d47bde6..22eef2d47bde6 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 460458b22323a..460458b22323a 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 5bcd6f3014624..5bcd6f3014624 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 7e301dd0f2683..7e301dd0f2683 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 dd99d2d4f1e57..dd99d2d4f1e57 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 e9d7444481480..e9d7444481480 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 aea1b0d31a0d9..aea1b0d31a0d9 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 ddbf17d00064c..ddbf17d00064c 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 9b7f076efc70e..9b7f076efc70e 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 1c3e0b2cbc519..1c3e0b2cbc519 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 4c3877e7efd2f..4c3877e7efd2f 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 c16f51b5ac3cd..c16f51b5ac3cd 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 2e34e6f674cee..2e34e6f674cee 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 7c6f079feaa7c..7c6f079feaa7c 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 12d2b54d0eb36..12d2b54d0eb36 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 3d8397d8ee2df..3d8397d8ee2df 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 685c685261195..685c685261195 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 3a27d85b9166e..3a27d85b9166e 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 b8df6a5f4c0d4..b8df6a5f4c0d4 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 19ab1e1e55138..19ab1e1e55138 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 46cd23829a2fd..46cd23829a2fd 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 e332d4ff9a832..e332d4ff9a832 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 3cf0f847d83d5..3cf0f847d83d5 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 5ade5f63a8d04..5ade5f63a8d04 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 d95f44d3fecfd..d95f44d3fecfd 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 09ab1f2200de3..09ab1f2200de3 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 f081d5f9170e3..f081d5f9170e3 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 20a300b68bc87..20a300b68bc87 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 7d7f769d6a9be..7d7f769d6a9be 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 333378bd14316..333378bd14316 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 ee350f8e15367..ee350f8e15367 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 d8846f7772318..d8846f7772318 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 afd125e3c5973..afd125e3c5973 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 943fe04a1c92c..943fe04a1c92c 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 b86c0b71224d6..b86c0b71224d6 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 52817921cc723..52817921cc723 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 6596c246202f0..6596c246202f0 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 179f15dc87633..179f15dc87633 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 f8092bc9d376c..f8092bc9d376c 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 63ade168805d4..63ade168805d4 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 384fa6f6d272f..384fa6f6d272f 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 714e0fc750972..714e0fc750972 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 7f19af6959ec2..7f19af6959ec2 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 759eda4cc134c..759eda4cc134c 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 ab8867520b380..ab8867520b380 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 eb65f7f90afbe..eb65f7f90afbe 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 d6a96a3276d75..d6a96a3276d75 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 965c33e6eef8d..965c33e6eef8d 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 6ba860b9dfb26..6ba860b9dfb26 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 141320e6b3e69..141320e6b3e69 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 ed717790cd0d8..ed717790cd0d8 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 3834ca1328f89..3834ca1328f89 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 a521a79936281..a521a79936281 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 562797b546e9b..562797b546e9b 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 f274512e027a1..f274512e027a1 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 d47f9215a41ab..d47f9215a41ab 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 e4d6eb631f957..e4d6eb631f957 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 797a32fc5f83a..797a32fc5f83a 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 2e86068b486fe..2e86068b486fe 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 a6ed9d9bb2877..a6ed9d9bb2877 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 9fccbd6834c3e..9fccbd6834c3e 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 fbbb11ae7556b..fbbb11ae7556b 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 373221b2b3052..373221b2b3052 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 760de2d79ab4e..760de2d79ab4e 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 02918100408ac..02918100408ac 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 ead7452daa84d..ead7452daa84d 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 17b01486d9289..17b01486d9289 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 aba97b032f8a7..aba97b032f8a7 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 5f27efc7f24ca..5f27efc7f24ca 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 7088f45d64e29..7088f45d64e29 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 79b5cfb437e26..79b5cfb437e26 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 249c6d8aac942..249c6d8aac942 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 ff56d1199b152..ff56d1199b152 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 bc87abcad153f..bc87abcad153f 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 01c5c63ce0aa8..01c5c63ce0aa8 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 1d34001be597d..1d34001be597d 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 88b54af793e72..88b54af793e72 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 17c0ccf0ca93f..17c0ccf0ca93f 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 3fc3a441ac344..3fc3a441ac344 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 475e8878206ad..475e8878206ad 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 3b63c864045df..3b63c864045df 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 a921e153dbc2d..a921e153dbc2d 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 f7d7c8f03f0bc..7e3cd07e46fce 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);