diff --git a/pkgs/desktops/kde-5/frameworks-5.24/attica.nix b/pkgs/desktops/kde-5/frameworks/attica.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/attica.nix rename to pkgs/desktops/kde-5/frameworks/attica.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/baloo.nix b/pkgs/desktops/kde-5/frameworks/baloo.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/baloo.nix rename to pkgs/desktops/kde-5/frameworks/baloo.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks/bluez-qt.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/bluez-qt.nix rename to pkgs/desktops/kde-5/frameworks/bluez-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks/breeze-icons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/breeze-icons.nix rename to pkgs/desktops/kde-5/frameworks/breeze-icons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/default.nix b/pkgs/desktops/kde-5/frameworks/default.nix similarity index 99% rename from pkgs/desktops/kde-5/frameworks-5.24/default.nix rename to pkgs/desktops/kde-5/frameworks/default.nix index 851c142fe2d..1a8f08bde44 100644 --- a/pkgs/desktops/kde-5/frameworks-5.24/default.nix +++ b/pkgs/desktops/kde-5/frameworks/default.nix @@ -7,7 +7,7 @@ keep the old version around for a short time after major updates.) 1. Update the URL in `maintainers/scripts/generate-kde-frameworks.sh`. 2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/generate-kde-frameworks.sh > pkgs/desktops/kde-5/frameworks-$VERSION/srcs.nix'. + `./maintainers/scripts/generate-kde-frameworks.sh > pkgs/desktops/kde-5/frameworks/srcs.nix'. 3. Check that the new packages build correctly. 4. Commit the changes and open a pull request. diff --git a/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/default.nix rename to pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/nix-lib-path.patch rename to pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/series rename to pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/extra-cmake-modules/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.24/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks/frameworkintegration.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/frameworkintegration.nix rename to pkgs/desktops/kde-5/frameworks/frameworkintegration.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kactivities-stats.nix b/pkgs/desktops/kde-5/frameworks/kactivities-stats.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kactivities-stats.nix rename to pkgs/desktops/kde-5/frameworks/kactivities-stats.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kactivities.nix b/pkgs/desktops/kde-5/frameworks/kactivities.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kactivities.nix rename to pkgs/desktops/kde-5/frameworks/kactivities.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kapidox.nix b/pkgs/desktops/kde-5/frameworks/kapidox.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kapidox.nix rename to pkgs/desktops/kde-5/frameworks/kapidox.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/karchive.nix b/pkgs/desktops/kde-5/frameworks/karchive.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/karchive.nix rename to pkgs/desktops/kde-5/frameworks/karchive.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kauth/cmake-install-paths.patch rename to pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kauth/default.nix b/pkgs/desktops/kde-5/frameworks/kauth/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kauth/default.nix rename to pkgs/desktops/kde-5/frameworks/kauth/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kauth/series b/pkgs/desktops/kde-5/frameworks/kauth/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kauth/series rename to pkgs/desktops/kde-5/frameworks/kauth/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks/kbookmarks.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kbookmarks.nix rename to pkgs/desktops/kde-5/frameworks/kbookmarks.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kcmutils/0001-qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks/kcmutils/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kcmutils/default.nix rename to pkgs/desktops/kde-5/frameworks/kcmutils/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kcodecs.nix b/pkgs/desktops/kde-5/frameworks/kcodecs.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kcodecs.nix rename to pkgs/desktops/kde-5/frameworks/kcodecs.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kcompletion.nix b/pkgs/desktops/kde-5/frameworks/kcompletion.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kcompletion.nix rename to pkgs/desktops/kde-5/frameworks/kcompletion.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kconfig.nix b/pkgs/desktops/kde-5/frameworks/kconfig.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kconfig.nix rename to pkgs/desktops/kde-5/frameworks/kconfig.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kconfigwidgets/default.nix rename to pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kcoreaddons.nix rename to pkgs/desktops/kde-5/frameworks/kcoreaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kcrash.nix b/pkgs/desktops/kde-5/frameworks/kcrash.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kcrash.nix rename to pkgs/desktops/kde-5/frameworks/kcrash.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdbusaddons.nix rename to pkgs/desktops/kde-5/frameworks/kdbusaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks/kdeclarative.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdeclarative.nix rename to pkgs/desktops/kde-5/frameworks/kdeclarative.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kded.nix b/pkgs/desktops/kde-5/frameworks/kded.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kded.nix rename to pkgs/desktops/kde-5/frameworks/kded.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/default.nix rename to pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/nix-kde-include-dir.patch rename to pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks/kdelibs4support/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/series rename to pkgs/desktops/kde-5/frameworks/kdelibs4support/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdelibs4support/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdesignerplugin.nix rename to pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdesu.nix b/pkgs/desktops/kde-5/frameworks/kdesu.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdesu.nix rename to pkgs/desktops/kde-5/frameworks/kdesu.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdnssd.nix b/pkgs/desktops/kde-5/frameworks/kdnssd.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdnssd.nix rename to pkgs/desktops/kde-5/frameworks/kdnssd.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdoctools/default.nix rename to pkgs/desktops/kde-5/frameworks/kdoctools/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdoctools/kdoctools-no-find-docbook-xml.patch rename to pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kdoctools/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kemoticons.nix b/pkgs/desktops/kde-5/frameworks/kemoticons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kemoticons.nix rename to pkgs/desktops/kde-5/frameworks/kemoticons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/cmake-install-paths.patch rename to pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/default.nix rename to pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks/kfilemetadata/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kfilemetadata/series rename to pkgs/desktops/kde-5/frameworks/kfilemetadata/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kglobalaccel.nix rename to pkgs/desktops/kde-5/frameworks/kglobalaccel.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks/kguiaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kguiaddons.nix rename to pkgs/desktops/kde-5/frameworks/kguiaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/khtml.nix b/pkgs/desktops/kde-5/frameworks/khtml.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/khtml.nix rename to pkgs/desktops/kde-5/frameworks/khtml.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/ki18n.nix b/pkgs/desktops/kde-5/frameworks/ki18n.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/ki18n.nix rename to pkgs/desktops/kde-5/frameworks/ki18n.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default-theme-breeze.patch rename to pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/default.nix rename to pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/series b/pkgs/desktops/kde-5/frameworks/kiconthemes/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kiconthemes/series rename to pkgs/desktops/kde-5/frameworks/kiconthemes/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kidletime.nix b/pkgs/desktops/kde-5/frameworks/kidletime.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kidletime.nix rename to pkgs/desktops/kde-5/frameworks/kidletime.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kimageformats.nix b/pkgs/desktops/kde-5/frameworks/kimageformats.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kimageformats.nix rename to pkgs/desktops/kde-5/frameworks/kimageformats.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kinit/default.nix b/pkgs/desktops/kde-5/frameworks/kinit/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kinit/default.nix rename to pkgs/desktops/kde-5/frameworks/kinit/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kinit/kinit-libpath.patch rename to pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kinit/series b/pkgs/desktops/kde-5/frameworks/kinit/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kinit/series rename to pkgs/desktops/kde-5/frameworks/kinit/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kio/default.nix b/pkgs/desktops/kde-5/frameworks/kio/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kio/default.nix rename to pkgs/desktops/kde-5/frameworks/kio/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kio/samba-search-path.patch rename to pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kio/series b/pkgs/desktops/kde-5/frameworks/kio/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kio/series rename to pkgs/desktops/kde-5/frameworks/kio/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks/kitemmodels.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kitemmodels.nix rename to pkgs/desktops/kde-5/frameworks/kitemmodels.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kitemviews.nix b/pkgs/desktops/kde-5/frameworks/kitemviews.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kitemviews.nix rename to pkgs/desktops/kde-5/frameworks/kitemviews.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks/kjobwidgets.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kjobwidgets.nix rename to pkgs/desktops/kde-5/frameworks/kjobwidgets.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kjs.nix b/pkgs/desktops/kde-5/frameworks/kjs.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kjs.nix rename to pkgs/desktops/kde-5/frameworks/kjs.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kjsembed.nix b/pkgs/desktops/kde-5/frameworks/kjsembed.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kjsembed.nix rename to pkgs/desktops/kde-5/frameworks/kjsembed.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks/kmediaplayer.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kmediaplayer.nix rename to pkgs/desktops/kde-5/frameworks/kmediaplayer.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/knewstuff.nix b/pkgs/desktops/kde-5/frameworks/knewstuff.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/knewstuff.nix rename to pkgs/desktops/kde-5/frameworks/knewstuff.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/knotifications.nix b/pkgs/desktops/kde-5/frameworks/knotifications.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/knotifications.nix rename to pkgs/desktops/kde-5/frameworks/knotifications.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks/knotifyconfig.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/knotifyconfig.nix rename to pkgs/desktops/kde-5/frameworks/knotifyconfig.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kpackage/allow-external-paths.patch rename to pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks/kpackage/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kpackage/default.nix rename to pkgs/desktops/kde-5/frameworks/kpackage/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kpackage/qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kpackage/series b/pkgs/desktops/kde-5/frameworks/kpackage/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kpackage/series rename to pkgs/desktops/kde-5/frameworks/kpackage/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kparts.nix b/pkgs/desktops/kde-5/frameworks/kparts.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kparts.nix rename to pkgs/desktops/kde-5/frameworks/kparts.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kpeople.nix b/pkgs/desktops/kde-5/frameworks/kpeople.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kpeople.nix rename to pkgs/desktops/kde-5/frameworks/kpeople.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kplotting.nix b/pkgs/desktops/kde-5/frameworks/kplotting.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kplotting.nix rename to pkgs/desktops/kde-5/frameworks/kplotting.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kpty.nix b/pkgs/desktops/kde-5/frameworks/kpty.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kpty.nix rename to pkgs/desktops/kde-5/frameworks/kpty.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kross.nix b/pkgs/desktops/kde-5/frameworks/kross.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kross.nix rename to pkgs/desktops/kde-5/frameworks/kross.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/krunner.nix b/pkgs/desktops/kde-5/frameworks/krunner.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/krunner.nix rename to pkgs/desktops/kde-5/frameworks/krunner.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kservice/default.nix b/pkgs/desktops/kde-5/frameworks/kservice/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kservice/default.nix rename to pkgs/desktops/kde-5/frameworks/kservice/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kservice/no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kservice/no-canonicalize-path.patch rename to pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kservice/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kservice/qdiriterator-follow-symlinks.patch rename to pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kservice/series b/pkgs/desktops/kde-5/frameworks/kservice/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kservice/series rename to pkgs/desktops/kde-5/frameworks/kservice/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks/kservice/setup-hook.sh similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kservice/setup-hook.sh rename to pkgs/desktops/kde-5/frameworks/kservice/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/default.nix rename to pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/no-qcoreapplication.patch rename to pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch diff --git a/pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/series b/pkgs/desktops/kde-5/frameworks/ktexteditor/series similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/ktexteditor/series rename to pkgs/desktops/kde-5/frameworks/ktexteditor/series diff --git a/pkgs/desktops/kde-5/frameworks-5.24/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks/ktextwidgets.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/ktextwidgets.nix rename to pkgs/desktops/kde-5/frameworks/ktextwidgets.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks/kunitconversion.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kunitconversion.nix rename to pkgs/desktops/kde-5/frameworks/kunitconversion.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kwallet.nix b/pkgs/desktops/kde-5/frameworks/kwallet.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kwallet.nix rename to pkgs/desktops/kde-5/frameworks/kwallet.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kwayland.nix b/pkgs/desktops/kde-5/frameworks/kwayland.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kwayland.nix rename to pkgs/desktops/kde-5/frameworks/kwayland.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kwidgetsaddons.nix rename to pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks/kwindowsystem.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kwindowsystem.nix rename to pkgs/desktops/kde-5/frameworks/kwindowsystem.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks/kxmlgui.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kxmlgui.nix rename to pkgs/desktops/kde-5/frameworks/kxmlgui.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/kxmlrpcclient.nix rename to pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/modemmanager-qt.nix rename to pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/networkmanager-qt.nix rename to pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/oxygen-icons5.nix rename to pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/plasma-framework.nix b/pkgs/desktops/kde-5/frameworks/plasma-framework.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/plasma-framework.nix rename to pkgs/desktops/kde-5/frameworks/plasma-framework.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/solid.nix b/pkgs/desktops/kde-5/frameworks/solid.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/solid.nix rename to pkgs/desktops/kde-5/frameworks/solid.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/sonnet.nix b/pkgs/desktops/kde-5/frameworks/sonnet.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/sonnet.nix rename to pkgs/desktops/kde-5/frameworks/sonnet.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/srcs.nix b/pkgs/desktops/kde-5/frameworks/srcs.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/srcs.nix rename to pkgs/desktops/kde-5/frameworks/srcs.nix diff --git a/pkgs/desktops/kde-5/frameworks-5.24/threadweaver.nix b/pkgs/desktops/kde-5/frameworks/threadweaver.nix similarity index 100% rename from pkgs/desktops/kde-5/frameworks-5.24/threadweaver.nix rename to pkgs/desktops/kde-5/frameworks/threadweaver.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 93db1f924ee..128fe8b9777 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16180,7 +16180,7 @@ in kde5 = let - frameworks = import ../desktops/kde-5/frameworks-5.24 { inherit pkgs; }; + frameworks = import ../desktops/kde-5/frameworks { inherit pkgs; }; plasma = import ../desktops/kde-5/plasma { inherit pkgs; }; applications = import ../desktops/kde-5/applications { inherit pkgs; }; merged = self: