diff options
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/attica.nix (renamed from pkgs/desktops/kde-5/frameworks/attica.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/baloo.nix (renamed from pkgs/desktops/kde-5/frameworks/baloo.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/bluez-qt.nix (renamed from pkgs/desktops/kde-5/frameworks/bluez-qt.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/breeze-icons.nix (renamed from pkgs/desktops/kde-5/frameworks/breeze-icons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/default.nix (renamed from pkgs/desktops/kde-5/frameworks/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix (renamed from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch (renamed from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series (renamed from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh (renamed from pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/frameworkintegration.nix (renamed from pkgs/desktops/kde-5/frameworks/frameworkintegration.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kactivities-stats.nix (renamed from pkgs/desktops/kde-5/frameworks/kactivities-stats.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kactivities.nix (renamed from pkgs/desktops/kde-5/frameworks/kactivities.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kapidox.nix (renamed from pkgs/desktops/kde-5/frameworks/kapidox.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/karchive.nix (renamed from pkgs/desktops/kde-5/frameworks/karchive.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch (renamed from pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kauth/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kauth/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kauth/series (renamed from pkgs/desktops/kde-5/frameworks/kauth/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kbookmarks.nix (renamed from pkgs/desktops/kde-5/frameworks/kbookmarks.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kcmutils/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kcmutils/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kcodecs.nix (renamed from pkgs/desktops/kde-5/frameworks/kcodecs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kcompletion.nix (renamed from pkgs/desktops/kde-5/frameworks/kcompletion.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kconfig.nix (renamed from pkgs/desktops/kde-5/frameworks/kconfig.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kcoreaddons.nix (renamed from pkgs/desktops/kde-5/frameworks/kcoreaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kcrash.nix (renamed from pkgs/desktops/kde-5/frameworks/kcrash.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdbusaddons.nix (renamed from pkgs/desktops/kde-5/frameworks/kdbusaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdeclarative.nix (renamed from pkgs/desktops/kde-5/frameworks/kdeclarative.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kded.nix (renamed from pkgs/desktops/kde-5/frameworks/kded.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch (renamed from pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdelibs4support/series (renamed from pkgs/desktops/kde-5/frameworks/kdelibs4support/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh (renamed from pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix (renamed from pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdesu.nix (renamed from pkgs/desktops/kde-5/frameworks/kdesu.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdnssd.nix (renamed from pkgs/desktops/kde-5/frameworks/kdnssd.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdoctools/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kdoctools/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch (renamed from pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh (renamed from pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kemoticons.nix (renamed from pkgs/desktops/kde-5/frameworks/kemoticons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch (renamed from pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kfilemetadata/series (renamed from pkgs/desktops/kde-5/frameworks/kfilemetadata/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kglobalaccel.nix (renamed from pkgs/desktops/kde-5/frameworks/kglobalaccel.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kguiaddons.nix (renamed from pkgs/desktops/kde-5/frameworks/kguiaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/khtml.nix (renamed from pkgs/desktops/kde-5/frameworks/khtml.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/ki18n.nix (renamed from pkgs/desktops/kde-5/frameworks/ki18n.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch (renamed from pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kiconthemes/series (renamed from pkgs/desktops/kde-5/frameworks/kiconthemes/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kidletime.nix (renamed from pkgs/desktops/kde-5/frameworks/kidletime.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kimageformats.nix (renamed from pkgs/desktops/kde-5/frameworks/kimageformats.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kinit/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kinit/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch (renamed from pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kinit/series (renamed from pkgs/desktops/kde-5/frameworks/kinit/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch (renamed from pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kio/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kio/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch (renamed from pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kio/series (renamed from pkgs/desktops/kde-5/frameworks/kio/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kitemmodels.nix (renamed from pkgs/desktops/kde-5/frameworks/kitemmodels.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kitemviews.nix (renamed from pkgs/desktops/kde-5/frameworks/kitemviews.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kjobwidgets.nix (renamed from pkgs/desktops/kde-5/frameworks/kjobwidgets.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kjs.nix (renamed from pkgs/desktops/kde-5/frameworks/kjs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kjsembed.nix (renamed from pkgs/desktops/kde-5/frameworks/kjsembed.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kmediaplayer.nix (renamed from pkgs/desktops/kde-5/frameworks/kmediaplayer.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/knewstuff.nix (renamed from pkgs/desktops/kde-5/frameworks/knewstuff.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/knotifications.nix (renamed from pkgs/desktops/kde-5/frameworks/knotifications.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/knotifyconfig.nix (renamed from pkgs/desktops/kde-5/frameworks/knotifyconfig.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch (renamed from pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kpackage/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kpackage/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kpackage/series (renamed from pkgs/desktops/kde-5/frameworks/kpackage/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kparts.nix (renamed from pkgs/desktops/kde-5/frameworks/kparts.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kpeople.nix (renamed from pkgs/desktops/kde-5/frameworks/kpeople.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kplotting.nix (renamed from pkgs/desktops/kde-5/frameworks/kplotting.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kpty.nix (renamed from pkgs/desktops/kde-5/frameworks/kpty.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kross.nix (renamed from pkgs/desktops/kde-5/frameworks/kross.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/krunner.nix (renamed from pkgs/desktops/kde-5/frameworks/krunner.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kservice/default.nix (renamed from pkgs/desktops/kde-5/frameworks/kservice/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch (renamed from pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch (renamed from pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kservice/series (renamed from pkgs/desktops/kde-5/frameworks/kservice/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/ktexteditor/default.nix (renamed from pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/ktexteditor/no-qcoreapplication.patch (renamed from pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/ktexteditor/series (renamed from pkgs/desktops/kde-5/frameworks/ktexteditor/series) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/ktextwidgets.nix (renamed from pkgs/desktops/kde-5/frameworks/ktextwidgets.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kunitconversion.nix (renamed from pkgs/desktops/kde-5/frameworks/kunitconversion.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kwallet.nix (renamed from pkgs/desktops/kde-5/frameworks/kwallet.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kwayland.nix (renamed from pkgs/desktops/kde-5/frameworks/kwayland.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix (renamed from pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kwindowsystem.nix (renamed from pkgs/desktops/kde-5/frameworks/kwindowsystem.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kxmlgui.nix (renamed from pkgs/desktops/kde-5/frameworks/kxmlgui.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix (renamed from pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix (renamed from pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix (renamed from pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix (renamed from pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/plasma-framework.nix (renamed from pkgs/desktops/kde-5/frameworks/plasma-framework.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/solid.nix (renamed from pkgs/desktops/kde-5/frameworks/solid.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/sonnet.nix (renamed from pkgs/desktops/kde-5/frameworks/sonnet.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/srcs.nix (renamed from pkgs/desktops/kde-5/frameworks/srcs.nix) | 0 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/threadweaver.nix (renamed from pkgs/desktops/kde-5/frameworks/threadweaver.nix) | 0 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 26 |
103 files changed, 15 insertions, 11 deletions
diff --git a/pkgs/desktops/kde-5/frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix index 98721876c1204..98721876c1204 100644 --- a/pkgs/desktops/kde-5/frameworks/attica.nix +++ b/pkgs/development/libraries/kde-frameworks/attica.nix diff --git a/pkgs/desktops/kde-5/frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix index 825a125c8a790..825a125c8a790 100644 --- a/pkgs/desktops/kde-5/frameworks/baloo.nix +++ b/pkgs/development/libraries/kde-frameworks/baloo.nix diff --git a/pkgs/desktops/kde-5/frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix index 26490167dbdbc..26490167dbdbc 100644 --- a/pkgs/desktops/kde-5/frameworks/bluez-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix index 773261638c980..773261638c980 100644 --- a/pkgs/desktops/kde-5/frameworks/breeze-icons.nix +++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix diff --git a/pkgs/desktops/kde-5/frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index bff2b394038b8..bff2b394038b8 100644 --- a/pkgs/desktops/kde-5/frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix index 1c2ea70442d32..1c2ea70442d32 100644 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/default.nix +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch index a74340a6dc969..a74340a6dc969 100644 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/nix-lib-path.patch +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/nix-lib-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series index b4569e50a5f73..b4569e50a5f73 100644 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/series +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/series diff --git a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh index 5363f4e30fdce..5363f4e30fdce 100644 --- a/pkgs/desktops/kde-5/frameworks/extra-cmake-modules/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix index ee1b188d4073d..ee1b188d4073d 100644 --- a/pkgs/desktops/kde-5/frameworks/frameworkintegration.nix +++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix diff --git a/pkgs/desktops/kde-5/frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix index 0080c5c31649a..0080c5c31649a 100644 --- a/pkgs/desktops/kde-5/frameworks/kactivities-stats.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix diff --git a/pkgs/desktops/kde-5/frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix index 167c3f15bbda2..167c3f15bbda2 100644 --- a/pkgs/desktops/kde-5/frameworks/kactivities.nix +++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix diff --git a/pkgs/desktops/kde-5/frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix index f78a5ea08a49a..f78a5ea08a49a 100644 --- a/pkgs/desktops/kde-5/frameworks/kapidox.nix +++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix diff --git a/pkgs/desktops/kde-5/frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix index bec44a6d6874f..bec44a6d6874f 100644 --- a/pkgs/desktops/kde-5/frameworks/karchive.nix +++ b/pkgs/development/libraries/kde-frameworks/karchive.nix diff --git a/pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch index c66f5ecd008f8..c66f5ecd008f8 100644 --- a/pkgs/desktops/kde-5/frameworks/kauth/cmake-install-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kauth/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix index 4bdba88bc3bbd..4bdba88bc3bbd 100644 --- a/pkgs/desktops/kde-5/frameworks/kauth/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kauth/series b/pkgs/development/libraries/kde-frameworks/kauth/series index d2689425c3876..d2689425c3876 100644 --- a/pkgs/desktops/kde-5/frameworks/kauth/series +++ b/pkgs/development/libraries/kde-frameworks/kauth/series diff --git a/pkgs/desktops/kde-5/frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix index 7348e591d9cba..7348e591d9cba 100644 --- a/pkgs/desktops/kde-5/frameworks/kbookmarks.nix +++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix diff --git a/pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch index 0d861fa95012d..0d861fa95012d 100644 --- a/pkgs/desktops/kde-5/frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix index fdf55174548e3..fdf55174548e3 100644 --- a/pkgs/desktops/kde-5/frameworks/kcmutils/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix index 53a69a69b69c4..53a69a69b69c4 100644 --- a/pkgs/desktops/kde-5/frameworks/kcodecs.nix +++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix diff --git a/pkgs/desktops/kde-5/frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix index 8c45bed258560..8c45bed258560 100644 --- a/pkgs/desktops/kde-5/frameworks/kcompletion.nix +++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix diff --git a/pkgs/desktops/kde-5/frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix index 154329d0e98e6..154329d0e98e6 100644 --- a/pkgs/desktops/kde-5/frameworks/kconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix diff --git a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch index 7a6c0ee90534f..7a6c0ee90534f 100644 --- a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix index f507abe299160..f507abe299160 100644 --- a/pkgs/desktops/kde-5/frameworks/kconfigwidgets/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix index 94b4136df3da5..94b4136df3da5 100644 --- a/pkgs/desktops/kde-5/frameworks/kcoreaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix index 133a81c60c181..133a81c60c181 100644 --- a/pkgs/desktops/kde-5/frameworks/kcrash.nix +++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix index eadd645fb99a8..eadd645fb99a8 100644 --- a/pkgs/desktops/kde-5/frameworks/kdbusaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix index 8db1b73c91a72..8db1b73c91a72 100644 --- a/pkgs/desktops/kde-5/frameworks/kdeclarative.nix +++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix diff --git a/pkgs/desktops/kde-5/frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index fd286accb9ff8..fd286accb9ff8 100644 --- a/pkgs/desktops/kde-5/frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix index 1765ffa9a39f6..1765ffa9a39f6 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch index eabb702544830..eabb702544830 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/nix-kde-include-dir.patch +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/nix-kde-include-dir.patch diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series index 9b08ab208774a..9b08ab208774a 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/series +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/series diff --git a/pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh index 21ac2e83b5dae..21ac2e83b5dae 100644 --- a/pkgs/desktops/kde-5/frameworks/kdelibs4support/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix index 8e17a1a60c8dd..8e17a1a60c8dd 100644 --- a/pkgs/desktops/kde-5/frameworks/kdesignerplugin.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix index fcccea9161f19..fcccea9161f19 100644 --- a/pkgs/desktops/kde-5/frameworks/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix index 8fda4e63e3a6d..8fda4e63e3a6d 100644 --- a/pkgs/desktops/kde-5/frameworks/kdnssd.nix +++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix index 99fc4c7d023c6..99fc4c7d023c6 100644 --- a/pkgs/desktops/kde-5/frameworks/kdoctools/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch index 4e3a33efab32b..4e3a33efab32b 100644 --- a/pkgs/desktops/kde-5/frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/kdoctools-no-find-docbook-xml.patch diff --git a/pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh index 5cfffbd622d12..5cfffbd622d12 100644 --- a/pkgs/desktops/kde-5/frameworks/kdoctools/setup-hook.sh +++ b/pkgs/development/libraries/kde-frameworks/kdoctools/setup-hook.sh diff --git a/pkgs/desktops/kde-5/frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix index 1e31277172d72..1e31277172d72 100644 --- a/pkgs/desktops/kde-5/frameworks/kemoticons.nix +++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch index 732f7b69c828d..732f7b69c828d 100644 --- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/cmake-install-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/cmake-install-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix index bc7349e7453f4..bc7349e7453f4 100644 --- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series index d2689425c3876..d2689425c3876 100644 --- a/pkgs/desktops/kde-5/frameworks/kfilemetadata/series +++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/series diff --git a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index 4743d0b8f1b0a..4743d0b8f1b0a 100644 --- a/pkgs/desktops/kde-5/frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix diff --git a/pkgs/desktops/kde-5/frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix index 6ebfd1104f700..6ebfd1104f700 100644 --- a/pkgs/desktops/kde-5/frameworks/kguiaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix index 99f6fe31e0d7c..99f6fe31e0d7c 100644 --- a/pkgs/desktops/kde-5/frameworks/khtml.nix +++ b/pkgs/development/libraries/kde-frameworks/khtml.nix diff --git a/pkgs/desktops/kde-5/frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix index 2698a97fd33f9..2698a97fd33f9 100644 --- a/pkgs/desktops/kde-5/frameworks/ki18n.nix +++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch index f7cb0ea3aaccd..f7cb0ea3aaccd 100644 --- a/pkgs/desktops/kde-5/frameworks/kiconthemes/default-theme-breeze.patch +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default-theme-breeze.patch diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix index 6102bb0d4b569..6102bb0d4b569 100644 --- a/pkgs/desktops/kde-5/frameworks/kiconthemes/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kiconthemes/series b/pkgs/development/libraries/kde-frameworks/kiconthemes/series index ab5cc8a3edb27..ab5cc8a3edb27 100644 --- a/pkgs/desktops/kde-5/frameworks/kiconthemes/series +++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/series diff --git a/pkgs/desktops/kde-5/frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix index 758260517e7df..758260517e7df 100644 --- a/pkgs/desktops/kde-5/frameworks/kidletime.nix +++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix diff --git a/pkgs/desktops/kde-5/frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix index fbc8d092f865f..fbc8d092f865f 100644 --- a/pkgs/desktops/kde-5/frameworks/kimageformats.nix +++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix diff --git a/pkgs/desktops/kde-5/frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix index b965f761e9225..b965f761e9225 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch index a5c76fca2481a..a5c76fca2481a 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/kinit-libpath.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/kinit-libpath.patch diff --git a/pkgs/desktops/kde-5/frameworks/kinit/series b/pkgs/development/libraries/kde-frameworks/kinit/series index 576b8a935bf1d..576b8a935bf1d 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/series +++ b/pkgs/development/libraries/kde-frameworks/kinit/series diff --git a/pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch index fbecf9433f692..fbecf9433f692 100644 --- a/pkgs/desktops/kde-5/frameworks/kinit/start_kdeinit-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kinit/start_kdeinit-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix index cb67c84590348..cb67c84590348 100644 --- a/pkgs/desktops/kde-5/frameworks/kio/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch index c9ad46b41bb76..c9ad46b41bb76 100644 --- a/pkgs/desktops/kde-5/frameworks/kio/samba-search-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kio/samba-search-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series index 77ca154500474..77ca154500474 100644 --- a/pkgs/desktops/kde-5/frameworks/kio/series +++ b/pkgs/development/libraries/kde-frameworks/kio/series diff --git a/pkgs/desktops/kde-5/frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix index 7dff10b7fe063..7dff10b7fe063 100644 --- a/pkgs/desktops/kde-5/frameworks/kitemmodels.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix diff --git a/pkgs/desktops/kde-5/frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix index 77f4b66216046..77f4b66216046 100644 --- a/pkgs/desktops/kde-5/frameworks/kitemviews.nix +++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix diff --git a/pkgs/desktops/kde-5/frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix index 2692458b8be79..2692458b8be79 100644 --- a/pkgs/desktops/kde-5/frameworks/kjobwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix diff --git a/pkgs/desktops/kde-5/frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix index abdc15ce8df61..abdc15ce8df61 100644 --- a/pkgs/desktops/kde-5/frameworks/kjs.nix +++ b/pkgs/development/libraries/kde-frameworks/kjs.nix diff --git a/pkgs/desktops/kde-5/frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix index 95bc02422f1bf..95bc02422f1bf 100644 --- a/pkgs/desktops/kde-5/frameworks/kjsembed.nix +++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix diff --git a/pkgs/desktops/kde-5/frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix index 93a6b450f762d..93a6b450f762d 100644 --- a/pkgs/desktops/kde-5/frameworks/kmediaplayer.nix +++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix diff --git a/pkgs/desktops/kde-5/frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix index 002418c65ad0c..002418c65ad0c 100644 --- a/pkgs/desktops/kde-5/frameworks/knewstuff.nix +++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix diff --git a/pkgs/desktops/kde-5/frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix index 7196832495f30..7196832495f30 100644 --- a/pkgs/desktops/kde-5/frameworks/knotifications.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix diff --git a/pkgs/desktops/kde-5/frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix index 0e357aecb999c..0e357aecb999c 100644 --- a/pkgs/desktops/kde-5/frameworks/knotifyconfig.nix +++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch index e9d7444481480..e9d7444481480 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/allow-external-paths.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/allow-external-paths.patch diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix index a39a672574bb9..a39a672574bb9 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch index ddbf17d00064c..ddbf17d00064c 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kpackage/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks/kpackage/series b/pkgs/development/libraries/kde-frameworks/kpackage/series index 9b7f076efc70e..9b7f076efc70e 100644 --- a/pkgs/desktops/kde-5/frameworks/kpackage/series +++ b/pkgs/development/libraries/kde-frameworks/kpackage/series diff --git a/pkgs/desktops/kde-5/frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix index ad6ea2dbc3059..ad6ea2dbc3059 100644 --- a/pkgs/desktops/kde-5/frameworks/kparts.nix +++ b/pkgs/development/libraries/kde-frameworks/kparts.nix diff --git a/pkgs/desktops/kde-5/frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix index 6acb5e2eed513..6acb5e2eed513 100644 --- a/pkgs/desktops/kde-5/frameworks/kpeople.nix +++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix diff --git a/pkgs/desktops/kde-5/frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix index 601f1778db7d9..601f1778db7d9 100644 --- a/pkgs/desktops/kde-5/frameworks/kplotting.nix +++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix diff --git a/pkgs/desktops/kde-5/frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix index 8bdaacb85f82b..8bdaacb85f82b 100644 --- a/pkgs/desktops/kde-5/frameworks/kpty.nix +++ b/pkgs/development/libraries/kde-frameworks/kpty.nix diff --git a/pkgs/desktops/kde-5/frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix index 0e66d95b5cce8..0e66d95b5cce8 100644 --- a/pkgs/desktops/kde-5/frameworks/kross.nix +++ b/pkgs/development/libraries/kde-frameworks/kross.nix diff --git a/pkgs/desktops/kde-5/frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index ec9ab7abe9f91..ec9ab7abe9f91 100644 --- a/pkgs/desktops/kde-5/frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix diff --git a/pkgs/desktops/kde-5/frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix index 484be4087943c..484be4087943c 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch index cf98ffb9067fa..cf98ffb9067fa 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/no-canonicalize-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kservice/no-canonicalize-path.patch diff --git a/pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch index cbe13b7095088..cbe13b7095088 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/qdiriterator-follow-symlinks.patch +++ b/pkgs/development/libraries/kde-frameworks/kservice/qdiriterator-follow-symlinks.patch diff --git a/pkgs/desktops/kde-5/frameworks/kservice/series b/pkgs/development/libraries/kde-frameworks/kservice/series index 3ce22dbd35a08..3ce22dbd35a08 100644 --- a/pkgs/desktops/kde-5/frameworks/kservice/series +++ b/pkgs/development/libraries/kde-frameworks/kservice/series diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor/default.nix index a35af2e7fbfd2..a35af2e7fbfd2 100644 --- a/pkgs/desktops/kde-5/frameworks/ktexteditor/default.nix +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor/default.nix diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks/ktexteditor/no-qcoreapplication.patch index 19ab1e1e55138..19ab1e1e55138 100644 --- a/pkgs/desktops/kde-5/frameworks/ktexteditor/no-qcoreapplication.patch +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor/no-qcoreapplication.patch diff --git a/pkgs/desktops/kde-5/frameworks/ktexteditor/series b/pkgs/development/libraries/kde-frameworks/ktexteditor/series index 46cd23829a2fd..46cd23829a2fd 100644 --- a/pkgs/desktops/kde-5/frameworks/ktexteditor/series +++ b/pkgs/development/libraries/kde-frameworks/ktexteditor/series diff --git a/pkgs/desktops/kde-5/frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix index 25954c603971c..25954c603971c 100644 --- a/pkgs/desktops/kde-5/frameworks/ktextwidgets.nix +++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix diff --git a/pkgs/desktops/kde-5/frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix index c04ded722aa4a..c04ded722aa4a 100644 --- a/pkgs/desktops/kde-5/frameworks/kunitconversion.nix +++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix diff --git a/pkgs/desktops/kde-5/frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix index f02c6138df77a..f02c6138df77a 100644 --- a/pkgs/desktops/kde-5/frameworks/kwallet.nix +++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix diff --git a/pkgs/desktops/kde-5/frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index db3328413082f..db3328413082f 100644 --- a/pkgs/desktops/kde-5/frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix diff --git a/pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix index 7f2b35d8f7b50..7f2b35d8f7b50 100644 --- a/pkgs/desktops/kde-5/frameworks/kwidgetsaddons.nix +++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix diff --git a/pkgs/desktops/kde-5/frameworks/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix index 6acab52d1353a..6acab52d1353a 100644 --- a/pkgs/desktops/kde-5/frameworks/kwindowsystem.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem.nix diff --git a/pkgs/desktops/kde-5/frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix index ea800bf58ae0e..ea800bf58ae0e 100644 --- a/pkgs/desktops/kde-5/frameworks/kxmlgui.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix diff --git a/pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix index f20f4a2239458..f20f4a2239458 100644 --- a/pkgs/desktops/kde-5/frameworks/kxmlrpcclient.nix +++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix diff --git a/pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix index e03254a71edda..e03254a71edda 100644 --- a/pkgs/desktops/kde-5/frameworks/modemmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix index 0515509a77c54..0515509a77c54 100644 --- a/pkgs/desktops/kde-5/frameworks/networkmanager-qt.nix +++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix diff --git a/pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix index 0b5c75b960d31..0b5c75b960d31 100644 --- a/pkgs/desktops/kde-5/frameworks/oxygen-icons5.nix +++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix diff --git a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix index a413814865383..a413814865383 100644 --- a/pkgs/desktops/kde-5/frameworks/plasma-framework.nix +++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix diff --git a/pkgs/desktops/kde-5/frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix index c4f580fe1c2d4..c4f580fe1c2d4 100644 --- a/pkgs/desktops/kde-5/frameworks/solid.nix +++ b/pkgs/development/libraries/kde-frameworks/solid.nix diff --git a/pkgs/desktops/kde-5/frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix index 28c24302abc41..28c24302abc41 100644 --- a/pkgs/desktops/kde-5/frameworks/sonnet.nix +++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix diff --git a/pkgs/desktops/kde-5/frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 5c48ece1e99e0..5c48ece1e99e0 100644 --- a/pkgs/desktops/kde-5/frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix diff --git a/pkgs/desktops/kde-5/frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix index b8f2939e8b592..b8f2939e8b592 100644 --- a/pkgs/desktops/kde-5/frameworks/threadweaver.nix +++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48aea31859597..0b87df2c61992 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9066,7 +9066,12 @@ in qt5ct = qt5.callPackage ../tools/misc/qt5ct { }; - qt5LibsFun = self: with self; { + qt5LibsFun = self: with self; + let kdeFrameworks = + import ../development/libraries/kde-frameworks { inherit pkgs; } self; + in { + + inherit kdeFrameworks; accounts-qt = callPackage ../development/libraries/accounts-qt { }; @@ -9086,6 +9091,12 @@ in openbr = callPackage ../development/libraries/openbr { }; + phonon = callPackage ../development/libraries/phonon { }; + + phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; + + phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; + polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { }; poppler = callPackage ../development/libraries/poppler { @@ -9110,7 +9121,7 @@ in ffmpeg = ffmpeg_2; }); - }; + } // kdeFrameworks; qtEnv = qt5.env; qt5Full = qt5.full; @@ -16238,12 +16249,6 @@ in openjpeg = openjpeg_1; }; - phonon = callPackage ../development/libraries/phonon { }; - - phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { }; - - phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { }; - quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix { monolithic = true; daemon = false; @@ -16286,14 +16291,13 @@ in kde5 = let - 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: { plasma = plasma self; - frameworks = frameworks self; + frameworks = qt5.kdeFrameworks; applications = applications self; } - // frameworks self + // qt5.kdeFrameworks // plasma self // applications self // kde5PackagesFun self; |