diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch deleted file mode 100644 index beede4d7ccb5..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0001-allow-external-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a92ac391b4e6ca335bd7fa78f1addd23c9467931 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 28 Jan 2015 07:15:30 -0600 -Subject: [PATCH 1/2] allow external paths - ---- - src/kpackage/package.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kpackage/package.cpp b/src/kpackage/package.cpp -index 539b21a..977a026 100644 ---- a/src/kpackage/package.cpp -+++ b/src/kpackage/package.cpp -@@ -789,7 +789,7 @@ PackagePrivate::PackagePrivate() - : QSharedData(), - fallbackPackage(0), - metadata(0), -- externalPaths(false), -+ externalPaths(true), - valid(false), - checkedValid(false) - { --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch deleted file mode 100644 index 6e93fca9b21d..000000000000 --- a/pkgs/development/libraries/kde-frameworks-5.17/kpackage/0002-qdiriterator-follow-symlinks.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 9fc26c3c0478eb7cb0a531836ba2e3a85d820c88 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 06:50:28 -0500 -Subject: [PATCH 2/2] qdiriterator follow symlinks - ---- - src/kpackage/packageloader.cpp | 2 +- - src/kpackage/private/packagejobthread.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/kpackage/packageloader.cpp b/src/kpackage/packageloader.cpp -index eb5ed47..94217f6 100644 ---- a/src/kpackage/packageloader.cpp -+++ b/src/kpackage/packageloader.cpp -@@ -241,7 +241,7 @@ QList PackageLoader::listPackages(const QString &packageFormat, - } else { - //qDebug() << "Not cached"; - // If there's no cache file, fall back to listing the directory -- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; -+ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; - const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")); - - QDirIterator it(plugindir, nameFilters, QDir::Files, flags); -diff --git a/src/kpackage/private/packagejobthread.cpp b/src/kpackage/private/packagejobthread.cpp -index ca523b3..1cfa792 100644 ---- a/src/kpackage/private/packagejobthread.cpp -+++ b/src/kpackage/private/packagejobthread.cpp -@@ -145,7 +145,7 @@ bool indexDirectory(const QString& dir, const QString& dest) - QJsonArray plugins; - - int i = 0; -- QDirIterator it(dir, QStringList()< PackageLoader::li + } else { + //qDebug() << "Not cached"; + // If there's no cache file, fall back to listing the directory +- const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories; ++ const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks; + const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json"); + + QDirIterator it(plugindir, nameFilters, QDir::Files, flags); +Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +=================================================================== +--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp ++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp +@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir, + + QJsonArray plugins; + +- QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories); ++ QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + while (it.hasNext()) { + it.next(); + const QString path = it.fileInfo().absoluteFilePath(); diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series new file mode 100644 index 000000000000..9b7f076efc70 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series @@ -0,0 +1,2 @@ +allow-external-paths.patch +qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kparts.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kparts.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kpeople.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kplotting.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kpty.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kpty.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kross.nix b/pkgs/development/libraries/kde-frameworks-5.18/kross.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kross.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kross.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/krunner.nix rename to pkgs/development/libraries/kde-frameworks-5.18/krunner.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kservice/0001-qdiriterator-follow-symlinks.patch rename to pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kservice/0002-no-canonicalize-path.patch rename to pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kservice/default.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kservice/setup-hook.sh rename to pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix new file mode 100644 index 000000000000..b8df6a5f4c0d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix @@ -0,0 +1,22 @@ +{ kdeFramework, lib, copyPathsToStore +, extra-cmake-modules, makeQtWrapper, perl +, karchive, kconfig, kguiaddons, kiconthemes, kparts +, libgit2 +, qtscript, qtxmlpatterns +, ki18n, kio, sonnet +}: + +kdeFramework { + name = "ktexteditor"; + nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ]; + buildInputs = [ + karchive kconfig kguiaddons kiconthemes kparts + libgit2 + qtscript qtxmlpatterns + ]; + propagatedBuildInputs = [ ki18n kio sonnet ]; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch similarity index 57% rename from pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch rename to pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch index def55bff9b23..19ab1e1e5513 100644 --- a/pkgs/development/libraries/kde-frameworks-5.17/ktexteditor/0001-no-qcoreapplication.patch +++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch @@ -1,17 +1,8 @@ -From dc50fffdc72b76498384ce2f9065c3757b786d71 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 14 Oct 2015 09:08:59 -0500 -Subject: [PATCH] no qcoreapplication - ---- - src/syntax/data/katehighlightingindexer.cpp | 11 ++++------- - 1 file changed, 4 insertions(+), 7 deletions(-) - -diff --git a/src/syntax/data/katehighlightingindexer.cpp b/src/syntax/data/katehighlightingindexer.cpp -index 3c63140..e3d5efe 100644 ---- a/src/syntax/data/katehighlightingindexer.cpp -+++ b/src/syntax/data/katehighlightingindexer.cpp -@@ -51,19 +51,16 @@ QStringList readListing(const QString &fileName) +Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +=================================================================== +--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp ++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp +@@ -55,19 +55,16 @@ QStringList readListing(const QString &f int main(int argc, char *argv[]) { @@ -34,7 +25,7 @@ index 3c63140..e3d5efe 100644 if (hlFilenamesListing.isEmpty()) { return 1; } -@@ -147,7 +144,7 @@ int main(int argc, char *argv[]) +@@ -152,7 +149,7 @@ int main(int argc, char *argv[]) return anyError; // create outfile, after all has worked! @@ -43,6 +34,3 @@ index 3c63140..e3d5efe 100644 if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) return 7; --- -2.5.2 - diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series new file mode 100644 index 000000000000..46cd23829a2f --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series @@ -0,0 +1 @@ +no-qcoreapplication.patch diff --git a/pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/ktextwidgets.nix rename to pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kunitconversion.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kwallet.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kwidgetsaddons.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kwindowsystem.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kxmlgui.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/kxmlrpcclient.nix rename to pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/modemmanager-qt.nix rename to pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/networkmanager-qt.nix rename to pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/oxygen-icons5.nix rename to pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/plasma-framework/default.nix rename to pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/solid.nix b/pkgs/development/libraries/kde-frameworks-5.18/solid.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/solid.nix rename to pkgs/development/libraries/kde-frameworks-5.18/solid.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/sonnet.nix rename to pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix diff --git a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix new file mode 100644 index 000000000000..12c5c30a2471 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix @@ -0,0 +1,565 @@ +# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +{ fetchurl, mirror }: + +{ + attica = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/attica-5.18.0.tar.xz"; + sha256 = "1n6pkaak9xf7nyi0b1wr8fm5qkv7mgpsws9igd7g2xqvvqzyp5xw"; + name = "attica-5.18.0.tar.xz"; + }; + }; + baloo = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/baloo-5.18.0.tar.xz"; + sha256 = "0sdnd6v01rcgq7v2jny0655jrghfamwyj0win7xfhx1622dfi8l8"; + name = "baloo-5.18.0.tar.xz"; + }; + }; + bluez-qt = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz"; + sha256 = "17vx77w4fwdi7y394s2pqph2vmfs8n0107rmz4q7aa62q9iwdrbr"; + name = "bluez-qt-5.18.0.tar.xz"; + }; + }; + breeze-icons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz"; + sha256 = "0a4iqr5zrb56aln5hdsk5zrl23w8w8y5nmrxb093h205r36hfw4z"; + name = "breeze-icons-5.18.0.tar.xz"; + }; + }; + extra-cmake-modules = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz"; + sha256 = "1kp0pysa154cbp1ysgyqk03w8s335v3wmfrx4pshyfpg1s24k83y"; + name = "extra-cmake-modules-5.18.0.tar.xz"; + }; + }; + frameworkintegration = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz"; + sha256 = "06hw885mk0i2173lfdqz3hyp1fx2bndpj00hk32s3i2ggnn2y1rv"; + name = "frameworkintegration-5.18.0.tar.xz"; + }; + }; + kactivities = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kactivities-5.18.0.tar.xz"; + sha256 = "0nqa63ds7vj87zg2gz1mx42c30l3ypfk4ghhgxwziab315bpcpmr"; + name = "kactivities-5.18.0.tar.xz"; + }; + }; + kapidox = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kapidox-5.18.0.tar.xz"; + sha256 = "1hackjnpxijqqpn9cvnwcn9yc0jni21qgjccj74025ihdgigp70s"; + name = "kapidox-5.18.0.tar.xz"; + }; + }; + karchive = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/karchive-5.18.0.tar.xz"; + sha256 = "0ph59w8y49b3znaj9c1qk0zwkg0pmjjcyr4jlv5w56mh0zkq37h5"; + name = "karchive-5.18.0.tar.xz"; + }; + }; + kauth = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kauth-5.18.0.tar.xz"; + sha256 = "14kvy7cbw31sc48f0aldpi52wxhwd69prwadvjhqwy912s8kr04n"; + name = "kauth-5.18.0.tar.xz"; + }; + }; + kbookmarks = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz"; + sha256 = "0qi2f612s756qh5ldibscfhcq8q802vgr2497fm9xl95kfqmcg1n"; + name = "kbookmarks-5.18.0.tar.xz"; + }; + }; + kcmutils = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz"; + sha256 = "1m53308icq1x1877afcxlhygl56dsl50fiwmfjf0g5pfmnql3qfp"; + name = "kcmutils-5.18.0.tar.xz"; + }; + }; + kcodecs = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz"; + sha256 = "1injdpz7kdf2j6is2w3v3xgd9ahgls0j632q03q7qa48xp4wx64h"; + name = "kcodecs-5.18.0.tar.xz"; + }; + }; + kcompletion = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz"; + sha256 = "0gkj4gplm7qwx4nqhhph5h3jp4h8b22ssmw0vvv6bpsnq7idk76b"; + name = "kcompletion-5.18.0.tar.xz"; + }; + }; + kconfig = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kconfig-5.18.0.tar.xz"; + sha256 = "1s7fvhflsvv8zwb9cr50m3hxh0d4z5grh0nkri5ngzqb123wi91n"; + name = "kconfig-5.18.0.tar.xz"; + }; + }; + kconfigwidgets = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz"; + sha256 = "08i12040prs2nxybxbbf3w0n91c9p0c64j8fz18axi4yszrmv8im"; + name = "kconfigwidgets-5.18.0.tar.xz"; + }; + }; + kcoreaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz"; + sha256 = "05y8pan8hdn6qj2si9v9igjrx00l7bqzhdm2qq9vbjrv5xj8axzf"; + name = "kcoreaddons-5.18.0.tar.xz"; + }; + }; + kcrash = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kcrash-5.18.0.tar.xz"; + sha256 = "0rk27zr0mb4jlicm1s175x139avzi0q4jk3mlczfg4rkrxzgbx5w"; + name = "kcrash-5.18.0.tar.xz"; + }; + }; + kdbusaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz"; + sha256 = "0l9ww3zaz1x6bk9axmm6zlj1dcn0gr0z61v9lw5y31rypxclhza8"; + name = "kdbusaddons-5.18.0.tar.xz"; + }; + }; + kdeclarative = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz"; + sha256 = "0mpvwn26msg3sc9z1r1vnw32rkl842jxpvpx2vg8kwcd9snwx9a6"; + name = "kdeclarative-5.18.0.tar.xz"; + }; + }; + kded = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kded-5.18.0.tar.xz"; + sha256 = "0y5sn7yxalylcwcz2j4h349lll2vkf44bw3n6w2cbqqf5wnr2za5"; + name = "kded-5.18.0.tar.xz"; + }; + }; + kdelibs4support = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz"; + sha256 = "0flhhjnnm2wh6869q8gxk45wlpq0679xlklzqlxvqx7a4kxdl8d8"; + name = "kdelibs4support-5.18.0.tar.xz"; + }; + }; + kdesignerplugin = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz"; + sha256 = "163lfx8vxxdhxbn090k5r4m9vy940kfwvsyjsi8v0pp9ww49g13n"; + name = "kdesignerplugin-5.18.0.tar.xz"; + }; + }; + kdesu = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdesu-5.18.0.tar.xz"; + sha256 = "0dqjmvi440p4n62w9y3qw4n7fcivyg3d54fv9nrf1sx87vdw7r83"; + name = "kdesu-5.18.0.tar.xz"; + }; + }; + kdewebkit = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz"; + sha256 = "1ahr62xfk085kb9p2axx04gf7bpnr0vv2d4kpc4s0xrj3xi0alnl"; + name = "kdewebkit-5.18.0.tar.xz"; + }; + }; + kdnssd = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz"; + sha256 = "12vplqfsc3zks1grmb5i4hdww0g51lv54nb1drpj42mzyi1q1v1l"; + name = "kdnssd-5.18.0.tar.xz"; + }; + }; + kdoctools = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz"; + sha256 = "10h74lb4597fs1h88x60ykpkz47pgfa4k04h4i5l0qb5vb1jlw7d"; + name = "kdoctools-5.18.0.tar.xz"; + }; + }; + kemoticons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz"; + sha256 = "0lba6rzmij20ndkq0vw9zkxbjq6g98may3ypyj0kc82d3sw9hkhs"; + name = "kemoticons-5.18.0.tar.xz"; + }; + }; + kfilemetadata = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz"; + sha256 = "19b8nh5x8c0w516afh8ln72vi5dk91wl8bcsqd84h3s6gw55rsm4"; + name = "kfilemetadata-5.18.0.tar.xz"; + }; + }; + kglobalaccel = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz"; + sha256 = "1v22rh8c103zl63cgg4gx430qw29f9yn9k5219pcw5n57jx0n5c1"; + name = "kglobalaccel-5.18.0.tar.xz"; + }; + }; + kguiaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz"; + sha256 = "153mjbiwg4p65c2msj8j3pycn5gys39ahg9ik7jqg7w4cjcl2jxz"; + name = "kguiaddons-5.18.0.tar.xz"; + }; + }; + khtml = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz"; + sha256 = "0kgin1bhbx95kypsg1k318qjxz3258x3a6kkdbky3cvfmq8r5ka5"; + name = "khtml-5.18.0.tar.xz"; + }; + }; + ki18n = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/ki18n-5.18.0.tar.xz"; + sha256 = "14vlq49a0bp1vpjb2zxkgqsd5yjmb0azri2iq9sgxxx1v6gyy9h9"; + name = "ki18n-5.18.0.tar.xz"; + }; + }; + kiconthemes = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz"; + sha256 = "10pj2q28y57ng26xg2211v9vy91hqqmcyxh90q1qj89clykimwid"; + name = "kiconthemes-5.18.0.tar.xz"; + }; + }; + kidletime = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kidletime-5.18.0.tar.xz"; + sha256 = "0726nq508rpzjxvfp354jd8n14m49grv6nfv09q2zyw02cf6n9bi"; + name = "kidletime-5.18.0.tar.xz"; + }; + }; + kimageformats = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz"; + sha256 = "1y6zc04sx4sqyfavr8nf05a1p4kyb8ic335iy5s869r6zrvljpnc"; + name = "kimageformats-5.18.0.tar.xz"; + }; + }; + kinit = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kinit-5.18.0.tar.xz"; + sha256 = "142xm7yglssw771340bs0lk1xgsr53218zh87v6n9hchrd34zg08"; + name = "kinit-5.18.0.tar.xz"; + }; + }; + kio = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kio-5.18.0.tar.xz"; + sha256 = "020gvxs5xp9v4pra814200nv79c9b9j59skbrxq9cazhnywnnlns"; + name = "kio-5.18.0.tar.xz"; + }; + }; + kitemmodels = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz"; + sha256 = "0r5r7ia1lwqll6bz92k4qgj737hsg6pfhxmycr6g88b9fiab1qw4"; + name = "kitemmodels-5.18.0.tar.xz"; + }; + }; + kitemviews = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz"; + sha256 = "10pbh0fpzrh0ijbadjx81690p9iw34rs2waks99fc0jy3hamny3b"; + name = "kitemviews-5.18.0.tar.xz"; + }; + }; + kjobwidgets = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz"; + sha256 = "0gxvh9wxnfkrxm9zc7yx579vlxs3xmihfyqs92fpkjhy2shfd2sg"; + name = "kjobwidgets-5.18.0.tar.xz"; + }; + }; + kjs = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz"; + sha256 = "0z89l2yhs3vld1qbd6v506lksmxvwrzgdq77aghy3mbkfgz3jd62"; + name = "kjs-5.18.0.tar.xz"; + }; + }; + kjsembed = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz"; + sha256 = "0mpq7aywspm6l13afrr2dis8ygyld5il21g90ij0fc1jwp95zk3d"; + name = "kjsembed-5.18.0.tar.xz"; + }; + }; + kmediaplayer = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz"; + sha256 = "07m3agz73yzmfn8ykg0f6a2c39rkzchzqc1iam2zfydqxyvh4bxb"; + name = "kmediaplayer-5.18.0.tar.xz"; + }; + }; + knewstuff = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz"; + sha256 = "0mda1n0py6nm9wp89z5hkhhk9ah5sjrkzl1dshd4lq77f7p7i1g4"; + name = "knewstuff-5.18.0.tar.xz"; + }; + }; + knotifications = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/knotifications-5.18.0.tar.xz"; + sha256 = "1npir2v4irhm6xmzf60aj5388slq6fw7jbcwjjscldrwk2ca06hz"; + name = "knotifications-5.18.0.tar.xz"; + }; + }; + knotifyconfig = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz"; + sha256 = "0q2735m2m1wrnp7g4ycnbjy7qgpjxc5fvx9zrwnd0jl5rmdw4sbb"; + name = "knotifyconfig-5.18.0.tar.xz"; + }; + }; + kpackage = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kpackage-5.18.0.tar.xz"; + sha256 = "14q2ssf3g7ljakzpq7q9q2zbm8jqk01ybjx4s16qpw9gakcrbli9"; + name = "kpackage-5.18.0.tar.xz"; + }; + }; + kparts = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kparts-5.18.0.tar.xz"; + sha256 = "1q4xd4dy40mh4a8vgpvdamy1242isjy9ma94cf95qqc6qgjnqxhy"; + name = "kparts-5.18.0.tar.xz"; + }; + }; + kpeople = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kpeople-5.18.0.tar.xz"; + sha256 = "0d0mp2qz3f1bki6rfw8x6zc0rmv4n43mi06k3vh30qpiaj7crl5k"; + name = "kpeople-5.18.0.tar.xz"; + }; + }; + kplotting = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kplotting-5.18.0.tar.xz"; + sha256 = "1jiqx9gdv69frfh8vanphp6lzc3vxn2q1lhibi7v03qkc2qaw5cc"; + name = "kplotting-5.18.0.tar.xz"; + }; + }; + kpty = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kpty-5.18.0.tar.xz"; + sha256 = "1baz1xs22r4qli74sqwpcjmxnfrd0iqyyzg1fmljr8fvs4pdy1x1"; + name = "kpty-5.18.0.tar.xz"; + }; + }; + kross = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz"; + sha256 = "1ky13yqxhkghxqd21jrnrpjfnrkgspv0p3dfij994rkaqq8rm1r6"; + name = "kross-5.18.0.tar.xz"; + }; + }; + krunner = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz"; + sha256 = "14c51kiwr49dbdxg8y6ivmmfr9h6p8jjd32k35pi4gpi2vlh29pf"; + name = "krunner-5.18.0.tar.xz"; + }; + }; + kservice = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kservice-5.18.0.tar.xz"; + sha256 = "0pbs1n2i7vjgjh7j87ps8gkzmj5igw1aib1aq089m4hfrl8pbrq8"; + name = "kservice-5.18.0.tar.xz"; + }; + }; + ktexteditor = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz"; + sha256 = "0fx82s5y1wya3v36qq3agmfrnff9a7v94fhifvfiwmhk2ddwwg3v"; + name = "ktexteditor-5.18.0.tar.xz"; + }; + }; + ktextwidgets = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz"; + sha256 = "1wflqfmgqa3lh3apf22sami6caclvyv7li6qiskwfkzkb0a6x373"; + name = "ktextwidgets-5.18.0.tar.xz"; + }; + }; + kunitconversion = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz"; + sha256 = "0gpmndyly977dzfyfhrd0q434c0qr1sinh75dwf9clmqw576jl6i"; + name = "kunitconversion-5.18.0.tar.xz"; + }; + }; + kwallet = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kwallet-5.18.0.tar.xz"; + sha256 = "0w69y0xdvvrvcydv160z7s03y1n5vxjj3sfk530zc6bjszplvxis"; + name = "kwallet-5.18.0.tar.xz"; + }; + }; + kwidgetsaddons = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz"; + sha256 = "06fqz7cwczp5sahg54zi46rf9jf2si88w5yizp61z8yv57kvpvk1"; + name = "kwidgetsaddons-5.18.0.tar.xz"; + }; + }; + kwindowsystem = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz"; + sha256 = "01hzd4r8y4hdpynnh32qf418hxzbd67fkdq6a4vabl384aipnmk7"; + name = "kwindowsystem-5.18.0.tar.xz"; + }; + }; + kxmlgui = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz"; + sha256 = "0yimy0r73sv8z4wq0mkdx24icjrzmy5bciblwlnzagd61f8j8qri"; + name = "kxmlgui-5.18.0.tar.xz"; + }; + }; + kxmlrpcclient = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz"; + sha256 = "0h88pc3h5z3q58b7qxdn69klwr0p9ffbirzncyvxjrhr7dq36nv9"; + name = "kxmlrpcclient-5.18.0.tar.xz"; + }; + }; + modemmanager-qt = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz"; + sha256 = "09k07wxkn511sa4hwmrs6jfx4lnnw3zcac5dzz43hhsmw74yj9az"; + name = "modemmanager-qt-5.18.0.tar.xz"; + }; + }; + networkmanager-qt = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz"; + sha256 = "11j818ws5jz23hyilfpf3npk893hs388v1xpwhh0lkjwm60wkzln"; + name = "networkmanager-qt-5.18.0.tar.xz"; + }; + }; + oxygen-icons5 = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz"; + sha256 = "11zmxc9n7x6iwdckwxwjji0497yjcsjli7pzr8d049lbc7xsjvi8"; + name = "oxygen-icons5-5.18.0.tar.xz"; + }; + }; + plasma-framework = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz"; + sha256 = "1lxhlzx3jcqzx90kjl8w8p53nrgrkjiz1xf92ah3mygjyvi5rlh8"; + name = "plasma-framework-5.18.0.tar.xz"; + }; + }; + solid = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/solid-5.18.0.tar.xz"; + sha256 = "0ilki4s3f3gjsdj6z41a8k4h2b52w8xrh2api0sqj0ifk2yhx6wh"; + name = "solid-5.18.0.tar.xz"; + }; + }; + sonnet = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/sonnet-5.18.0.tar.xz"; + sha256 = "1780jvsfkasabdbk9xjhjcihcc6mxxipi2rsq2001flxnnx4kykg"; + name = "sonnet-5.18.0.tar.xz"; + }; + }; + threadweaver = { + version = "5.18.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz"; + sha256 = "00c9vvyhyysg0cdlmvpls0h3pdbbhhwfxlm9l9i9r3j8x6rigm54"; + name = "threadweaver-5.18.0.tar.xz"; + }; + }; +} diff --git a/pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix similarity index 100% rename from pkgs/development/libraries/kde-frameworks-5.17/threadweaver.nix rename to pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3b6afd5e359..149d93722eba 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14812,7 +14812,7 @@ let kde5 = let - frameworks = import ../development/libraries/kde-frameworks-5.17 { inherit pkgs; }; + frameworks = import ../development/libraries/kde-frameworks-5.18 { 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; }; @@ -14821,16 +14821,7 @@ let in recurseIntoAttrs (lib.makeScope qt55.newScope merged); - kde5_latest = - let - frameworks = import ../development/libraries/kde-frameworks-5.17 { 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; }; - merged = self: - named self // frameworks self // plasma self // apps self // kde5PackagesFun self; - in - recurseIntoAttrs (lib.makeScope qt55.newScope merged); + kde5_latest = kde5; theme-vertex = callPackage ../misc/themes/vertex { };