From 98d8e1a160d3138e9ef3a51f727b04315ab9e285 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Tue, 1 Mar 2016 10:36:00 -0600 Subject: [PATCH] kde5: consolidate packages into desktops/kde-5 --- .gitignore | 4 +-- .../kde-5/applications-15.12}/ark.nix | 0 .../applications-15.12}/baloo-widgets.nix | 0 .../kde-5/applications-15.12}/default.nix | 0 .../applications-15.12}/dolphin-plugins.nix | 0 .../kde-5/applications-15.12}/dolphin.nix | 0 .../kde-5/applications-15.12}/fetchsrcs.sh | 0 .../applications-15.12}/ffmpegthumbs.nix | 0 .../kde-5/applications-15.12}/filelight.nix | 0 .../kde-5/applications-15.12}/gpgmepp.nix | 0 .../kde-5/applications-15.12}/gwenview.nix | 0 .../kde-5/applications-15.12}/kate.nix | 0 .../kde-5/applications-15.12}/kcalc.nix | 0 .../kde-5/applications-15.12}/kde-app.nix | 0 .../applications-15.12}/kde-locale-4.nix | 0 .../applications-15.12}/kde-locale-5.nix | 0 .../kdegraphics-thumbnailers.nix | 0 .../0001-old-kde4-cmake-policies.patch | 0 .../kdelibs/0002-polkit-install-path.patch | 0 .../kdelibs/0003-remove_xdg_impurities.patch | 0 .../applications-15.12}/kdelibs/default.nix | 0 .../applications-15.12}/kdelibs/setup-hook.sh | 0 .../kdenetwork-filesharing.nix | 0 .../kde-5/applications-15.12}/kgpg.nix | 0 .../kde-5/applications-15.12}/kio-extras.nix | 0 .../kde-5/applications-15.12}/konsole.nix | 0 .../kde-5/applications-15.12}/l10n.nix | 0 .../kde-5/applications-15.12}/libkdcraw.nix | 0 .../kde-5/applications-15.12}/libkexiv2.nix | 0 .../kde-5/applications-15.12}/libkipi.nix | 0 .../kde-5/applications-15.12}/okular.nix | 0 .../applications-15.12}/print-manager.nix | 0 .../kde-5/applications-15.12}/spectacle.nix | 0 .../kde-5/applications-15.12}/srcs.nix | 0 .../kde-5/frameworks-5.19}/attica.nix | 0 .../kde-5/frameworks-5.19}/baloo.nix | 0 .../kde-5/frameworks-5.19}/bluez-qt.nix | 0 .../kde-5/frameworks-5.19}/breeze-icons.nix | 0 .../kde-5/frameworks-5.19}/default.nix | 0 .../0001-extra-cmake-modules-paths.patch | 0 .../extra-cmake-modules/default.nix | 0 .../extra-cmake-modules/setup-hook.sh | 0 .../kde-5/frameworks-5.19}/fetchsrcs.sh | 0 .../frameworks-5.19}/frameworkintegration.nix | 0 .../kde-5/frameworks-5.19}/kactivities.nix | 0 .../kde-5/frameworks-5.19}/kapidox.nix | 0 .../kde-5/frameworks-5.19}/karchive.nix | 0 .../kde-5/frameworks-5.19}/kauth/default.nix | 0 .../kauth/kauth-policy-install.patch | 0 .../kde-5/frameworks-5.19}/kbookmarks.nix | 0 .../0001-qdiriterator-follow-symlinks.patch | 0 .../frameworks-5.19}/kcmutils/default.nix | 0 .../kde-5/frameworks-5.19}/kcodecs.nix | 0 .../kde-5/frameworks-5.19}/kcompletion.nix | 0 .../kde-5/frameworks-5.19}/kconfig.nix | 0 .../0001-qdiriterator-follow-symlinks.patch | 0 .../kconfigwidgets/default.nix | 0 .../kde-5/frameworks-5.19}/kcoreaddons.nix | 0 .../kde-5/frameworks-5.19}/kcrash.nix | 0 .../kde-5/frameworks-5.19}/kdbusaddons.nix | 0 .../kde-5/frameworks-5.19}/kdeclarative.nix | 0 .../kde-5/frameworks-5.19}/kded.nix | 0 .../frameworks-5.19}/kdelibs4support.nix | 0 .../frameworks-5.19}/kdesignerplugin.nix | 0 .../kde-5/frameworks-5.19}/kdesu.nix | 0 .../kde-5/frameworks-5.19}/kdewebkit.nix | 0 .../kde-5/frameworks-5.19}/kdnssd.nix | 0 .../frameworks-5.19}/kdoctools/default.nix | 0 .../kdoctools-no-find-docbook-xml.patch | 0 .../frameworks-5.19}/kdoctools/setup-hook.sh | 0 .../kde-5/frameworks-5.19}/kemoticons.nix | 0 .../kde-5/frameworks-5.19}/kfilemetadata.nix | 0 .../kde-5/frameworks-5.19}/kglobalaccel.nix | 0 .../kde-5/frameworks-5.19}/kguiaddons.nix | 0 .../kde-5/frameworks-5.19}/khtml.nix | 0 .../kde-5/frameworks-5.19}/ki18n.nix | 0 .../kiconthemes/default-theme-breeze.patch | 0 .../frameworks-5.19}/kiconthemes/default.nix | 0 .../kde-5/frameworks-5.19}/kiconthemes/series | 0 .../kde-5/frameworks-5.19}/kidletime.nix | 0 .../kde-5/frameworks-5.19}/kimageformats.nix | 0 .../kinit/0001-kinit-libpath.patch | 0 .../kde-5/frameworks-5.19}/kinit/default.nix | 0 .../kde-5/frameworks-5.19}/kio/default.nix | 0 .../kio/samba-search-path.patch | 0 .../kde-5/frameworks-5.19}/kio/series | 0 .../kde-5/frameworks-5.19}/kitemmodels.nix | 0 .../kde-5/frameworks-5.19}/kitemviews.nix | 0 .../kde-5/frameworks-5.19}/kjobwidgets.nix | 0 .../kde-5/frameworks-5.19}/kjs.nix | 0 .../kde-5/frameworks-5.19}/kjsembed.nix | 0 .../kde-5/frameworks-5.19}/kmediaplayer.nix | 0 .../kde-5/frameworks-5.19}/knewstuff.nix | 0 .../kde-5/frameworks-5.19}/knotifications.nix | 0 .../kde-5/frameworks-5.19}/knotifyconfig.nix | 0 .../kpackage/allow-external-paths.patch | 0 .../frameworks-5.19}/kpackage/default.nix | 0 .../qdiriterator-follow-symlinks.patch | 0 .../kde-5/frameworks-5.19}/kpackage/series | 0 .../kde-5/frameworks-5.19}/kparts.nix | 0 .../kde-5/frameworks-5.19}/kpeople.nix | 0 .../kde-5/frameworks-5.19}/kplotting.nix | 0 .../kde-5/frameworks-5.19}/kpty.nix | 0 .../kde-5/frameworks-5.19}/kross.nix | 0 .../kde-5/frameworks-5.19}/krunner.nix | 0 .../0001-qdiriterator-follow-symlinks.patch | 0 .../kservice/0002-no-canonicalize-path.patch | 0 .../frameworks-5.19}/kservice/default.nix | 0 .../frameworks-5.19}/kservice/setup-hook.sh | 0 .../frameworks-5.19}/ktexteditor/default.nix | 0 .../ktexteditor/no-qcoreapplication.patch | 0 .../kde-5/frameworks-5.19}/ktexteditor/series | 0 .../kde-5/frameworks-5.19}/ktextwidgets.nix | 0 .../frameworks-5.19}/kunitconversion.nix | 0 .../kde-5/frameworks-5.19}/kwallet.nix | 0 .../kde-5/frameworks-5.19}/kwidgetsaddons.nix | 0 .../kde-5/frameworks-5.19}/kwindowsystem.nix | 0 .../kde-5/frameworks-5.19}/kxmlgui.nix | 0 .../kde-5/frameworks-5.19}/kxmlrpcclient.nix | 0 .../frameworks-5.19}/modemmanager-qt.nix | 0 .../frameworks-5.19}/networkmanager-qt.nix | 0 .../kde-5/frameworks-5.19}/oxygen-icons5.nix | 0 .../plasma-framework/default.nix | 0 .../kde-5/frameworks-5.19}/solid.nix | 0 .../kde-5/frameworks-5.19}/sonnet.nix | 0 .../kde-5/frameworks-5.19}/srcs.nix | 0 .../kde-5/frameworks-5.19}/threadweaver.nix | 0 .../{ => kde-5}/plasma-5.5/bluedevil.nix | 0 .../{ => kde-5}/plasma-5.5/breeze-gtk.nix | 0 .../{ => kde-5}/plasma-5.5/breeze-qt4.nix | 0 .../{ => kde-5}/plasma-5.5/breeze-qt5.nix | 0 .../{ => kde-5}/plasma-5.5/default.nix | 0 .../{ => kde-5}/plasma-5.5/fetchsrcs.sh | 0 .../{ => kde-5}/plasma-5.5/kde-cli-tools.nix | 0 .../kde-gtk-config/0001-follow-symlinks.patch | 0 .../plasma-5.5/kde-gtk-config/default.nix | 0 .../{ => kde-5}/plasma-5.5/kdecoration.nix | 0 .../plasma-5.5/kdeplasma-addons.nix | 0 .../{ => kde-5}/plasma-5.5/kgamma5.nix | 0 .../{ => kde-5}/plasma-5.5/khelpcenter.nix | 0 .../{ => kde-5}/plasma-5.5/khotkeys.nix | 0 .../{ => kde-5}/plasma-5.5/kinfocenter.nix | 0 .../{ => kde-5}/plasma-5.5/kmenuedit.nix | 0 .../{ => kde-5}/plasma-5.5/kscreen.nix | 0 .../{ => kde-5}/plasma-5.5/kscreenlocker.nix | 0 .../{ => kde-5}/plasma-5.5/ksshaskpass.nix | 0 .../{ => kde-5}/plasma-5.5/ksysguard.nix | 0 .../{ => kde-5}/plasma-5.5/kwayland.nix | 0 .../0001-qdiriterator-follow-symlinks.patch | 0 .../{ => kde-5}/plasma-5.5/kwin/default.nix | 0 .../{ => kde-5}/plasma-5.5/kwrited.nix | 0 .../plasma-5.5/libkscreen/default.nix | 0 .../0001-qdiriterator-follow-symlinks.patch | 0 .../plasma-5.5/libksysguard/default.nix | 0 .../desktops/{ => kde-5}/plasma-5.5/milou.nix | 0 .../{ => kde-5}/plasma-5.5/oxygen.nix | 0 .../0001-qt-5.5-QML-import-paths.patch | 0 .../plasma-desktop/0002-hwclock.patch | 0 .../plasma-desktop/0003-tzdir.patch | 0 .../plasma-5.5/plasma-desktop/default.nix | 0 .../plasma-5.5/plasma-mediacenter.nix | 0 ...-mobile-broadband-provider-info-path.patch | 0 .../plasma-5.5/plasma-nm/default.nix | 0 .../{ => kde-5}/plasma-5.5/plasma-pa.nix | 0 .../plasma-workspace-wallpapers.nix | 0 .../plasma-5.5/plasma-workspace/default.nix | 0 .../plasma-workspace/qml-import-path.patch | 0 .../plasma-5.5/plasma-workspace/series | 0 .../plasma-workspace/startkde.patch | 0 .../plasma-5.5/polkit-kde-agent.nix | 0 .../{ => kde-5}/plasma-5.5/powerdevil.nix | 0 .../{ => kde-5}/plasma-5.5/setup-hook.sh | 0 pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix | 0 .../{ => kde-5}/plasma-5.5/systemsettings.nix | 0 pkgs/top-level/all-packages.nix | 30 ++++++++++++------- 175 files changed, 21 insertions(+), 13 deletions(-) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ark.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/baloo-widgets.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/default.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin-plugins.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/fetchsrcs.sh (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ffmpegthumbs.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/filelight.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gpgmepp.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gwenview.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kate.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kcalc.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-app.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-4.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-5.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdegraphics-thumbnailers.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0001-old-kde4-cmake-policies.patch (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0002-polkit-install-path.patch (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0003-remove_xdg_impurities.patch (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/default.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/setup-hook.sh (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdenetwork-filesharing.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kgpg.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kio-extras.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/konsole.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/l10n.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkdcraw.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkexiv2.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkipi.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/okular.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/print-manager.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/spectacle.nix (100%) rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/srcs.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/attica.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/baloo.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/bluez-qt.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/breeze-icons.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/setup-hook.sh (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/fetchsrcs.sh (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/frameworkintegration.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kactivities.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kapidox.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/karchive.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/kauth-policy-install.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kbookmarks.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcodecs.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcompletion.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfig.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcoreaddons.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcrash.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdbusaddons.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdeclarative.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kded.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesignerplugin.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesu.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdewebkit.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdnssd.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/setup-hook.sh (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kemoticons.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kglobalaccel.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kguiaddons.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/khtml.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ki18n.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default-theme-breeze.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/series (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kidletime.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kimageformats.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/0001-kinit-libpath.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/samba-search-path.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/series (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemmodels.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemviews.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjobwidgets.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjs.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjsembed.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kmediaplayer.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knewstuff.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifications.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifyconfig.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/allow-external-paths.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/qdiriterator-follow-symlinks.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/series (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kparts.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpeople.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kplotting.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpty.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kross.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/krunner.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0001-qdiriterator-follow-symlinks.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0002-no-canonicalize-path.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/setup-hook.sh (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/no-qcoreapplication.patch (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/series (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktextwidgets.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kunitconversion.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwallet.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwidgetsaddons.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwindowsystem.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlgui.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlrpcclient.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/modemmanager-qt.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/networkmanager-qt.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/oxygen-icons5.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/plasma-framework/default.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/solid.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/sonnet.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/srcs.nix (100%) rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/threadweaver.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/bluedevil.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-gtk.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt4.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt5.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/fetchsrcs.sh (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-cli-tools.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdecoration.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdeplasma-addons.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kgamma5.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/khelpcenter.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/khotkeys.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kinfocenter.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kmenuedit.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreen.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreenlocker.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksshaskpass.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksysguard.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwayland.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwrited.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/libkscreen/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/milou.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/oxygen.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0002-hwclock.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0003-tzdir.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-mediacenter.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-pa.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace-wallpapers.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/default.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/qml-import-path.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/series (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/startkde.patch (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/polkit-kde-agent.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/powerdevil.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/setup-hook.sh (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix (100%) rename pkgs/desktops/{ => kde-5}/plasma-5.5/systemsettings.nix (100%) 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/ark.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/baloo-widgets.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/default.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/dolphin-plugins.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/dolphin.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/fetchsrcs.sh rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix rename to pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix diff --git a/pkgs/applications/kde-apps-15.12/filelight.nix b/pkgs/desktops/kde-5/applications-15.12/filelight.nix similarity index 100% rename from pkgs/applications/kde-apps-15.12/filelight.nix rename to pkgs/desktops/kde-5/applications-15.12/filelight.nix diff --git a/pkgs/applications/kde-apps-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix similarity index 100% rename from pkgs/applications/kde-apps-15.12/gpgmepp.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/gwenview.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kate.nix rename to pkgs/desktops/kde-5/applications-15.12/kate.nix diff --git a/pkgs/applications/kde-apps-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix similarity index 100% rename from pkgs/applications/kde-apps-15.12/kcalc.nix rename to pkgs/desktops/kde-5/applications-15.12/kcalc.nix diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix similarity index 100% rename from pkgs/applications/kde-apps-15.12/kde-app.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kde-locale-4.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kde-locale-5.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kdelibs/default.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kgpg.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/kio-extras.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/konsole.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/l10n.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/libkdcraw.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/libkexiv2.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/libkipi.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/okular.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/print-manager.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/spectacle.nix rename to 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 similarity index 100% rename from pkgs/applications/kde-apps-15.12/srcs.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/attica.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/baloo.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/default.nix rename to pkgs/desktops/kde-5/frameworks-5.19/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/karchive.nix rename to pkgs/desktops/kde-5/frameworks-5.19/karchive.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kded.nix rename to pkgs/desktops/kde-5/frameworks-5.19/kded.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix rename to pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/khtml.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kio/series rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kjs.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/series rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kparts.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kpty.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kross.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/krunner.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/solid.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/srcs.nix rename to 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 similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/bluedevil.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/breeze-gtk.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/breeze-qt4.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/breeze-qt5.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/fetchsrcs.sh rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kde-cli-tools.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kdecoration.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kdeplasma-addons.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kgamma5.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/khelpcenter.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/khotkeys.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kinfocenter.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kmenuedit.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kscreen.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kscreenlocker.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/ksshaskpass.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/ksysguard.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kwayland.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kwin/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/kwrited.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/libkscreen/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/libksysguard/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/milou.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/oxygen.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-desktop/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-mediacenter.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-nm/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-pa.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-workspace/default.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-workspace/series rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/polkit-kde-agent.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/powerdevil.nix rename to pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix diff --git a/pkgs/desktops/plasma-5.5/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh similarity index 100% rename from pkgs/desktops/plasma-5.5/setup-hook.sh rename to pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix similarity index 100% rename from pkgs/desktops/plasma-5.5/srcs.nix rename to 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 similarity index 100% rename from pkgs/desktops/plasma-5.5/systemsettings.nix rename to 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 804230e05b0..5b295d1d77e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15188,23 +15188,33 @@ let kde5 = let - frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; }; - plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; - apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; - named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; + frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; }; + plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; }; + applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; }; merged = self: - named self // frameworks self // plasma self // apps self // kde5PackagesFun self; + { plasma = plasma self; + frameworks = frameworks self; + applications = applications self; } + // frameworks self + // plasma self + // applications self + // kde5PackagesFun self; in recurseIntoAttrs (lib.makeScope qt55.newScope merged); kde5_latest = let - frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; }; - plasma = import ../desktops/plasma-5.5 { inherit pkgs; }; - apps = import ../applications/kde-apps-15.12 { inherit pkgs; }; - named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; }; + frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; }; + plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; }; + applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; }; merged = self: - named self // frameworks self // plasma self // apps self // kde5PackagesFun self; + { plasma = plasma self; + frameworks = frameworks self; + applications = applications self; } + // frameworks self + // plasma self + // applications self + // kde5PackagesFun self; in recurseIntoAttrs (lib.makeScope qt55.newScope merged);