From 953461a1652d24f7b7f484569e9de0eaa3fb4538 Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Tue, 24 Nov 2020 19:49:12 +0000 Subject: [PATCH 01/36] kde-frameworks: 5.73 -> 5.76 --- .../libraries/kde-frameworks/fetch.sh | 2 +- .../kwindowsystem/platform-plugins-path.patch | 46 +- .../libraries/kde-frameworks/srcs.nix | 666 +++++++++--------- 3 files changed, 367 insertions(+), 347 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 839b2eb466d..ea38934b000 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/) +WGET_ARGS=(https://download.kde.org/stable/frameworks/5.76/) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch index 27501732210..9a00f7e9452 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch @@ -1,25 +1,45 @@ -Index: kwindowsystem-5.64.0/src/pluginwrapper.cpp -=================================================================== ---- kwindowsystem-5.64.0.orig/src/pluginwrapper.cpp -+++ kwindowsystem-5.64.0/src/pluginwrapper.cpp -@@ -37,16 +37,10 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapp +From 5d73d02656298d0af860c8ed7f6be679e3d69e09 Mon Sep 17 00:00:00 2001 +From: Tom Hall +Date: Tue, 24 Nov 2020 19:31:20 +0000 +Subject: [PATCH] Fix platform plugins path + +--- + src/pluginwrapper.cpp | 22 ++++++---------------- + 1 file changed, 6 insertions(+), 16 deletions(-) + +diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp +index a255d83..8f4caac 100644 +--- a/src/pluginwrapper.cpp ++++ b/src/pluginwrapper.cpp +@@ -24,22 +24,12 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper) static QStringList pluginCandidates() { QStringList ret; - const auto paths = QCoreApplication::libraryPaths(); - for (const QString &path : paths) { -- QDir pluginDir(path + QLatin1String("/kf5/org.kde.kwindowsystem.platforms")); -- if (!pluginDir.exists()) { -- continue; +- static const QStringList searchFolders { +- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), +- QStringLiteral("/kf5/kwindowsystem"), +- }; +- for (const QString &searchFolder : searchFolders) { +- QDir pluginDir(path + searchFolder); +- if (!pluginDir.exists()) { +- continue; +- } +- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); +- for (const QString &entry : entries) { +- ret << pluginDir.absoluteFilePath(entry); +- } - } -- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -- for (const QString &entry : entries) { -- ret << pluginDir.absoluteFilePath(entry); -- } -+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms")); ++ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) ++ + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms") ++ + QLatin1Literal("/kf5/kwindowsystem")); + const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); + for (const QString &entry : entries) { + ret << pluginDir.absoluteFilePath(entry); } return ret; } +-- +2.28.0 + diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 070b11f6bfb..dbc74b83112 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -1,670 +1,670 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/kde-frameworks/ { fetchurl, mirror }: { attica = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz"; - sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a"; - name = "attica-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/attica-5.76.0.tar.xz"; + sha256 = "64b262f61935653b91a83f4d1c659e7dcaf575b12aa955fe16d8392adb256e22"; + name = "attica-5.76.0.tar.xz"; }; }; baloo = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz"; - sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe"; - name = "baloo-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/baloo-5.76.0.tar.xz"; + sha256 = "8ae9e6dd51c84150f7fc581ebf04617f3ee9e1f96e08df79d6f15ee29f5f95f9"; + name = "baloo-5.76.0.tar.xz"; }; }; bluez-qt = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz"; - sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4"; - name = "bluez-qt-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/bluez-qt-5.76.0.tar.xz"; + sha256 = "a3f99a10e5f018bac91b4bd88be23a6ea9399aa1ab29d16840d5ee2c20537835"; + name = "bluez-qt-5.76.0.tar.xz"; }; }; breeze-icons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz"; - sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b"; - name = "breeze-icons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/breeze-icons-5.76.0.tar.xz"; + sha256 = "d0211f0e6fa9137dbb42bcad1ac352bbfe793b6a3e6483adc2051b5c24a7851b"; + name = "breeze-icons-5.76.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz"; - sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4"; - name = "extra-cmake-modules-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/extra-cmake-modules-5.76.0.tar.xz"; + sha256 = "4845e9e0a43ba15158c0cfdc7ab594e7d02692fab9083201715270a096704a32"; + name = "extra-cmake-modules-5.76.0.tar.xz"; }; }; frameworkintegration = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz"; - sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3"; - name = "frameworkintegration-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/frameworkintegration-5.76.0.tar.xz"; + sha256 = "7ac6c070190ab4c0c2ac15a921886ed7f3b70d6a0b7c41766d21a913e9f086fb"; + name = "frameworkintegration-5.76.0.tar.xz"; }; }; kactivities = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz"; - sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a"; - name = "kactivities-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kactivities-5.76.0.tar.xz"; + sha256 = "efba13d0d720502bf8bee161b688ba21704f7c213c8b95da65b77b76c9cb3422"; + name = "kactivities-5.76.0.tar.xz"; }; }; kactivities-stats = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz"; - sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a"; - name = "kactivities-stats-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kactivities-stats-5.76.0.tar.xz"; + sha256 = "85bb432a10a48af505a457c7ccacffad7914835f94042472083e878cabcd2c14"; + name = "kactivities-stats-5.76.0.tar.xz"; }; }; kapidox = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz"; - sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5"; - name = "kapidox-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kapidox-5.76.0.tar.xz"; + sha256 = "8c6c9401059d34fa2d7f052e21387d803a1131a60fcd1305ddf5d5dfe22c6d97"; + name = "kapidox-5.76.0.tar.xz"; }; }; karchive = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz"; - sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f"; - name = "karchive-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/karchive-5.76.0.tar.xz"; + sha256 = "503d33b247ae24260c73aac2c48601eb4f8be3f10c9149549ea5dd2d22082a2a"; + name = "karchive-5.76.0.tar.xz"; }; }; kauth = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz"; - sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9"; - name = "kauth-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kauth-5.76.0.tar.xz"; + sha256 = "c277a7ab750158a56381d8f74b8ebed5205b785eca2444c65cbf59d429958a89"; + name = "kauth-5.76.0.tar.xz"; }; }; kbookmarks = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz"; - sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51"; - name = "kbookmarks-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kbookmarks-5.76.0.tar.xz"; + sha256 = "ac5416f1ac21cb9e9fdf72a95de855a9891cea0ed7e1436a93c019b6c45af2af"; + name = "kbookmarks-5.76.0.tar.xz"; }; }; kcalendarcore = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz"; - sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713"; - name = "kcalendarcore-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcalendarcore-5.76.0.tar.xz"; + sha256 = "e6fd390b8ba2a899e7abda3de8d9ab7e5155fede6bbee9ca2b302b931a0232ae"; + name = "kcalendarcore-5.76.0.tar.xz"; }; }; kcmutils = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz"; - sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9"; - name = "kcmutils-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcmutils-5.76.0.tar.xz"; + sha256 = "0ea51ea9e46e6359c76fe099fd2cd03c20891a1cad26ea156ca921a9f0869009"; + name = "kcmutils-5.76.0.tar.xz"; }; }; kcodecs = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz"; - sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67"; - name = "kcodecs-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcodecs-5.76.0.tar.xz"; + sha256 = "b4e1fe3247fdaf80f4414716f6fbcd42e8de04f64c8dd50bd13e9e9a78abf6e1"; + name = "kcodecs-5.76.0.tar.xz"; }; }; kcompletion = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz"; - sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a"; - name = "kcompletion-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcompletion-5.76.0.tar.xz"; + sha256 = "014c56172040bf3aa27f81a6bb433914a5c22d2dfb1f8566be4cce678d09193a"; + name = "kcompletion-5.76.0.tar.xz"; }; }; kconfig = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz"; - sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e"; - name = "kconfig-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kconfig-5.76.0.tar.xz"; + sha256 = "153d3ed114954594b0dcc00e1317483609649c064203e6eb8b110686dbaba686"; + name = "kconfig-5.76.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz"; - sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e"; - name = "kconfigwidgets-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kconfigwidgets-5.76.0.tar.xz"; + sha256 = "f8eed399008a041df2da9cc3f2313df11376b94c85472900b39b9d6abcabe6d4"; + name = "kconfigwidgets-5.76.0.tar.xz"; }; }; kcontacts = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz"; - sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb"; - name = "kcontacts-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcontacts-5.76.0.tar.xz"; + sha256 = "4a9e3189b4ed1bc0231bf98cba134e78e5a692a14d202f0311f6e5c5190cfad5"; + name = "kcontacts-5.76.0.tar.xz"; }; }; kcoreaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz"; - sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51"; - name = "kcoreaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcoreaddons-5.76.0.tar.xz"; + sha256 = "fbab3e3e18f42922ecdc50138ed31f62007cafa902b959d89b1233b5557282d6"; + name = "kcoreaddons-5.76.0.tar.xz"; }; }; kcrash = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz"; - sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583"; - name = "kcrash-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kcrash-5.76.0.tar.xz"; + sha256 = "c4e32254b22f1f02db556be2ad40000cc52cac2e30a35682af3c75ac69710993"; + name = "kcrash-5.76.0.tar.xz"; }; }; kdav = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz"; - sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31"; - name = "kdav-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdav-5.76.0.tar.xz"; + sha256 = "c6b1d32d9c976585e278c2061091ee90ef2d7feb29642f236a3941cea5ffae72"; + name = "kdav-5.76.0.tar.xz"; }; }; kdbusaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz"; - sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba"; - name = "kdbusaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdbusaddons-5.76.0.tar.xz"; + sha256 = "8e11b19e4a3d4ad8e4deda245eb51b7b77255cbacc07346e7074c8110b946e0a"; + name = "kdbusaddons-5.76.0.tar.xz"; }; }; kdeclarative = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz"; - sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598"; - name = "kdeclarative-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdeclarative-5.76.0.tar.xz"; + sha256 = "3dfaa271a97be48e72d5fff0dd3c3c1995be3b9e7d0451b197b79418d76c4ce3"; + name = "kdeclarative-5.76.0.tar.xz"; }; }; kded = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz"; - sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895"; - name = "kded-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kded-5.76.0.tar.xz"; + sha256 = "2e94a4737ffc359d3614a1dff15b9727d54cb5fe639828946e0efcdcdbff3516"; + name = "kded-5.76.0.tar.xz"; }; }; kdelibs4support = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz"; - sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b"; - name = "kdelibs4support-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kdelibs4support-5.76.0.tar.xz"; + sha256 = "b581273dfaebc5697eb7aa616d858119227dd6c5b781f216abdbff1d93076f0d"; + name = "kdelibs4support-5.76.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz"; - sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2"; - name = "kdesignerplugin-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kdesignerplugin-5.76.0.tar.xz"; + sha256 = "5f9190e00761330c031310b94e195766e639115675081765050ddc55069a1b71"; + name = "kdesignerplugin-5.76.0.tar.xz"; }; }; kdesu = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz"; - sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d"; - name = "kdesu-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdesu-5.76.0.tar.xz"; + sha256 = "421ef43bd47c3eb6b05806af033276c19df20fd76a06b67fada529bb9c52e642"; + name = "kdesu-5.76.0.tar.xz"; }; }; kdewebkit = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz"; - sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b"; - name = "kdewebkit-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kdewebkit-5.76.0.tar.xz"; + sha256 = "cf7de765c5fcad0922a1bb9376b65cfb00eb3d29a0c4ed8ef43fc363abe906ba"; + name = "kdewebkit-5.76.0.tar.xz"; }; }; kdnssd = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz"; - sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d"; - name = "kdnssd-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdnssd-5.76.0.tar.xz"; + sha256 = "9cc2979e56915b5c4d8f8e66053a41406bff46aefd65af1ab07d2b87d8f4a753"; + name = "kdnssd-5.76.0.tar.xz"; }; }; kdoctools = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz"; - sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d"; - name = "kdoctools-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kdoctools-5.76.0.tar.xz"; + sha256 = "84ea7974d741e6261e8c269750367a00375c6111dbc542e917647d0267337ae4"; + name = "kdoctools-5.76.0.tar.xz"; }; }; kemoticons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz"; - sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778"; - name = "kemoticons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kemoticons-5.76.0.tar.xz"; + sha256 = "a50f69e62b342d6f058000ff1823569ab61d3310cb0020d848a78deaf20dff99"; + name = "kemoticons-5.76.0.tar.xz"; }; }; kfilemetadata = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz"; - sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894"; - name = "kfilemetadata-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kfilemetadata-5.76.0.tar.xz"; + sha256 = "fa24758c93ce3df9f8ced4310dc0bf58e129b08e50f254daafa025afc9213d68"; + name = "kfilemetadata-5.76.0.tar.xz"; }; }; kglobalaccel = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz"; - sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f"; - name = "kglobalaccel-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kglobalaccel-5.76.0.tar.xz"; + sha256 = "3a846f783ccb68da1f152fb5778612c4ed14cd79c6b5929ef729cf59e47462d4"; + name = "kglobalaccel-5.76.0.tar.xz"; }; }; kguiaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz"; - sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350"; - name = "kguiaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kguiaddons-5.76.0.tar.xz"; + sha256 = "bdaa2ed104bfa9c2ebd702f033935a83560e1d00c7302620a6ae52cb309c7125"; + name = "kguiaddons-5.76.0.tar.xz"; }; }; kholidays = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz"; - sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab"; - name = "kholidays-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kholidays-5.76.0.tar.xz"; + sha256 = "2eeae5812b33b2527c27a137fee0d7ec66fe7164bd28afd0d2a8362f6114618b"; + name = "kholidays-5.76.0.tar.xz"; }; }; khtml = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz"; - sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262"; - name = "khtml-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/khtml-5.76.0.tar.xz"; + sha256 = "163139cf9ed9c43bba9532e64ae6376e8ced9b19ea8bb8235ff91c91c4c5a3f4"; + name = "khtml-5.76.0.tar.xz"; }; }; ki18n = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz"; - sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689"; - name = "ki18n-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/ki18n-5.76.0.tar.xz"; + sha256 = "0e87bc1136e21f7860f15daa39e8d16e5a773995fce2b87b0cef0043c4ce0e7a"; + name = "ki18n-5.76.0.tar.xz"; }; }; kiconthemes = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz"; - sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356"; - name = "kiconthemes-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kiconthemes-5.76.0.tar.xz"; + sha256 = "3b3c4ab8369061418677c840963cc868dcecc2a4e57f0c73448e16a46773c7d3"; + name = "kiconthemes-5.76.0.tar.xz"; }; }; kidletime = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz"; - sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2"; - name = "kidletime-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kidletime-5.76.0.tar.xz"; + sha256 = "0866fc98b5b045158742f03f5810909b24f1edf374a6014d476d67fe0466eb62"; + name = "kidletime-5.76.0.tar.xz"; }; }; kimageformats = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz"; - sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b"; - name = "kimageformats-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kimageformats-5.76.0.tar.xz"; + sha256 = "78ced2665f8918beb617b74962d188dcbb01a92a90ba49bfd173671bdb14e68d"; + name = "kimageformats-5.76.0.tar.xz"; }; }; kinit = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz"; - sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770"; - name = "kinit-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kinit-5.76.0.tar.xz"; + sha256 = "a5b63c10b4fc5efcbb5f92b7bce928b4a4880c0ad5d12ff12518106b09239546"; + name = "kinit-5.76.0.tar.xz"; }; }; kio = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz"; - sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66"; - name = "kio-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kio-5.76.0.tar.xz"; + sha256 = "9351fc85c4020f2f77012e077f4f9d04d8f233e9b67f9b7619c9bc064714145b"; + name = "kio-5.76.0.tar.xz"; }; }; kirigami2 = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz"; - sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb"; - name = "kirigami2-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kirigami2-5.76.0.tar.xz"; + sha256 = "90806125143807b74ee7f2fc74cd781d99b4e69ce5f15dcc28e1923f7a34a80a"; + name = "kirigami2-5.76.0.tar.xz"; }; }; kitemmodels = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz"; - sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371"; - name = "kitemmodels-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kitemmodels-5.76.0.tar.xz"; + sha256 = "53855ccdd1105aa792914f9c88f357039bf2394af8400beaaecd9729f70e9cb0"; + name = "kitemmodels-5.76.0.tar.xz"; }; }; kitemviews = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz"; - sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727"; - name = "kitemviews-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kitemviews-5.76.0.tar.xz"; + sha256 = "b102cb67513d804fd7eed2ae20bb4ba679d38de4f236de6bc03709ff0c0bc001"; + name = "kitemviews-5.76.0.tar.xz"; }; }; kjobwidgets = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz"; - sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf"; - name = "kjobwidgets-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kjobwidgets-5.76.0.tar.xz"; + sha256 = "850b6af6c027476e594e6ed77ea0e531abb69ff726fce41b91e541fbee3ecedf"; + name = "kjobwidgets-5.76.0.tar.xz"; }; }; kjs = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz"; - sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5"; - name = "kjs-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kjs-5.76.0.tar.xz"; + sha256 = "829eb1308b9b07cdd07b34d80eb5e3fcf5225fa4816da19bce886add600bb62a"; + name = "kjs-5.76.0.tar.xz"; }; }; kjsembed = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz"; - sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3"; - name = "kjsembed-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kjsembed-5.76.0.tar.xz"; + sha256 = "d7fe11b69445afe372388c5ab310d38ab69e203f3995136a948c9bbf9b8b4a88"; + name = "kjsembed-5.76.0.tar.xz"; }; }; kmediaplayer = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz"; - sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2"; - name = "kmediaplayer-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kmediaplayer-5.76.0.tar.xz"; + sha256 = "3185da877c2529c6e209cb382593bbb4778f80aee1b1a29b384b3f05ff99ed89"; + name = "kmediaplayer-5.76.0.tar.xz"; }; }; knewstuff = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz"; - sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e"; - name = "knewstuff-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/knewstuff-5.76.0.tar.xz"; + sha256 = "d6589b420204d1133997f33b598324c839ec6a0db96936e2e51b7b156cafbc6b"; + name = "knewstuff-5.76.0.tar.xz"; }; }; knotifications = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz"; - sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c"; - name = "knotifications-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/knotifications-5.76.0.tar.xz"; + sha256 = "56a7daf4951b3564e244d8ba48d443e78c6d703d9d4ccc280c56d0c986de47a2"; + name = "knotifications-5.76.0.tar.xz"; }; }; knotifyconfig = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz"; - sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4"; - name = "knotifyconfig-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/knotifyconfig-5.76.0.tar.xz"; + sha256 = "9f98834a9b8135a60a5d67e7ac45229a668a889d42a14c2ca5365885acd2370e"; + name = "knotifyconfig-5.76.0.tar.xz"; }; }; kpackage = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz"; - sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f"; - name = "kpackage-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kpackage-5.76.0.tar.xz"; + sha256 = "97791ef08ca18892d6aa6a50fa0a87ae72cad10de9f17e3fb503a370de829772"; + name = "kpackage-5.76.0.tar.xz"; }; }; kparts = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz"; - sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2"; - name = "kparts-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kparts-5.76.0.tar.xz"; + sha256 = "c516b5c1f2bca4a109dc2d186ef6729c1ad53a242877dfe942b84f131e93412d"; + name = "kparts-5.76.0.tar.xz"; }; }; kpeople = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz"; - sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4"; - name = "kpeople-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kpeople-5.76.0.tar.xz"; + sha256 = "25c03e48a0951f2d17556912893f55750ffbc1333b07b9b42e2ff0bb571b6545"; + name = "kpeople-5.76.0.tar.xz"; }; }; kplotting = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz"; - sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14"; - name = "kplotting-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kplotting-5.76.0.tar.xz"; + sha256 = "536e0eb7b35700ffe91fccce37386f9b97214cd9bd41bea7f2bb333a49d7ec9e"; + name = "kplotting-5.76.0.tar.xz"; }; }; kpty = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz"; - sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c"; - name = "kpty-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kpty-5.76.0.tar.xz"; + sha256 = "faa143bdceb02156ba2f989128376b97161c9799952a3517240816a42abe1ac7"; + name = "kpty-5.76.0.tar.xz"; }; }; kquickcharts = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz"; - sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe"; - name = "kquickcharts-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kquickcharts-5.76.0.tar.xz"; + sha256 = "65e79e0b4a8f1bca579931d0c0f8345c58f27319bf332e05a32ec930b8e519c2"; + name = "kquickcharts-5.76.0.tar.xz"; }; }; kross = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz"; - sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e"; - name = "kross-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kross-5.76.0.tar.xz"; + sha256 = "15591f2a50f995bcaf17ef72662851c805d4644f13848387f056f686b77c5291"; + name = "kross-5.76.0.tar.xz"; }; }; krunner = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz"; - sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09"; - name = "krunner-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/krunner-5.76.0.tar.xz"; + sha256 = "08c8addcdd3dac87472e84bd14c6d02b99f98c5efbbda7802de92286105dcdda"; + name = "krunner-5.76.0.tar.xz"; }; }; kservice = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz"; - sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b"; - name = "kservice-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kservice-5.76.0.tar.xz"; + sha256 = "ef7715e5d3e0bf4fc2d28a7713913a1283fb9c658b3c3536a6db8da649d185bf"; + name = "kservice-5.76.0.tar.xz"; }; }; ktexteditor = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz"; - sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18"; - name = "ktexteditor-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/ktexteditor-5.76.0.tar.xz"; + sha256 = "6f937b7af06562a238f091deef9c4332e94311a697af8466b7f091720eaab2b2"; + name = "ktexteditor-5.76.0.tar.xz"; }; }; ktextwidgets = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz"; - sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5"; - name = "ktextwidgets-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/ktextwidgets-5.76.0.tar.xz"; + sha256 = "a104e894cf21c245a6c22e6f2c38fdbbdb094cb7fde3d7ebff801bfd73af4c84"; + name = "ktextwidgets-5.76.0.tar.xz"; }; }; kunitconversion = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz"; - sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935"; - name = "kunitconversion-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kunitconversion-5.76.0.tar.xz"; + sha256 = "31fa05b082ec3a42c831b840cbc086f97c5e49c05a71af29ab35b9727320990c"; + name = "kunitconversion-5.76.0.tar.xz"; }; }; kwallet = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz"; - sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1"; - name = "kwallet-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwallet-5.76.0.tar.xz"; + sha256 = "5addd560d3f650fbb43cd9c8c9e964c2d6893fa45ac53420b711f6bbb4e7a4fc"; + name = "kwallet-5.76.0.tar.xz"; }; }; kwayland = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz"; - sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe"; - name = "kwayland-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwayland-5.76.0.tar.xz"; + sha256 = "eee72a5f57a2f5c6ab5f1717aa3eb5a9089240794a5e40c6d85bdc37fa3027a7"; + name = "kwayland-5.76.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz"; - sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6"; - name = "kwidgetsaddons-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwidgetsaddons-5.76.0.tar.xz"; + sha256 = "ab7aa94bb1f63e5bea5cf461349c1add96fd608a73c5b7c9d374e6bf035fcac6"; + name = "kwidgetsaddons-5.76.0.tar.xz"; }; }; kwindowsystem = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz"; - sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8"; - name = "kwindowsystem-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kwindowsystem-5.76.0.tar.xz"; + sha256 = "8dced74012bed3f33c3c51874aa9c3a57093573c1c0e263b758cefa96c26f7b7"; + name = "kwindowsystem-5.76.0.tar.xz"; }; }; kxmlgui = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz"; - sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb"; - name = "kxmlgui-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/kxmlgui-5.76.0.tar.xz"; + sha256 = "73ae838fb79f97243bea36d438e9bc45315183bbb6b08ab5173c822cfcb4dd82"; + name = "kxmlgui-5.76.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz"; - sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047"; - name = "kxmlrpcclient-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/portingAids/kxmlrpcclient-5.76.0.tar.xz"; + sha256 = "66fe826a81cd266ee57ba814cb8c7adfa00aa9112cb55714db061a82895ee8de"; + name = "kxmlrpcclient-5.76.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz"; - sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd"; - name = "modemmanager-qt-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/modemmanager-qt-5.76.0.tar.xz"; + sha256 = "5782b71f60b825244dc017989a4de515eb9eb5cc4edfe494a14ea62d3ac40cd1"; + name = "modemmanager-qt-5.76.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz"; - sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f"; - name = "networkmanager-qt-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/networkmanager-qt-5.76.0.tar.xz"; + sha256 = "5920862a843898ed169cc61a8f27dd87cb64dd505ec300d95ab8967da89f2f90"; + name = "networkmanager-qt-5.76.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz"; - sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc"; - name = "oxygen-icons5-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/oxygen-icons5-5.76.0.tar.xz"; + sha256 = "95ca95bada43281d09cce000c9cd645af67592205c971052b3e0c27aef9c95b1"; + name = "oxygen-icons5-5.76.0.tar.xz"; }; }; plasma-framework = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz"; - sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93"; - name = "plasma-framework-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/plasma-framework-5.76.0.tar.xz"; + sha256 = "5bea341bc7b22ffa6a78bf7475c25b138150314c96b3d5154d8bccc532be242a"; + name = "plasma-framework-5.76.0.tar.xz"; }; }; prison = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz"; - sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87"; - name = "prison-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/prison-5.76.0.tar.xz"; + sha256 = "6c369efc354f8f3a0e08b0de565fd523f1480d563bec0d19382e9ab01f3efb78"; + name = "prison-5.76.0.tar.xz"; }; }; purpose = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz"; - sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32"; - name = "purpose-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/purpose-5.76.0.tar.xz"; + sha256 = "fd0edb0e7ba8b5336436848fe2452ff98c1b5bf2c49ea7744a8c0038d4e8887d"; + name = "purpose-5.76.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz"; - sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd"; - name = "qqc2-desktop-style-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/qqc2-desktop-style-5.76.0.tar.xz"; + sha256 = "76d2f85f6f99157aec26e6797889f1b99035a337e8aa12029c222f3d48288ef3"; + name = "qqc2-desktop-style-5.76.0.tar.xz"; }; }; solid = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz"; - sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933"; - name = "solid-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/solid-5.76.0.tar.xz"; + sha256 = "7958d047c8bd7622f91541acbe2d554c222218419ee18f395059a09fb90d264d"; + name = "solid-5.76.0.tar.xz"; }; }; sonnet = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz"; - sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c"; - name = "sonnet-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/sonnet-5.76.0.tar.xz"; + sha256 = "cb6bacae27cfa3f8b3ce300b18efe16730783f143c4a7fccfa634f528262ef9b"; + name = "sonnet-5.76.0.tar.xz"; }; }; syndication = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz"; - sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954"; - name = "syndication-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/syndication-5.76.0.tar.xz"; + sha256 = "239ec30ff8f7ad2911ecc6b9b9c32f2b44c6cad634900105936ae56bf96d6292"; + name = "syndication-5.76.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz"; - sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b"; - name = "syntax-highlighting-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/syntax-highlighting-5.76.0.tar.xz"; + sha256 = "3cb61a8c478b76f797db53ed9e8a16c6e70bb1c564f05938680db81c3062bab3"; + name = "syntax-highlighting-5.76.0.tar.xz"; }; }; threadweaver = { - version = "5.73.0"; + version = "5.76.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz"; - sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38"; - name = "threadweaver-5.73.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.76/threadweaver-5.76.0.tar.xz"; + sha256 = "8bc0cc4507b4cd7398e18cce8519b4a65b0367e7d22c4faae034a57346297039"; + name = "threadweaver-5.76.0.tar.xz"; }; }; } From a604b073b7516e4f237a8c23bca1f1fe54d5f8aa Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sat, 5 Sep 2020 15:18:05 +0100 Subject: [PATCH 02/36] plasma5: 5.18.5 -> 5.20.3 --- pkgs/desktops/plasma-5/default.nix | 1 + pkgs/desktops/plasma-5/fetch.sh | 2 +- ...TARGETS_DEFAULT_ARGS-when-installing.patch | 25 ++ .../plasma-5/kwayland-server/default.nix | 18 + pkgs/desktops/plasma-5/kwin/default.nix | 4 +- .../plasma-5/libksysguard/default.nix | 4 +- .../plasma-5/plasma-desktop/default.nix | 4 +- .../plasma-workspace/0001-startkde.patch | 59 +-- pkgs/desktops/plasma-5/srcs.nix | 400 +++++++++--------- 9 files changed, 287 insertions(+), 230 deletions(-) create mode 100644 pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch create mode 100644 pkgs/desktops/plasma-5/kwayland-server/default.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 39299d8c83c..b916a170820 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -118,6 +118,7 @@ let ksysguard = callPackage ./ksysguard.nix {}; kwallet-pam = callPackage ./kwallet-pam.nix {}; kwayland-integration = callPackage ./kwayland-integration.nix {}; + kwayland-server = callPackage ./kwayland-server {}; kwin = callPackage ./kwin {}; kwrited = callPackage ./kwrited.nix {}; libkscreen = callPackage ./libkscreen {}; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index abb5659526f..3af0147ce4a 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.3/ ) diff --git a/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch b/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch new file mode 100644 index 00000000000..771e093bb9e --- /dev/null +++ b/pkgs/desktops/plasma-5/kwayland-server/0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch @@ -0,0 +1,25 @@ +From 80bca7370d4b8bafcf18abcda30f02e190f419a4 Mon Sep 17 00:00:00 2001 +From: Tom Hall +Date: Sat, 29 Aug 2020 19:14:30 +0100 +Subject: [PATCH] Use KDE_INSTALL_TARGETS_DEFAULT_ARGS when installing targets + +--- + src/server/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/server/CMakeLists.txt b/src/server/CMakeLists.txt +index 0f99682..35e3601 100644 +--- a/src/server/CMakeLists.txt ++++ b/src/server/CMakeLists.txt +@@ -356,7 +356,7 @@ set_target_properties(KWaylandServer PROPERTIES VERSION ${KWAYLANDSERVER_VERSI + SOVERSION ${KWAYLANDSERVER_SOVERSION} + ) + +-install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) ++install(TARGETS KWaylandServer EXPORT KWaylandServerTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) + + set(SERVER_LIB_HEADERS + ${CMAKE_CURRENT_BINARY_DIR}/KWaylandServer/kwaylandserver_export.h +-- +2.26.2 + diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix new file mode 100644 index 00000000000..86f025589fe --- /dev/null +++ b/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -0,0 +1,18 @@ +{ + mkDerivation, cmake, + extra-cmake-modules, kdoctools, + kwayland, plasma-wayland-protocols, + wayland, wayland-protocols +}: + +mkDerivation { + name = "kwayland-server"; + nativeBuildInputs = [ + cmake + extra-cmake-modules #kdoctools + ]; + buildInputs = [ + kwayland plasma-wayland-protocols wayland wayland-protocols + ]; + patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; +} diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index e2fb0877ec8..388921dbf20 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -11,7 +11,7 @@ breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, - kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, + kscreenlocker, kservice, kwayland, kwayland-server, kwidgetsaddons, kwindowsystem, kxmlgui, plasma-framework, libcap, libdrm, mesa }: @@ -30,7 +30,7 @@ mkDerivation { breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice - kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework + kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework libcap libdrm mesa ]; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 96d113e11fb..40f223dd100 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine, - qtx11extras + qtx11extras, knewstuff }: mkDerivation { @@ -15,7 +15,7 @@ mkDerivation { buildInputs = [ kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras - qtwebengine + qtwebengine knewstuff ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 73e449a1362..a07a50f0492 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -19,7 +19,7 @@ mkDerivation { name = "plasma-desktop"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft + boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft xorgserver libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras @@ -35,7 +35,7 @@ mkDerivation { ./tzdir.patch ]; postPatch = '' - sed '1i#include ' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp + sed '1i#include ' -i kcms/touchpad/backends/x11/synapticstouchpad.cpp ''; CXXFLAGS = [ "-I${lib.getDev xorgserver}/include/xorg" diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index 12080092629..37f8502e766 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -1,19 +1,33 @@ -From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 28 Jan 2020 05:00:53 -0600 -Subject: [PATCH 1/2] startkde +From d653bc84c8aed33072237ed858194a8a73b6a2e7 Mon Sep 17 00:00:00 2001 +From: Tom Hall +Date: Mon, 7 Sep 2020 18:09:52 +0100 +Subject: [PATCH] startkde --- + startkde/plasma-session/startup.cpp | 2 +- startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +- - startkde/startplasma.cpp | 24 ++++++++++-------------- - 3 files changed, 12 insertions(+), 16 deletions(-) + startkde/startplasma.cpp | 22 +++++++++------------- + 4 files changed, 12 insertions(+), 16 deletions(-) +diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp +index 89cc144ba..8ca9e81d2 100644 +--- a/startkde/plasma-session/startup.cpp ++++ b/startkde/plasma-session/startup.cpp +@@ -210,7 +210,7 @@ Startup::Startup(QObject *parent): + upAndRunning(QStringLiteral("ksmserver")); + const AutoStart autostart; + +- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper")); ++ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER)); + + KJob* phase1; + QProcessEnvironment kdedProcessEnv; diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index 87c71c6b3..5fc53140e 100644 +index f59654d18..5e3a93db0 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp -@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/) +@@ -66,7 +66,7 @@ int main(int argc, char** argv) waitForKonqi(); out << "startplasma-waylandsession: Shutting down...\n"; @@ -23,10 +37,10 @@ index 87c71c6b3..5fc53140e 100644 cleanupX11(); out << "startplasma-waylandsession: Done.\n"; diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp -index 3314b6283..14cbe29fa 100644 +index ae1c4d101..0df24b5be 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp -@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/) +@@ -110,7 +110,7 @@ int main(int argc, char** argv) out << "startkde: Shutting down...\n"; @@ -36,10 +50,10 @@ index 3314b6283..14cbe29fa 100644 cleanupPlasmaEnvironment(); cleanupX11(); diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index 4c9f5cef6..5ea4c2cf1 100644 +index a055d5635..62afb1513 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp -@@ -34,7 +34,7 @@ QTextStream out(stderr); +@@ -40,7 +40,7 @@ QTextStream out(stderr); void messageBox(const QString &text) { out << text; @@ -48,7 +62,7 @@ index 4c9f5cef6..5ea4c2cf1 100644 } QStringList allServices(const QLatin1String& prefix) -@@ -242,15 +242,15 @@ void setupX11() +@@ -261,15 +261,15 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -69,7 +83,7 @@ index 4c9f5cef6..5ea4c2cf1 100644 } // TODO: Check if Necessary -@@ -267,11 +267,7 @@ bool syncDBusEnvironment() +@@ -286,11 +286,7 @@ bool syncDBusEnvironment() { int exitCode; // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment @@ -78,11 +92,11 @@ index 4c9f5cef6..5ea4c2cf1 100644 - } else { - exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/ksyncdbusenv"), {}); - } -+ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") }); ++ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") }); return exitCode == 0; } -@@ -287,7 +283,7 @@ void setupFontDpi() +@@ -306,7 +302,7 @@ void setupFontDpi() //TODO port to c++? const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); QProcess p; @@ -91,7 +105,7 @@ index 4c9f5cef6..5ea4c2cf1 100644 p.setProcessChannelMode(QProcess::ForwardedChannels); p.write(input); p.closeWriteChannel(); -@@ -309,7 +305,7 @@ QProcess* setupKSplash() +@@ -328,7 +324,7 @@ QProcess* setupKSplash() KConfigGroup ksplashCfg = cfg.group("KSplash"); if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; @@ -100,15 +114,6 @@ index 4c9f5cef6..5ea4c2cf1 100644 } } return p; -@@ -331,7 +327,7 @@ bool startKDEInit() - { - // We set LD_BIND_NOW to increase the efficiency of kdeinit. - // kdeinit unsets this variable before loading applications. -- const int exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") }); -+ const int exitCode = runSync(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), { QStringLiteral("--kded"), QStringLiteral("+kcminit_startup") }, { QStringLiteral("LD_BIND_NOW=true") }); - if (exitCode != 0) { - messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation.")); - return false; -- -2.25.1 +2.28.0 diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 6f9214ccd60..d246588b589 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -4,387 +4,395 @@ { bluedevil = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz"; - sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66"; - name = "bluedevil-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/bluedevil-5.20.3.tar.xz"; + sha256 = "59576ea2272b0284ffd8b1370502e4b92952cf3bd8b18921361eb7ad449f0698"; + name = "bluedevil-5.20.3.tar.xz"; }; }; breeze = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz"; - sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563"; - name = "breeze-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/breeze-5.20.3.tar.xz"; + sha256 = "c949bc5683ec0f4f3c4c6e412f71369a9a4e96101c4927c9e9b3b26dca89bc3d"; + name = "breeze-5.20.3.tar.xz"; }; }; breeze-grub = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz"; - sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1"; - name = "breeze-grub-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/breeze-grub-5.20.3.tar.xz"; + sha256 = "53736a94d38a04abde64dd7c78d3293f987fae9d561755c3af084f5c32b63e69"; + name = "breeze-grub-5.20.3.tar.xz"; }; }; breeze-gtk = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz"; - sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9"; - name = "breeze-gtk-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/breeze-gtk-5.20.3.tar.xz"; + sha256 = "5e470b55482880e5ac0e7bf8f0d0ede72ea0338b4d7e1a4f10488bf838a60a4d"; + name = "breeze-gtk-5.20.3.tar.xz"; }; }; breeze-plymouth = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz"; - sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281"; - name = "breeze-plymouth-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/breeze-plymouth-5.20.3.tar.xz"; + sha256 = "abb13d40fb388dc5423dbd2829746d8bd8fe2454e6ef229dc1c4088d623c810d"; + name = "breeze-plymouth-5.20.3.tar.xz"; }; }; discover = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz"; - sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6"; - name = "discover-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/discover-5.20.3.tar.xz"; + sha256 = "7999c3aa6d8f0abceed2571df2e3e19323c01a7cae0e1510d1f1a68dbe79c01c"; + name = "discover-5.20.3.tar.xz"; }; }; drkonqi = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz"; - sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1"; - name = "drkonqi-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/drkonqi-5.20.3.tar.xz"; + sha256 = "9a0e9c3632ab4c6e7b0dc01b549b24b051cb65c9d11be00166661c6dd5bbdaf0"; + name = "drkonqi-5.20.3.tar.xz"; }; }; kactivitymanagerd = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz"; - sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7"; - name = "kactivitymanagerd-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kactivitymanagerd-5.20.3.tar.xz"; + sha256 = "f1d86ab5f92d79f1249aa2e5207fa2d3e4a91e583661f9c3ee778ede46eb50fb"; + name = "kactivitymanagerd-5.20.3.tar.xz"; }; }; kde-cli-tools = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz"; - sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8"; - name = "kde-cli-tools-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kde-cli-tools-5.20.3.tar.xz"; + sha256 = "4e258f6ed63cfd37a357cfbe15fe06015086cef593d961913c328c3a4b2a866c"; + name = "kde-cli-tools-5.20.3.tar.xz"; }; }; kdecoration = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz"; - sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8"; - name = "kdecoration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kdecoration-5.20.3.tar.xz"; + sha256 = "0d7d9ef1596fd1835705f50dcce68ba9fba9ff531f365023764229c99c5c6382"; + name = "kdecoration-5.20.3.tar.xz"; }; }; kde-gtk-config = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz"; - sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab"; - name = "kde-gtk-config-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kde-gtk-config-5.20.3.tar.xz"; + sha256 = "1b3ae2cd35c410b9ae874999c009ce18c594943b40b40a8e6ec58398d07124a0"; + name = "kde-gtk-config-5.20.3.tar.xz"; }; }; kdeplasma-addons = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz"; - sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f"; - name = "kdeplasma-addons-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kdeplasma-addons-5.20.3.tar.xz"; + sha256 = "2ea7bbcb69f9dd8048d7e50435cfcacec56ca63c1ec9cb46822fd42ff5483c08"; + name = "kdeplasma-addons-5.20.3.tar.xz"; }; }; kgamma5 = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz"; - sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f"; - name = "kgamma5-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kgamma5-5.20.3.tar.xz"; + sha256 = "6b1b1fbf0ee1af586c8d2d4168ef26e3b3499a1fbb87a0355684c0a5f27187dd"; + name = "kgamma5-5.20.3.tar.xz"; }; }; khotkeys = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz"; - sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766"; - name = "khotkeys-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/khotkeys-5.20.3.tar.xz"; + sha256 = "343bd0493e7862ab24e44adeb196a5bb5f2757c962e66ef0e946fab280be3ace"; + name = "khotkeys-5.20.3.tar.xz"; }; }; kinfocenter = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz"; - sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5"; - name = "kinfocenter-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kinfocenter-5.20.3.tar.xz"; + sha256 = "131b857fc403cc048b311a6f7c0fb6fdc90f5de1b7b98a3d30075b86519219d5"; + name = "kinfocenter-5.20.3.tar.xz"; }; }; kmenuedit = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz"; - sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6"; - name = "kmenuedit-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kmenuedit-5.20.3.tar.xz"; + sha256 = "cfb5d051de0c291c4d735d33bbfe754f1a3348340b320629b30c934226e9e7f5"; + name = "kmenuedit-5.20.3.tar.xz"; }; }; kscreen = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz"; - sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2"; - name = "kscreen-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kscreen-5.20.3.tar.xz"; + sha256 = "124593bea59efd44b6209b22636205796e6e07f573c9e002c1548b66027f7303"; + name = "kscreen-5.20.3.tar.xz"; }; }; kscreenlocker = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz"; - sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2"; - name = "kscreenlocker-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kscreenlocker-5.20.3.tar.xz"; + sha256 = "18e3041efd17efaadd38e27561fec6a3c1d3adaa45c6432fdcfc178c4b35a808"; + name = "kscreenlocker-5.20.3.tar.xz"; }; }; ksshaskpass = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz"; - sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5"; - name = "ksshaskpass-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/ksshaskpass-5.20.3.tar.xz"; + sha256 = "04f8ea3162fa3c89946d4083863baa9598b6bb85687b4ac2e10057205a616ae6"; + name = "ksshaskpass-5.20.3.tar.xz"; }; }; ksysguard = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz"; - sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f"; - name = "ksysguard-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/ksysguard-5.20.3.tar.xz"; + sha256 = "47df189285df9952f833b25293bdcc39a40cd33581cfb8cb5de7ac488f9f9ea0"; + name = "ksysguard-5.20.3.tar.xz"; }; }; kwallet-pam = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz"; - sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a"; - name = "kwallet-pam-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kwallet-pam-5.20.3.tar.xz"; + sha256 = "44a4b49442dd6b9a313bf2fbe21d6e42fc7dff01fd99ccb166edfbafc277fc02"; + name = "kwallet-pam-5.20.3.tar.xz"; }; }; kwayland-integration = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz"; - sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5"; - name = "kwayland-integration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kwayland-integration-5.20.3.tar.xz"; + sha256 = "2edf886c38583d56ba4322e25970dec1f1beb37c484515f74524e7972405c431"; + name = "kwayland-integration-5.20.3.tar.xz"; + }; + }; + kwayland-server = { + version = "5.20.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.20.3/kwayland-server-5.20.3.tar.xz"; + sha256 = "ba8faa6f6cfc0081d0a2b875dcd95208223c334aa9e1e39da7fcea84c6ce27c3"; + name = "kwayland-server-5.20.3.tar.xz"; }; }; kwin = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz"; - sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8"; - name = "kwin-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kwin-5.20.3.tar.xz"; + sha256 = "3bfe2a3991575328badc960e99812b36c1242c667407c377d23cc064e0bacde8"; + name = "kwin-5.20.3.tar.xz"; }; }; kwrited = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz"; - sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe"; - name = "kwrited-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/kwrited-5.20.3.tar.xz"; + sha256 = "456b3583f6da4be4b8996c75a9709def8aefbe2d4e71fb50fcaed35a0d1d112e"; + name = "kwrited-5.20.3.tar.xz"; }; }; libkscreen = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz"; - sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c"; - name = "libkscreen-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/libkscreen-5.20.3.tar.xz"; + sha256 = "19b7af7601b8063d485ccb1c9061abcc2c6f32e43cbaf65cbf98831a3af5fbc5"; + name = "libkscreen-5.20.3.tar.xz"; }; }; libksysguard = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz"; - sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b"; - name = "libksysguard-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/libksysguard-5.20.3.tar.xz"; + sha256 = "98d85bc9db01f77586701386e1612194df0b4fab8d650833aa4f0f13956fc830"; + name = "libksysguard-5.20.3.tar.xz"; }; }; milou = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz"; - sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2"; - name = "milou-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/milou-5.20.3.tar.xz"; + sha256 = "9aaad267274c9cb868687955dba30e007be7ae16656f5e0f659d2ae5003c3584"; + name = "milou-5.20.3.tar.xz"; }; }; oxygen = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz"; - sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8"; - name = "oxygen-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/oxygen-5.20.3.tar.xz"; + sha256 = "8c6c5068065f3989d836770ec677d883b0650afdeb2e495d49c9c0adf6e834ea"; + name = "oxygen-5.20.3.tar.xz"; }; }; plasma-browser-integration = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz"; - sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383"; - name = "plasma-browser-integration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-browser-integration-5.20.3.tar.xz"; + sha256 = "524442333abcb9e7751afc210f98b98e3f11a1aa389d2bd8ba0cb0d8b1b543a3"; + name = "plasma-browser-integration-5.20.3.tar.xz"; }; }; plasma-desktop = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz"; - sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f"; - name = "plasma-desktop-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-desktop-5.20.3.tar.xz"; + sha256 = "d78ce0d288bb657b1e417179fc5b28bb291b44df7b7840400f034243d4e10b3a"; + name = "plasma-desktop-5.20.3.tar.xz"; + }; + }; + plasma-disks = { + version = "5.20.3"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.20.3/plasma-disks-5.20.3.tar.xz"; + sha256 = "2d1d0d3bf0085d0a80ca24a28125a37eba18ea2a352e39871e85b728ff465f04"; + name = "plasma-disks-5.20.3.tar.xz"; }; }; plasma-integration = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz"; - sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870"; - name = "plasma-integration-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-integration-5.20.3.tar.xz"; + sha256 = "621864e59ee583d0e21ffbebba881198ace728c12694606ed8ff180549f314fd"; + name = "plasma-integration-5.20.3.tar.xz"; }; }; plasma-nano = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz"; - sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341"; - name = "plasma-nano-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-nano-5.20.3.tar.xz"; + sha256 = "714d13c048f8858924a2db3a2845aae2cdfbffe919fa09000df589441039dcb5"; + name = "plasma-nano-5.20.3.tar.xz"; }; }; plasma-nm = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz"; - sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa"; - name = "plasma-nm-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-nm-5.20.3.tar.xz"; + sha256 = "3f204840874e7e2234950ba4980bb2d3f6f08a6cfa16cd83b277d77c2adaf6ec"; + name = "plasma-nm-5.20.3.tar.xz"; }; }; plasma-pa = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz"; - sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209"; - name = "plasma-pa-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-pa-5.20.3.tar.xz"; + sha256 = "626de3f2b217ee3b62e896691e8551e393673a60892ed040b422e2da674fb1ca"; + name = "plasma-pa-5.20.3.tar.xz"; }; }; plasma-phone-components = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz"; - sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070"; - name = "plasma-phone-components-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-phone-components-5.20.3.tar.xz"; + sha256 = "5b854c547b32e8657366f7c957b2a1e0fa103f6ca1e7f43183f49de819bd3855"; + name = "plasma-phone-components-5.20.3.tar.xz"; }; }; plasma-sdk = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz"; - sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5"; - name = "plasma-sdk-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-sdk-5.20.3.tar.xz"; + sha256 = "d2da1b234b17553536ed64d74dc5632adcad9aff4dc6f2b33d4b0f7e128d5301"; + name = "plasma-sdk-5.20.3.tar.xz"; }; }; plasma-tests = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz"; - sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a"; - name = "plasma-tests-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-tests-5.20.3.tar.xz"; + sha256 = "4a0af3f7e19325162b243926960768a34f29de0306aa9a664a53801faf42ce28"; + name = "plasma-tests-5.20.3.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz"; - sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1"; - name = "plasma-thunderbolt-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-thunderbolt-5.20.3.tar.xz"; + sha256 = "d285896b5879e8895da112950e8a0c9bcbf78ed9e135d268b5e729eb02feef0c"; + name = "plasma-thunderbolt-5.20.3.tar.xz"; }; }; plasma-vault = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz"; - sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41"; - name = "plasma-vault-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-vault-5.20.3.tar.xz"; + sha256 = "53e67798ae324ef3c2048bdabe1331f5a17c6e046aaf35b8a1742561714fb031"; + name = "plasma-vault-5.20.3.tar.xz"; }; }; plasma-workspace = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz"; - sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354"; - name = "plasma-workspace-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-workspace-5.20.3.tar.xz"; + sha256 = "47466ec788bb8e6295dbacc34eefb0912e712aeed9924ce025dd48aa61cf9f04"; + name = "plasma-workspace-5.20.3.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz"; - sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d"; - name = "plasma-workspace-wallpapers-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plasma-workspace-wallpapers-5.20.3.tar.xz"; + sha256 = "a7521cbdbd39161a1ce2bb393b0b25057ed1a6dd876c4e948ee0dd3316c04663"; + name = "plasma-workspace-wallpapers-5.20.3.tar.xz"; }; }; plymouth-kcm = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz"; - sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3"; - name = "plymouth-kcm-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/plymouth-kcm-5.20.3.tar.xz"; + sha256 = "164c9eccaedb830f140c393e88d8c30fa128edaaf2e9815eb5d98d87f97b68de"; + name = "plymouth-kcm-5.20.3.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.18.5"; + version = "1-5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz"; - sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91"; - name = "polkit-kde-agent-1-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/polkit-kde-agent-1-5.20.3.tar.xz"; + sha256 = "d68d05ea03a839cfa9853ce58720b7e53bab8f14f15731b97d2fdb6422e705cd"; + name = "polkit-kde-agent-1-5.20.3.tar.xz"; }; }; powerdevil = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz"; - sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548"; - name = "powerdevil-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/powerdevil-5.20.3.tar.xz"; + sha256 = "693c49d46f4f04318f86468987e5d043d8409e418811d8265cd89ace0cf591ef"; + name = "powerdevil-5.20.3.tar.xz"; }; }; sddm-kcm = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz"; - sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b"; - name = "sddm-kcm-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/sddm-kcm-5.20.3.tar.xz"; + sha256 = "0cfbc85d829612d81c1337a9e4dd1271fcf8d2307ba84134700be8c3927fd924"; + name = "sddm-kcm-5.20.3.tar.xz"; }; }; systemsettings = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz"; - sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b"; - name = "systemsettings-5.18.5.tar.xz"; - }; - }; - user-manager = { - version = "5.18.5"; - src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz"; - sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484"; - name = "user-manager-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/systemsettings-5.20.3.tar.xz"; + sha256 = "c380df3cedf14ed11d313b10eba22824cad2aaa3460e0d30336c454eba5c823a"; + name = "systemsettings-5.20.3.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.18.5"; + version = "5.20.3"; src = fetchurl { - url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz"; - sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224"; - name = "xdg-desktop-portal-kde-5.18.5.tar.xz"; + url = "${mirror}/stable/plasma/5.20.3/xdg-desktop-portal-kde-5.20.3.tar.xz"; + sha256 = "565b4a1075de484a9c371d9812fb9c3d2006c3f65fe3433feb7aa3e4779048ca"; + name = "xdg-desktop-portal-kde-5.20.3.tar.xz"; }; }; } From c6cf4b8e795e0e59aa9f5a645472e8d2689a8e6e Mon Sep 17 00:00:00 2001 From: Andreas Date: Thu, 3 Dec 2020 22:39:53 +0100 Subject: [PATCH 03/36] Plasma 5.20.4 + some build fixes (dependencies, patches, ..) --- pkgs/desktops/plasma-5/default.nix | 2 +- pkgs/desktops/plasma-5/fetch.sh | 2 +- .../plasma-5/kde-gtk-config/default.nix | 4 +- pkgs/desktops/plasma-5/kwin/default.nix | 7 +- pkgs/desktops/plasma-5/oxygen.nix | 4 +- pkgs/desktops/plasma-5/plasma-disks.nix | 19 + .../plasma-workspace/0001-startkde.patch | 25 +- .../plasma-5/plasma-workspace/default.nix | 8 +- pkgs/desktops/plasma-5/powerdevil.nix | 16 +- pkgs/desktops/plasma-5/srcs.nix | 394 +++++++++--------- pkgs/desktops/plasma-5/user-manager.nix | 13 - .../plasma-5/xdg-desktop-portal-kde.nix | 8 +- .../libraries/kde-frameworks/kglobalaccel.nix | 8 +- 13 files changed, 246 insertions(+), 264 deletions(-) create mode 100644 pkgs/desktops/plasma-5/plasma-disks.nix delete mode 100644 pkgs/desktops/plasma-5/user-manager.nix diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index b916a170820..014f794b5e8 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -127,6 +127,7 @@ let oxygen = callPackage ./oxygen.nix {}; plasma-browser-integration = callPackage ./plasma-browser-integration.nix {}; plasma-desktop = callPackage ./plasma-desktop {}; + plasma-disks = callPackage ./plasma-disks.nix {}; plasma-integration = callPackage ./plasma-integration {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; @@ -138,7 +139,6 @@ let powerdevil = callPackage ./powerdevil.nix {}; sddm-kcm = callPackage ./sddm-kcm.nix {}; systemsettings = callPackage ./systemsettings.nix {}; - user-manager = callPackage ./user-manager.nix {}; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde.nix {}; thirdParty = let inherit (libsForQt5) callPackage; in { diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 3af0147ce4a..dbc4eef057b 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.3/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.20.4/ ) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index c1ed6dbd6c6..798f8d807af 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, wrapGAppsHook, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas, xsettingsd + knewstuff, gsettings-desktop-schemas, xsettingsd, kdecoration, sass }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { dontWrapGApps = true; # There is nothing to wrap buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas xsettingsd + knewstuff gsettings-desktop-schemas xsettingsd kdecoration sass ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 388921dbf20..f0b07fba736 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -33,15 +33,10 @@ mkDerivation { kwayland kwayland-server kwidgetsaddons kwindowsystem kxmlgui plasma-framework libcap libdrm mesa ]; - outputs = [ "bin" "dev" "out" ]; + outputs = [ "dev" "out" ]; patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch - (fetchpatch { # included in >= 5.18.6 - name = "EGL_TEXTURE_Y_XUXV_WL.diff"; - url = "https://github.com/KDE/kwin/commit/2c76cc478.diff"; - sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy"; - }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix index 1b1f34f17b5..6eea3c92319 100644 --- a/pkgs/desktops/plasma-5/oxygen.nix +++ b/pkgs/desktops/plasma-5/oxygen.nix @@ -3,7 +3,7 @@ extra-cmake-modules, frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons, ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative, - qtx11extras + qtx11extras, libXdmcp }: mkDerivation { @@ -12,7 +12,7 @@ mkDerivation { propagatedBuildInputs = [ frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative - qtx11extras + qtx11extras libXdmcp ]; outputs = [ "bin" "dev" "out" ]; } diff --git a/pkgs/desktops/plasma-5/plasma-disks.nix b/pkgs/desktops/plasma-5/plasma-disks.nix new file mode 100644 index 00000000000..f97b061292a --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-disks.nix @@ -0,0 +1,19 @@ +{ + mkDerivation, extra-cmake-modules, kdoctools, + kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, + kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, + kactivities, kactivities-stats, kirigami2, kcrash, plasma-workspace, + systemsettings +}: + +mkDerivation { + name = "plasma-disks"; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + buildInputs = [ + kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice + kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 + kactivities kactivities-stats kirigami2 kcrash plasma-workspace + systemsettings + ]; + outputs = [ "bin" "dev" "out" ]; +} diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index 37f8502e766..ea8afedbe5b 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -14,12 +14,12 @@ diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/start index 89cc144ba..8ca9e81d2 100644 --- a/startkde/plasma-session/startup.cpp +++ b/startkde/plasma-session/startup.cpp -@@ -210,7 +210,7 @@ Startup::Startup(QObject *parent): +@@ -211,7 +211,7 @@ Startup::Startup(QObject *parent): upAndRunning(QStringLiteral("ksmserver")); const AutoStart autostart; -- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper")); -+ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER)); +- QProcess::execute(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/start_kdeinit_wrapper"), QStringList()); ++ QProcess::execute(QStringLiteral(NIXPKGS_START_KDEINIT_WRAPPER), QStringList()); KJob* phase1; QProcessEnvironment kdedProcessEnv; @@ -27,7 +27,7 @@ diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-wayl index f59654d18..5e3a93db0 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp -@@ -66,7 +66,7 @@ int main(int argc, char** argv) +@@ -61,7 +61,7 @@ int main(int argc, char** argv) waitForKonqi(); out << "startplasma-waylandsession: Shutting down...\n"; @@ -53,7 +53,7 @@ diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp index a055d5635..62afb1513 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp -@@ -40,7 +40,7 @@ QTextStream out(stderr); +@@ -41,7 +41,7 @@ QTextStream out(stderr); void messageBox(const QString &text) { out << text; @@ -62,7 +62,7 @@ index a055d5635..62afb1513 100644 } QStringList allServices(const QLatin1String& prefix) -@@ -261,15 +261,15 @@ void setupX11() +@@ -262,15 +262,15 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -83,19 +83,6 @@ index a055d5635..62afb1513 100644 } // TODO: Check if Necessary -@@ -286,11 +286,7 @@ bool syncDBusEnvironment() - { - int exitCode; - // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment -- if (!QStandardPaths::findExecutable(QStringLiteral("dbus-update-activation-environment")).isEmpty()) { -- exitCode = runSync(QStringLiteral("dbus-update-activation-environment"), { QStringLiteral("--systemd"), QStringLiteral("--all") }); -- } else { -- exitCode = runSync(QStringLiteral(CMAKE_INSTALL_FULL_LIBEXECDIR "/ksyncdbusenv"), {}); -- } -+ exitCode = runSync(QStringLiteral(NIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT), { QStringLiteral("--systemd"), QStringLiteral("--all") }); - return exitCode == 0; - } - @@ -306,7 +302,7 @@ void setupFontDpi() //TODO port to c++? const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 6472856cd9b..e1becaab95b 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -4,7 +4,7 @@ extra-cmake-modules, kdoctools, coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor, - libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot, + libXtst, libXft, pam, wayland, xmessage, xprop, xrdb, xsetroot, baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime, @@ -12,7 +12,7 @@ kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays, kquickcharts, - appstream-qt, + appstream-qt, plasma-wayland-protocols, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, qqc2-desktop-style, @@ -25,14 +25,14 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - isocodes libdbusmenu libSM libXcursor libXtst pam wayland + isocodes libdbusmenu libSM libXcursor libXtst libXft pam wayland baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays kquickcharts appstream-qt + kholidays kquickcharts appstream-qt plasma-wayland-protocols qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras qqc2-desktop-style diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index 979d69a02f6..28e6db853a1 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -19,18 +19,10 @@ mkDerivation { "-DHAVE_DDCUTIL=On" ]; patches = [ - # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to - # 'DDCA_Feature_List'. - # https://bugs.kde.org/show_bug.cgi?id=423605 - (fetchpatch { - url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; - sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; - }) - # Reduce log message spam by setting the default log level to Warning. - (fetchpatch { - url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch"; - sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2"; - }) + #(fetchpatch { + # url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch"; + # sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2"; + #}) ]; } diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index d246588b589..ecca8c5bfdd 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -1,398 +1,398 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5 +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/ { fetchurl, mirror }: { bluedevil = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/bluedevil-5.20.3.tar.xz"; - sha256 = "59576ea2272b0284ffd8b1370502e4b92952cf3bd8b18921361eb7ad449f0698"; - name = "bluedevil-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/bluedevil-5.20.4.tar.xz"; + sha256 = "522ad4ff3f3fc4e213328f821041d40b5126d0d3ca49ecc9aea35c59e2c64129"; + name = "bluedevil-5.20.4.tar.xz"; }; }; breeze = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/breeze-5.20.3.tar.xz"; - sha256 = "c949bc5683ec0f4f3c4c6e412f71369a9a4e96101c4927c9e9b3b26dca89bc3d"; - name = "breeze-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-5.20.4.tar.xz"; + sha256 = "b61b3f9961c196bbcfb33519bbec06d19e6267182f7215e21071a5619681b30f"; + name = "breeze-5.20.4.tar.xz"; }; }; breeze-grub = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/breeze-grub-5.20.3.tar.xz"; - sha256 = "53736a94d38a04abde64dd7c78d3293f987fae9d561755c3af084f5c32b63e69"; - name = "breeze-grub-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-grub-5.20.4.tar.xz"; + sha256 = "8692b6800e89b97973b50d6915f9ca028cdcb0354c34b54719af54441e3f3feb"; + name = "breeze-grub-5.20.4.tar.xz"; }; }; breeze-gtk = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/breeze-gtk-5.20.3.tar.xz"; - sha256 = "5e470b55482880e5ac0e7bf8f0d0ede72ea0338b4d7e1a4f10488bf838a60a4d"; - name = "breeze-gtk-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-gtk-5.20.4.tar.xz"; + sha256 = "8905b3a0ff40a48ed2f00f69b7e30c4658deb9fbd1afc61700a28d078693b61d"; + name = "breeze-gtk-5.20.4.tar.xz"; }; }; breeze-plymouth = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/breeze-plymouth-5.20.3.tar.xz"; - sha256 = "abb13d40fb388dc5423dbd2829746d8bd8fe2454e6ef229dc1c4088d623c810d"; - name = "breeze-plymouth-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/breeze-plymouth-5.20.4.tar.xz"; + sha256 = "879d4bd8d0c42a5c1f51497a4ee4ebb3e69f7904170bafa392b95e1c0ce05ada"; + name = "breeze-plymouth-5.20.4.tar.xz"; }; }; discover = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/discover-5.20.3.tar.xz"; - sha256 = "7999c3aa6d8f0abceed2571df2e3e19323c01a7cae0e1510d1f1a68dbe79c01c"; - name = "discover-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/discover-5.20.4.tar.xz"; + sha256 = "3669648fa39e14a8da059373c9a01caacfd5b126d61daed65d5d7aae7ab30012"; + name = "discover-5.20.4.tar.xz"; }; }; drkonqi = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/drkonqi-5.20.3.tar.xz"; - sha256 = "9a0e9c3632ab4c6e7b0dc01b549b24b051cb65c9d11be00166661c6dd5bbdaf0"; - name = "drkonqi-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/drkonqi-5.20.4.tar.xz"; + sha256 = "55d4a166ee74c4a935c69cec64ecd8eb3fdd79aae8dcd996f6432a873be3fac8"; + name = "drkonqi-5.20.4.tar.xz"; }; }; kactivitymanagerd = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kactivitymanagerd-5.20.3.tar.xz"; - sha256 = "f1d86ab5f92d79f1249aa2e5207fa2d3e4a91e583661f9c3ee778ede46eb50fb"; - name = "kactivitymanagerd-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kactivitymanagerd-5.20.4.tar.xz"; + sha256 = "210215dd9a49fda98febb60f73f4cc95eda3eb9ec96c0db2f2881f6be13afb34"; + name = "kactivitymanagerd-5.20.4.tar.xz"; }; }; kde-cli-tools = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kde-cli-tools-5.20.3.tar.xz"; - sha256 = "4e258f6ed63cfd37a357cfbe15fe06015086cef593d961913c328c3a4b2a866c"; - name = "kde-cli-tools-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kde-cli-tools-5.20.4.tar.xz"; + sha256 = "55f35158715bafdd51e448a2760327ed4f91c54fcd3da807dec2736d077b16a3"; + name = "kde-cli-tools-5.20.4.tar.xz"; }; }; kdecoration = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kdecoration-5.20.3.tar.xz"; - sha256 = "0d7d9ef1596fd1835705f50dcce68ba9fba9ff531f365023764229c99c5c6382"; - name = "kdecoration-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kdecoration-5.20.4.tar.xz"; + sha256 = "8d1224a50a2e8c0ec24faab4453432eb8083b35a63e479523de95dce644226e8"; + name = "kdecoration-5.20.4.tar.xz"; }; }; kde-gtk-config = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kde-gtk-config-5.20.3.tar.xz"; - sha256 = "1b3ae2cd35c410b9ae874999c009ce18c594943b40b40a8e6ec58398d07124a0"; - name = "kde-gtk-config-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kde-gtk-config-5.20.4.tar.xz"; + sha256 = "db3510cb08788c915be5e034106145597de5a412236b60c57b8db4b64dbbd7b1"; + name = "kde-gtk-config-5.20.4.tar.xz"; }; }; kdeplasma-addons = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kdeplasma-addons-5.20.3.tar.xz"; - sha256 = "2ea7bbcb69f9dd8048d7e50435cfcacec56ca63c1ec9cb46822fd42ff5483c08"; - name = "kdeplasma-addons-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kdeplasma-addons-5.20.4.tar.xz"; + sha256 = "44768c7fb00386bc4f005c773bca59d8acc354f8a3f43efa6565cefc74d490d7"; + name = "kdeplasma-addons-5.20.4.tar.xz"; }; }; kgamma5 = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kgamma5-5.20.3.tar.xz"; - sha256 = "6b1b1fbf0ee1af586c8d2d4168ef26e3b3499a1fbb87a0355684c0a5f27187dd"; - name = "kgamma5-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kgamma5-5.20.4.tar.xz"; + sha256 = "59b1247dfc3c45247cff62e3706b52c9a1be2cf9cfe6e92c9c7299fc5cb51b41"; + name = "kgamma5-5.20.4.tar.xz"; }; }; khotkeys = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/khotkeys-5.20.3.tar.xz"; - sha256 = "343bd0493e7862ab24e44adeb196a5bb5f2757c962e66ef0e946fab280be3ace"; - name = "khotkeys-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/khotkeys-5.20.4.tar.xz"; + sha256 = "13c7e5a38f095056c6411b8dc91fc0640256c0a6f0a5166ba716e2454388d648"; + name = "khotkeys-5.20.4.tar.xz"; }; }; kinfocenter = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kinfocenter-5.20.3.tar.xz"; - sha256 = "131b857fc403cc048b311a6f7c0fb6fdc90f5de1b7b98a3d30075b86519219d5"; - name = "kinfocenter-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kinfocenter-5.20.4.tar.xz"; + sha256 = "09af2cafde33d0c8a824451ca532a443b6f571e20037fe6b31245c9984e9a6b3"; + name = "kinfocenter-5.20.4.tar.xz"; }; }; kmenuedit = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kmenuedit-5.20.3.tar.xz"; - sha256 = "cfb5d051de0c291c4d735d33bbfe754f1a3348340b320629b30c934226e9e7f5"; - name = "kmenuedit-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kmenuedit-5.20.4.tar.xz"; + sha256 = "32c2d2eb979e43e4cc0892aa9460eb8ebaf603b77385b9f058a48ca4347dde4b"; + name = "kmenuedit-5.20.4.tar.xz"; }; }; kscreen = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kscreen-5.20.3.tar.xz"; - sha256 = "124593bea59efd44b6209b22636205796e6e07f573c9e002c1548b66027f7303"; - name = "kscreen-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kscreen-5.20.4.tar.xz"; + sha256 = "4063fae5cb40a22a98fd0cc217e9b0ea4aef6518203c4bbe2664d5d01dfb9d9c"; + name = "kscreen-5.20.4.tar.xz"; }; }; kscreenlocker = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kscreenlocker-5.20.3.tar.xz"; - sha256 = "18e3041efd17efaadd38e27561fec6a3c1d3adaa45c6432fdcfc178c4b35a808"; - name = "kscreenlocker-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kscreenlocker-5.20.4.tar.xz"; + sha256 = "d80d4625a0a48a7a63c5ff8255e8639eb2fb57ebc436c46979949b39fc530126"; + name = "kscreenlocker-5.20.4.tar.xz"; }; }; ksshaskpass = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/ksshaskpass-5.20.3.tar.xz"; - sha256 = "04f8ea3162fa3c89946d4083863baa9598b6bb85687b4ac2e10057205a616ae6"; - name = "ksshaskpass-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/ksshaskpass-5.20.4.tar.xz"; + sha256 = "a391ba0490ca41a33207adb6aff2233165d4aeed119fd056489d6eccfc81f218"; + name = "ksshaskpass-5.20.4.tar.xz"; }; }; ksysguard = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/ksysguard-5.20.3.tar.xz"; - sha256 = "47df189285df9952f833b25293bdcc39a40cd33581cfb8cb5de7ac488f9f9ea0"; - name = "ksysguard-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/ksysguard-5.20.4.tar.xz"; + sha256 = "a5f247b24ce75a28f301446fbeb25abf968e77e0c32cd4be9b574a21d3bbfaf4"; + name = "ksysguard-5.20.4.tar.xz"; }; }; kwallet-pam = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kwallet-pam-5.20.3.tar.xz"; - sha256 = "44a4b49442dd6b9a313bf2fbe21d6e42fc7dff01fd99ccb166edfbafc277fc02"; - name = "kwallet-pam-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwallet-pam-5.20.4.tar.xz"; + sha256 = "0749056e9acbbc194b20be5b0921383013ed6c268c22cf905aeeda32514d3ac9"; + name = "kwallet-pam-5.20.4.tar.xz"; }; }; kwayland-integration = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kwayland-integration-5.20.3.tar.xz"; - sha256 = "2edf886c38583d56ba4322e25970dec1f1beb37c484515f74524e7972405c431"; - name = "kwayland-integration-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwayland-integration-5.20.4.tar.xz"; + sha256 = "2dd985dd8d21cdc7743b9f297d0d582f960339b4714953564f2f047d28cee53d"; + name = "kwayland-integration-5.20.4.tar.xz"; }; }; kwayland-server = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kwayland-server-5.20.3.tar.xz"; - sha256 = "ba8faa6f6cfc0081d0a2b875dcd95208223c334aa9e1e39da7fcea84c6ce27c3"; - name = "kwayland-server-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwayland-server-5.20.4.tar.xz"; + sha256 = "3edc7b73baa6fa8b0bec51272e8786bab41998b0f675262d5086fdf6c1e9bb44"; + name = "kwayland-server-5.20.4.tar.xz"; }; }; kwin = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kwin-5.20.3.tar.xz"; - sha256 = "3bfe2a3991575328badc960e99812b36c1242c667407c377d23cc064e0bacde8"; - name = "kwin-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwin-5.20.4.tar.xz"; + sha256 = "c59861e9d456974bffaff2cb371cd8d31bdb789f89a60af632089c556111662a"; + name = "kwin-5.20.4.tar.xz"; }; }; kwrited = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/kwrited-5.20.3.tar.xz"; - sha256 = "456b3583f6da4be4b8996c75a9709def8aefbe2d4e71fb50fcaed35a0d1d112e"; - name = "kwrited-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/kwrited-5.20.4.tar.xz"; + sha256 = "f02b900538246f4df2707585052b732552d2ea115a16f8fbda618fa02e5a1bb2"; + name = "kwrited-5.20.4.tar.xz"; }; }; libkscreen = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/libkscreen-5.20.3.tar.xz"; - sha256 = "19b7af7601b8063d485ccb1c9061abcc2c6f32e43cbaf65cbf98831a3af5fbc5"; - name = "libkscreen-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/libkscreen-5.20.4.tar.xz"; + sha256 = "ce1bd03a25b101793fa1472ac3fc696079e607a6f45330ea724845bda288d28d"; + name = "libkscreen-5.20.4.tar.xz"; }; }; libksysguard = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/libksysguard-5.20.3.tar.xz"; - sha256 = "98d85bc9db01f77586701386e1612194df0b4fab8d650833aa4f0f13956fc830"; - name = "libksysguard-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/libksysguard-5.20.4.tar.xz"; + sha256 = "a89968476cb8a888550e1a5138ab8e86eeb49788187192cba71f79abd4aad422"; + name = "libksysguard-5.20.4.tar.xz"; }; }; milou = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/milou-5.20.3.tar.xz"; - sha256 = "9aaad267274c9cb868687955dba30e007be7ae16656f5e0f659d2ae5003c3584"; - name = "milou-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/milou-5.20.4.tar.xz"; + sha256 = "123ac9470a94f2eb6e4212979d2df4160fa15962b1fc18551bfcdfe5aa18a201"; + name = "milou-5.20.4.tar.xz"; }; }; oxygen = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/oxygen-5.20.3.tar.xz"; - sha256 = "8c6c5068065f3989d836770ec677d883b0650afdeb2e495d49c9c0adf6e834ea"; - name = "oxygen-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/oxygen-5.20.4.tar.xz"; + sha256 = "e58cb6a2e1976a973e24d974556e6306a076ce1295f33a9a1bc56a8715857f67"; + name = "oxygen-5.20.4.tar.xz"; }; }; plasma-browser-integration = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-browser-integration-5.20.3.tar.xz"; - sha256 = "524442333abcb9e7751afc210f98b98e3f11a1aa389d2bd8ba0cb0d8b1b543a3"; - name = "plasma-browser-integration-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-browser-integration-5.20.4.tar.xz"; + sha256 = "55057e4f15a1e8b2d2f0489d32f95bb89f610ae99184b587ba90f7db0e8292b4"; + name = "plasma-browser-integration-5.20.4.tar.xz"; }; }; plasma-desktop = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-desktop-5.20.3.tar.xz"; - sha256 = "d78ce0d288bb657b1e417179fc5b28bb291b44df7b7840400f034243d4e10b3a"; - name = "plasma-desktop-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-desktop-5.20.4.tar.xz"; + sha256 = "3864e80bb9b8da596188162b14cd9bb77e7a8abedfb0fa41c8c72d47139d1355"; + name = "plasma-desktop-5.20.4.tar.xz"; }; }; plasma-disks = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-disks-5.20.3.tar.xz"; - sha256 = "2d1d0d3bf0085d0a80ca24a28125a37eba18ea2a352e39871e85b728ff465f04"; - name = "plasma-disks-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-disks-5.20.4.tar.xz"; + sha256 = "f0110588b2603905962beedd596cfa6eb6371b7bac2186aa845d22237199d845"; + name = "plasma-disks-5.20.4.tar.xz"; }; }; plasma-integration = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-integration-5.20.3.tar.xz"; - sha256 = "621864e59ee583d0e21ffbebba881198ace728c12694606ed8ff180549f314fd"; - name = "plasma-integration-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-integration-5.20.4.tar.xz"; + sha256 = "4dbaf6a05d69df02e73c88970be3d7a1efb62a3931edf06c9760cd3bb87e1299"; + name = "plasma-integration-5.20.4.tar.xz"; }; }; plasma-nano = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-nano-5.20.3.tar.xz"; - sha256 = "714d13c048f8858924a2db3a2845aae2cdfbffe919fa09000df589441039dcb5"; - name = "plasma-nano-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-nano-5.20.4.tar.xz"; + sha256 = "8e23e0ce53654daf4ab688edd6a7852b5d859bfd86b4e1795a60f570dda409bd"; + name = "plasma-nano-5.20.4.tar.xz"; }; }; plasma-nm = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-nm-5.20.3.tar.xz"; - sha256 = "3f204840874e7e2234950ba4980bb2d3f6f08a6cfa16cd83b277d77c2adaf6ec"; - name = "plasma-nm-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-nm-5.20.4.tar.xz"; + sha256 = "7b4d1026f2caa709a9ae284cd18342d1c573276f9b4c356ef47779dadb8b57cf"; + name = "plasma-nm-5.20.4.tar.xz"; }; }; plasma-pa = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-pa-5.20.3.tar.xz"; - sha256 = "626de3f2b217ee3b62e896691e8551e393673a60892ed040b422e2da674fb1ca"; - name = "plasma-pa-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-pa-5.20.4.tar.xz"; + sha256 = "56fb4809966aa33290c46fed968f2c7186c415663f032c75b3279c57134674f3"; + name = "plasma-pa-5.20.4.tar.xz"; }; }; plasma-phone-components = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-phone-components-5.20.3.tar.xz"; - sha256 = "5b854c547b32e8657366f7c957b2a1e0fa103f6ca1e7f43183f49de819bd3855"; - name = "plasma-phone-components-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-phone-components-5.20.4.tar.xz"; + sha256 = "80053324bfb6431946df67e712638f797c2bcd9cb78766629a0372de7f6f727e"; + name = "plasma-phone-components-5.20.4.tar.xz"; }; }; plasma-sdk = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-sdk-5.20.3.tar.xz"; - sha256 = "d2da1b234b17553536ed64d74dc5632adcad9aff4dc6f2b33d4b0f7e128d5301"; - name = "plasma-sdk-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-sdk-5.20.4.tar.xz"; + sha256 = "49d29c1c95832c585ea3c0b26f8fb46f5fa0fac726f9f7e9cbf0ab83415a00ea"; + name = "plasma-sdk-5.20.4.tar.xz"; }; }; plasma-tests = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-tests-5.20.3.tar.xz"; - sha256 = "4a0af3f7e19325162b243926960768a34f29de0306aa9a664a53801faf42ce28"; - name = "plasma-tests-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-tests-5.20.4.tar.xz"; + sha256 = "35234da922aad986db73ca4d2ca1c0440dbff24e200b98584246b060cc7a2735"; + name = "plasma-tests-5.20.4.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-thunderbolt-5.20.3.tar.xz"; - sha256 = "d285896b5879e8895da112950e8a0c9bcbf78ed9e135d268b5e729eb02feef0c"; - name = "plasma-thunderbolt-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-thunderbolt-5.20.4.tar.xz"; + sha256 = "7c37c66815242b5d1e208df3b4dbf4fe0d8542ac9aa352d06c548fc172348429"; + name = "plasma-thunderbolt-5.20.4.tar.xz"; }; }; plasma-vault = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-vault-5.20.3.tar.xz"; - sha256 = "53e67798ae324ef3c2048bdabe1331f5a17c6e046aaf35b8a1742561714fb031"; - name = "plasma-vault-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-vault-5.20.4.tar.xz"; + sha256 = "525226a143e6bb173e8106ed2f2313a529ed380a0a1488b096a60af6d08d881c"; + name = "plasma-vault-5.20.4.tar.xz"; }; }; plasma-workspace = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-workspace-5.20.3.tar.xz"; - sha256 = "47466ec788bb8e6295dbacc34eefb0912e712aeed9924ce025dd48aa61cf9f04"; - name = "plasma-workspace-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-5.20.4.tar.xz"; + sha256 = "12bfe6c3f62e4d1d2f7bc02ccb2e2ed5aee2ffe21c310987e42a2205374c30c9"; + name = "plasma-workspace-5.20.4.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plasma-workspace-wallpapers-5.20.3.tar.xz"; - sha256 = "a7521cbdbd39161a1ce2bb393b0b25057ed1a6dd876c4e948ee0dd3316c04663"; - name = "plasma-workspace-wallpapers-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plasma-workspace-wallpapers-5.20.4.tar.xz"; + sha256 = "4740d67e85910ed398c048916963f31c6632698d6a4494bc09cc1b0cd14e2808"; + name = "plasma-workspace-wallpapers-5.20.4.tar.xz"; }; }; plymouth-kcm = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/plymouth-kcm-5.20.3.tar.xz"; - sha256 = "164c9eccaedb830f140c393e88d8c30fa128edaaf2e9815eb5d98d87f97b68de"; - name = "plymouth-kcm-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/plymouth-kcm-5.20.4.tar.xz"; + sha256 = "0cde268064c92b89c5b2a5f8c033983d372406656d446f52b77611effd67ad77"; + name = "plymouth-kcm-5.20.4.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.20.3"; + version = "1-5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/polkit-kde-agent-1-5.20.3.tar.xz"; - sha256 = "d68d05ea03a839cfa9853ce58720b7e53bab8f14f15731b97d2fdb6422e705cd"; - name = "polkit-kde-agent-1-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/polkit-kde-agent-1-5.20.4.tar.xz"; + sha256 = "f01a7b3443553810b0c9e6f25d2ca51eeac7c5e9fd624505852e77183e294b61"; + name = "polkit-kde-agent-1-5.20.4.tar.xz"; }; }; powerdevil = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/powerdevil-5.20.3.tar.xz"; - sha256 = "693c49d46f4f04318f86468987e5d043d8409e418811d8265cd89ace0cf591ef"; - name = "powerdevil-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/powerdevil-5.20.4.tar.xz"; + sha256 = "864128ea9178701bc322f728402cf9277b3c6feaa15fe425aa2adf92464bd28d"; + name = "powerdevil-5.20.4.tar.xz"; }; }; sddm-kcm = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/sddm-kcm-5.20.3.tar.xz"; - sha256 = "0cfbc85d829612d81c1337a9e4dd1271fcf8d2307ba84134700be8c3927fd924"; - name = "sddm-kcm-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/sddm-kcm-5.20.4.tar.xz"; + sha256 = "c61e136c10b98a91e1bd48ca5bbdd2a15b197a38b83d7ad5ccd289200524935e"; + name = "sddm-kcm-5.20.4.tar.xz"; }; }; systemsettings = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/systemsettings-5.20.3.tar.xz"; - sha256 = "c380df3cedf14ed11d313b10eba22824cad2aaa3460e0d30336c454eba5c823a"; - name = "systemsettings-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/systemsettings-5.20.4.tar.xz"; + sha256 = "e87eedfb40a0255348cf2a775ca0ea15bbce37687eedd521f2200670315953b9"; + name = "systemsettings-5.20.4.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.20.3"; + version = "5.20.4"; src = fetchurl { - url = "${mirror}/stable/plasma/5.20.3/xdg-desktop-portal-kde-5.20.3.tar.xz"; - sha256 = "565b4a1075de484a9c371d9812fb9c3d2006c3f65fe3433feb7aa3e4779048ca"; - name = "xdg-desktop-portal-kde-5.20.3.tar.xz"; + url = "${mirror}/stable/plasma/5.20.4/xdg-desktop-portal-kde-5.20.4.tar.xz"; + sha256 = "cb3d856f7caeae7bd02a3e9e43f12ee3d432aa399df9d40db0636199b7ed4df8"; + name = "xdg-desktop-portal-kde-5.20.4.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/user-manager.nix b/pkgs/desktops/plasma-5/user-manager.nix deleted file mode 100644 index f46792fc48f..00000000000 --- a/pkgs/desktops/plasma-5/user-manager.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, khtml, - ki18n, kiconthemes, kio, kwindowsystem, libpwquality -}: - -mkDerivation { - name = "user-manager"; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; - buildInputs = [ - kcmutils kconfig khtml ki18n kiconthemes kio kwindowsystem - libpwquality - ]; -} diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index c03c6a89161..0c060f19ac9 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,18 +1,18 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, - cups, epoxy, mesa, pcre, pipewire, + cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - kirigami2, kdeclarative, plasma-framework, kio + kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio }: mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ - cups epoxy mesa pcre pipewire + cups epoxy mesa pcre pipewire wayland wayland-protocols kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem - kirigami2 kdeclarative plasma-framework + kirigami2 kdeclarative plasma-framework plasma-wayland-protocols ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix index ca015151e0f..483ab16dcc3 100644 --- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix +++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix @@ -1,16 +1,18 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem, - qtbase, qttools, qtx11extras, + qtbase, qttools, qtx11extras, libXdmcp, }: mkDerivation { name = "kglobalaccel"; + meta = { maintainers = [ lib.maintainers.ttuegel ]; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools - qtx11extras + qtx11extras libXdmcp ]; + outputs = [ "out" "dev" ]; propagatedBuildInputs = [ qtbase ]; } From d9c630300cef43f85e0a5a196558427911e521b2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 09:46:30 -0600 Subject: [PATCH 04/36] top-level: remove user-manager to fix evaluation --- pkgs/top-level/aliases.nix | 2 +- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 3d4ce4b4536..cb6fecba9a4 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -823,7 +823,7 @@ mapAliases ({ kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-browser-integration plasma-desktop plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde + systemsettings xdg-desktop-portal-kde ; inherit (plasma5.thirdParty) plasma-applet-caffeine-plus diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2e9cfe3dfaa..dc49e9fb4db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15558,7 +15558,7 @@ in kwin kwrited milou oxygen plasma-browser-integration plasma-desktop plasma-integration plasma-nm plasma-pa plasma-thunderbolt plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm - systemsettings user-manager xdg-desktop-portal-kde + systemsettings xdg-desktop-portal-kde ; inherit ((plasma5.override { libsForQt5 = self; }).thirdParty) From 4358ab6eac48fc4b322f662b95fffc222df19268 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 12:03:16 -0600 Subject: [PATCH 05/36] kdecoration: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kdecoration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix index 569da3c7034..9a09ce30f4c 100644 --- a/pkgs/desktops/plasma-5/kdecoration.nix +++ b/pkgs/desktops/plasma-5/kdecoration.nix @@ -1,8 +1,9 @@ -{ mkDerivation, extra-cmake-modules, qtbase, ki18n }: +{ mkDerivation, lib, extra-cmake-modules, qtbase, ki18n }: mkDerivation { name = "kdecoration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From a5838aa233e9d783e816baf71df7d374956336bf Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 12:00:36 -0600 Subject: [PATCH 06/36] bluedevil: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/bluedevil.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index b5ff3f5dd05..e234398429d 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,14 +1,17 @@ { mkDerivation, extra-cmake-modules, shared-mime-info, - bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, - knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative + qtbase, qtdeclarative, bluez-qt, + kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, + kwidgetsaddons, kwindowsystem, plasma-framework }: mkDerivation { name = "bluedevil"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ - bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons - kdbusaddons kded kiconthemes knotifications kwidgetsaddons + qtbase qtdeclarative bluez-qt + ki18n kio kwindowsystem plasma-framework kcoreaddons kdbusaddons kded + kiconthemes knotifications kwidgetsaddons ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From 821cf25911fc891dfbe22645d8d0b98d08b8cc8f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 12:01:34 -0600 Subject: [PATCH 07/36] elisa: broken with Qt < 5.15 --- pkgs/applications/kde/elisa.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/elisa.nix b/pkgs/applications/kde/elisa.nix index 9a51aa786fa..5a77cfec2f5 100644 --- a/pkgs/applications/kde/elisa.nix +++ b/pkgs/applications/kde/elisa.nix @@ -43,6 +43,6 @@ mkDerivation rec { description = "A simple media player for KDE"; license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - broken = lib.versionOlder qtbase.version "5.14"; + broken = lib.versionOlder qtbase.version "5.15"; }; } From b2a1d4bed5cc21e8326a4f2a31eb258bcdf30730 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 12:37:16 -0600 Subject: [PATCH 08/36] plasma-pa: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/plasma-pa.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index e29df104f3c..00f5fefdc43 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,8 +1,8 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, - qtdeclarative, + qtbase, qtdeclarative, gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop }: @@ -15,6 +15,7 @@ mkDerivation { kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework kwindowsystem - qtdeclarative + qtbase qtdeclarative ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From 5ac8eac120e68f570a76ed69b1ca084e859831a2 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 12:42:22 -0600 Subject: [PATCH 09/36] kmime: broken with Qt < 5.15 --- pkgs/applications/kde/kmime.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix index 4523a69fc1b..ac877d85228 100644 --- a/pkgs/applications/kde/kmime.nix +++ b/pkgs/applications/kde/kmime.nix @@ -13,4 +13,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcodecs ki18n qtbase ]; outputs = [ "out" "dev" ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From a634ceba52ea102a5d424f34c9d4e1bb1f67f206 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:17:52 -0600 Subject: [PATCH 10/36] kpkpass: broken with Qt < 5.15 --- pkgs/applications/kde/kpkpass.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kpkpass.nix b/pkgs/applications/kde/kpkpass.nix index 15dfe7f2e49..f31b37de931 100644 --- a/pkgs/applications/kde/kpkpass.nix +++ b/pkgs/applications/kde/kpkpass.nix @@ -8,7 +8,7 @@ mkDerivation { meta = { license = with lib.licenses; [ lgpl21 ]; maintainers = [ lib.maintainers.bkchr ]; - broken = lib.versionOlder qtbase.version "5.13"; + broken = lib.versionOlder qtbase.version "5.15"; }; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ qtbase karchive ]; From d50556eed4fe353f8cfd250f9befebb0ed8087ec Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:19:45 -0600 Subject: [PATCH 11/36] kgamma5: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kgamma5.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix index ccbf3820b90..e7cc42e77cd 100644 --- a/pkgs/desktops/plasma-5/kgamma5.nix +++ b/pkgs/desktops/plasma-5/kgamma5.nix @@ -1,11 +1,12 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, ki18n, qtx11extras, libXxf86vm + kconfig, kconfigwidgets, ki18n, qtbase, qtx11extras, libXxf86vm }: mkDerivation { name = "kgamma5"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras libXxf86vm ]; + meta.broken = lib.versionOlder qtbase.version "5.15"; } From f2ce8a596f3f935f5c30b2a8131c9ad2692d1427 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:22:23 -0600 Subject: [PATCH 12/36] kwrited: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kwrited.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix index f6f6187e946..e6ee4829bcb 100644 --- a/pkgs/desktops/plasma-5/kwrited.nix +++ b/pkgs/desktops/plasma-5/kwrited.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase, }: @@ -8,4 +8,5 @@ mkDerivation { name = "kwrited"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From fc03e9f15811a73c754ba71660aa483d6c5c5dcd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:23:05 -0600 Subject: [PATCH 13/36] polkit-kde-agent: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/polkit-kde-agent.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix index c25b3d2744b..27f03e2d931 100644 --- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix +++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix @@ -1,7 +1,7 @@ { - mkDerivation, extra-cmake-modules, + mkDerivation, lib, extra-cmake-modules, kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications, - kwidgetsaddons, kwindowsystem, polkit-qt + kwidgetsaddons, kwindowsystem, polkit-qt, qtbase }: mkDerivation { @@ -12,4 +12,5 @@ mkDerivation { knotifications kwindowsystem polkit-qt ]; outputs = [ "out" "dev" ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From f288e18725565d2b7153f7459b25c924e21f9efb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:24:01 -0600 Subject: [PATCH 14/36] kwayland-integration: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kwayland-integration.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix index 667d3ead176..2e923094dc5 100644 --- a/pkgs/desktops/plasma-5/kwayland-integration.nix +++ b/pkgs/desktops/plasma-5/kwayland-integration.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kguiaddons, kidletime, kwayland, kwindowsystem, qtbase, }: @@ -8,4 +8,5 @@ mkDerivation { name = "kwayland-integration"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From 9178d4ce67f9416cd784e3a51e45b19ef43e0807 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:24:56 -0600 Subject: [PATCH 15/36] kwayland-server: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kwayland-server/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kwayland-server/default.nix b/pkgs/desktops/plasma-5/kwayland-server/default.nix index 86f025589fe..6d2a3fabff2 100644 --- a/pkgs/desktops/plasma-5/kwayland-server/default.nix +++ b/pkgs/desktops/plasma-5/kwayland-server/default.nix @@ -1,8 +1,8 @@ { - mkDerivation, cmake, + mkDerivation, lib, cmake, extra-cmake-modules, kdoctools, kwayland, plasma-wayland-protocols, - wayland, wayland-protocols + wayland, wayland-protocols, qtbase }: mkDerivation { @@ -15,4 +15,5 @@ mkDerivation { kwayland plasma-wayland-protocols wayland wayland-protocols ]; patches = [ ./0001-Use-KDE_INSTALL_TARGETS_DEFAULT_ARGS-when-installing.patch ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From b3c5dfd934066a6046ae5f744bd9496a2e92cfad Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:25:42 -0600 Subject: [PATCH 16/36] ksshaskpass: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/ksshaskpass.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix index 39e260f6c70..c4dabd71343 100644 --- a/pkgs/desktops/plasma-5/ksshaskpass.nix +++ b/pkgs/desktops/plasma-5/ksshaskpass.nix @@ -1,5 +1,5 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase, }: @@ -8,4 +8,5 @@ mkDerivation { name = "ksshaskpass"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ]; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; } From 8ef31809a9501922bfc1b31ab20ff318e8e09c96 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:26:24 -0600 Subject: [PATCH 17/36] libkscreen: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/libkscreen/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix index db952944eca..08a9e6f4f24 100644 --- a/pkgs/desktops/plasma-5/libkscreen/default.nix +++ b/pkgs/desktops/plasma-5/libkscreen/default.nix @@ -7,7 +7,7 @@ mkDerivation { name = "libkscreen"; meta = { - broken = builtins.compareVersions qtbase.version "5.12.0" < 0; + broken = lib.versionOlder qtbase.version "5.15.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kwayland libXrandr qtx11extras ]; From 77ab030160a87ebe96f7a4a7f8e8df16c5ea2d94 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:27:20 -0600 Subject: [PATCH 18/36] kactivitymanagerd: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kactivitymanagerd.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix index d2870c27e65..5c856b9d39c 100644 --- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix +++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix @@ -1,12 +1,13 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel, - kwindowsystem, kxmlgui, kcrash + kwindowsystem, kxmlgui, kcrash, qtbase }: mkDerivation { name = "kactivitymanagerd"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem From 0e2bf031784211430d1409d5cd6487d040a0c9a9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:29:23 -0600 Subject: [PATCH 19/36] grantleetheme: broken with Qt < 5.13 --- pkgs/applications/kde/grantleetheme/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index 6204919a328..92a0f1cde49 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -9,6 +9,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13.0"; }; output = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; From 9ed169aa803c1580bcb0857cad9ee2118d7730c5 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:31:38 -0600 Subject: [PATCH 20/36] kpimtextedit: broken with Qt < 5.13 --- pkgs/applications/kde/kpimtextedit.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/kpimtextedit.nix b/pkgs/applications/kde/kpimtextedit.nix index 4ede854d546..6f79a46202b 100644 --- a/pkgs/applications/kde/kpimtextedit.nix +++ b/pkgs/applications/kde/kpimtextedit.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, grantlee, kcodecs, kconfigwidgets, kemoticons, ki18n, kiconthemes, kio, - kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qttools, + kdesignerplugin, ktextwidgets, sonnet, syntax-highlighting, qtbase, qttools, qtspeech }: @@ -11,6 +11,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.13.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ From 2f391f917dfe6690f54dc8f5e9e88ca7b4094c77 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:32:35 -0600 Subject: [PATCH 21/36] libkgapi: broken with Qt < 5.14 --- pkgs/applications/kde/libkgapi.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/libkgapi.nix b/pkgs/applications/kde/libkgapi.nix index 9d2d41c41d7..0e1d71d2745 100644 --- a/pkgs/applications/kde/libkgapi.nix +++ b/pkgs/applications/kde/libkgapi.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - qtwebengine, kio, kcalendarcore, kcontacts, + qtbase, qtwebengine, kio, kcalendarcore, kcontacts, cyrus_sasl }: @@ -10,6 +10,7 @@ mkDerivation { meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; + broken = lib.versionOlder qtbase.version "5.14.0"; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ qtwebengine kio kcalendarcore kcontacts cyrus_sasl ]; From cb86f0d983cff67e35484b22b21e56cef6a88d12 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:33:35 -0600 Subject: [PATCH 22/36] libksysguard: broken with Qt < 5.14 --- pkgs/desktops/plasma-5/libksysguard/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix index 40f223dd100..8178d407950 100644 --- a/pkgs/desktops/plasma-5/libksysguard/default.nix +++ b/pkgs/desktops/plasma-5/libksysguard/default.nix @@ -1,13 +1,14 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes, - kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebengine, - qtx11extras, knewstuff + knewstuff, kservice, kwidgetsaddons, kwindowsystem, plasma-framework, + qtbase, qtscript, qtwebengine, qtx11extras }: mkDerivation { name = "libksysguard"; + meta.broken = lib.versionOlder qtbase.version "5.14.0"; patches = [ ./0001-qdiriterator-follow-symlinks.patch ]; From 43c8aac0e3087f0a0ce0ff86ad2c29612938ae75 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:34:39 -0600 Subject: [PATCH 23/36] kinfocenter: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kinfocenter.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index cf353af5891..c8213482d79 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -1,6 +1,7 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, + qtbase, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, @@ -9,6 +10,7 @@ mkDerivation { name = "kinfocenter"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons From e5dc46b8d4015fc3718288710eb04df9c28ca6f9 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:35:37 -0600 Subject: [PATCH 24/36] kscreenlocker: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/kscreenlocker.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix index e748121132c..ace14b385e6 100644 --- a/pkgs/desktops/plasma-5/kscreenlocker.nix +++ b/pkgs/desktops/plasma-5/kscreenlocker.nix @@ -1,13 +1,14 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime, - kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras, + kwayland, libXcursor, pam, plasma-framework, qtbase, qtdeclarative, qtx11extras, wayland, }: mkDerivation { name = "kscreenlocker"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland From 6d54c68031091ae3c6906514efa5052bcd3737e6 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 13:42:16 -0600 Subject: [PATCH 25/36] bluedevil: fix evaluation --- pkgs/desktops/plasma-5/bluedevil.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix index e234398429d..7500dda7e3f 100644 --- a/pkgs/desktops/plasma-5/bluedevil.nix +++ b/pkgs/desktops/plasma-5/bluedevil.nix @@ -1,5 +1,5 @@ { - mkDerivation, extra-cmake-modules, shared-mime-info, + mkDerivation, lib, extra-cmake-modules, shared-mime-info, qtbase, qtdeclarative, bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications, kwidgetsaddons, kwindowsystem, plasma-framework From a8ad805f566e47602ebc69c8ecfc49f77a7ae7d4 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 14:52:31 -0600 Subject: [PATCH 26/36] plasma-nm: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/plasma-nm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix index 8296d549782..31fd3558957 100644 --- a/pkgs/desktops/plasma-5/plasma-nm/default.nix +++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix @@ -1,15 +1,17 @@ { - mkDerivation, substituteAll, + mkDerivation, lib, substituteAll, extra-cmake-modules, kdoctools, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, mobile-broadband-provider-info, modemmanager-qt, networkmanager-qt, - openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid + openconnect, openvpn, plasma-framework, qca-qt5, qtbase, qtdeclarative, + qttools, solid }: mkDerivation { name = "plasma-nm"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ]; buildInputs = [ kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework From af777b8507f907d2aad3f2fabb88ab093dc1a381 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 14:53:16 -0600 Subject: [PATCH 27/36] ksysguard: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/ksysguard.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 72793fdf083..0581b8bde74 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -1,13 +1,14 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, libcap, libpcap, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, - knewstuff, libksysguard + knewstuff, libksysguard, qtbase }: mkDerivation { name = "ksysguard"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard From 74969101c087508679860d842624f30f279939ad Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 14:53:53 -0600 Subject: [PATCH 28/36] milou: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/milou.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix index 790979d664f..ab23703a470 100644 --- a/pkgs/desktops/plasma-5/milou.nix +++ b/pkgs/desktops/plasma-5/milou.nix @@ -1,12 +1,13 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice, - plasma-framework, qtscript, qtdeclarative + plasma-framework, qtbase, qtscript, qtdeclarative }: mkDerivation { name = "milou"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework From 9ff903326d9fdf0b0f7dc583db0f7e085661d50b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 14:54:31 -0600 Subject: [PATCH 29/36] sddm-kcm: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/sddm-kcm.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/sddm-kcm.nix b/pkgs/desktops/plasma-5/sddm-kcm.nix index 6becf3bf420..a9f51e50a26 100644 --- a/pkgs/desktops/plasma-5/sddm-kcm.nix +++ b/pkgs/desktops/plasma-5/sddm-kcm.nix @@ -1,12 +1,13 @@ { - mkDerivation, extra-cmake-modules, shared-mime-info, + mkDerivation, lib, extra-cmake-modules, shared-mime-info, libpthreadstubs, libXcursor, libXdmcp, - qtquickcontrols2, qtx11extras, + qtbase, qtquickcontrols2, qtx11extras, karchive, ki18n, kio, knewstuff }: mkDerivation { name = "sddm-kcm"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules shared-mime-info ]; buildInputs = [ libpthreadstubs libXcursor libXdmcp From 716218a2b7ac49634f00f5958c691052db7826b0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 14:55:12 -0600 Subject: [PATCH 30/36] xdg-desktop-portal-kde: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 0c060f19ac9..2b0450928f5 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,13 +1,15 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, gettext, kdoctools, python, cups, epoxy, mesa, pcre, pipewire, wayland, wayland-protocols, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio + kirigami2, kdeclarative, plasma-framework, plasma-wayland-protocols, kio, + qtbase }: mkDerivation { name = "xdg-desktop-portal-kde"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ cups epoxy mesa pcre pipewire wayland wayland-protocols From 473fb9246a9b1982a67b8feadacf2f57496bfa9b Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 5 Dec 2020 20:29:42 -0600 Subject: [PATCH 31/36] discover: broken with Qt < 5.15 --- pkgs/desktops/plasma-5/discover.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/discover.nix b/pkgs/desktops/plasma-5/discover.nix index ccfeaa4f63e..37632ab2f76 100644 --- a/pkgs/desktops/plasma-5/discover.nix +++ b/pkgs/desktops/plasma-5/discover.nix @@ -1,14 +1,15 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, gettext, kdoctools, python, appstream-qt, discount, flatpak, fwupd, ostree, packagekit-qt, pcre, util-linux, - qtquickcontrols2, + qtbase, qtquickcontrols2, karchive, kconfig, kcrash, kdbusaddons, kdeclarative, kio, kirigami2, kitemmodels, knewstuff, kwindowsystem, kxmlgui, plasma-framework }: mkDerivation { name = "discover"; + meta.broken = lib.versionOlder qtbase.version "5.15.0"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ # discount is needed for libmarkdown From 262f666092ea1c3cf3d2edca70e74b2efa434156 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2020 10:23:20 -0600 Subject: [PATCH 32/36] kwindowsystem: update platform plugins path patch --- .../0001-platform-plugins-path.patch | 50 +++++++++++++++++++ .../kde-frameworks/kwindowsystem/default.nix | 2 +- .../kwindowsystem/platform-plugins-path.patch | 45 ----------------- 3 files changed, 51 insertions(+), 46 deletions(-) create mode 100644 pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch delete mode 100644 pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch new file mode 100644 index 00000000000..609376e33e4 --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch @@ -0,0 +1,50 @@ +From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Wed, 9 Dec 2020 10:01:59 -0600 +Subject: [PATCH] platform plugins path + +--- + src/pluginwrapper.cpp | 27 +++++++++++++-------------- + 1 file changed, 13 insertions(+), 14 deletions(-) + +diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp +index a255d83..9699b08 100644 +--- a/src/pluginwrapper.cpp ++++ b/src/pluginwrapper.cpp +@@ -25,20 +25,19 @@ static QStringList pluginCandidates() + { + QStringList ret; + const auto paths = QCoreApplication::libraryPaths(); +- for (const QString &path : paths) { +- static const QStringList searchFolders { +- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), +- QStringLiteral("/kf5/kwindowsystem"), +- }; +- for (const QString &searchFolder : searchFolders) { +- QDir pluginDir(path + searchFolder); +- if (!pluginDir.exists()) { +- continue; +- } +- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); +- for (const QString &entry : entries) { +- ret << pluginDir.absoluteFilePath(entry); +- } ++ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH); ++ static const QStringList searchFolders { ++ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), ++ QStringLiteral("/kf5/kwindowsystem"), ++ }; ++ for (const QString &searchFolder : searchFolders) { ++ QDir pluginDir(path + searchFolder); ++ if (!pluginDir.exists()) { ++ continue; ++ } ++ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); ++ for (const QString &entry : entries) { ++ ret << pluginDir.absoluteFilePath(entry); + } + } + return ret; +-- +2.28.0 + diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 1e77b63f7c9..783d83bf960 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -15,7 +15,7 @@ mkDerivation { buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; patches = [ - ./platform-plugins-path.patch + ./0001-platform-plugins-path.patch ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch deleted file mode 100644 index 9a00f7e9452..00000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5d73d02656298d0af860c8ed7f6be679e3d69e09 Mon Sep 17 00:00:00 2001 -From: Tom Hall -Date: Tue, 24 Nov 2020 19:31:20 +0000 -Subject: [PATCH] Fix platform plugins path - ---- - src/pluginwrapper.cpp | 22 ++++++---------------- - 1 file changed, 6 insertions(+), 16 deletions(-) - -diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp -index a255d83..8f4caac 100644 ---- a/src/pluginwrapper.cpp -+++ b/src/pluginwrapper.cpp -@@ -24,22 +24,12 @@ Q_GLOBAL_STATIC(KWindowSystemPluginWrapper, s_pluginWrapper) - static QStringList pluginCandidates() - { - QStringList ret; -- const auto paths = QCoreApplication::libraryPaths(); -- for (const QString &path : paths) { -- static const QStringList searchFolders { -- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), -- QStringLiteral("/kf5/kwindowsystem"), -- }; -- for (const QString &searchFolder : searchFolders) { -- QDir pluginDir(path + searchFolder); -- if (!pluginDir.exists()) { -- continue; -- } -- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -- for (const QString &entry : entries) { -- ret << pluginDir.absoluteFilePath(entry); -- } -- } -+ QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) -+ + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms") -+ + QLatin1Literal("/kf5/kwindowsystem")); -+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -+ for (const QString &entry : entries) { -+ ret << pluginDir.absoluteFilePath(entry); - } - return ret; - } --- -2.28.0 - From 2cc1011be16279d7783eb1e724760daf6cd99153 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 9 Dec 2020 10:23:40 -0600 Subject: [PATCH 33/36] kwindowsystem: use versionOlder --- .../libraries/kde-frameworks/kwindowsystem/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 783d83bf960..ab93966c0ac 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -9,7 +9,7 @@ mkDerivation { name = "kwindowsystem"; meta = { maintainers = [ lib.maintainers.ttuegel ]; - broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + broken = lib.versionOlder qtbase.version "5.7.0"; }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; From 58fd813dafc55d9cbbda3edd52e19a09927f0175 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 11 Dec 2020 16:08:59 -0600 Subject: [PATCH 34/36] nixos/plasma5: install kirigami2 for SDDM theme --- nixos/modules/services/x11/desktop-managers/plasma5.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index 8cc579af2ca..a9b0b8dc23f 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -238,6 +238,7 @@ in kidletime kimageformats kinit + kirigami2 # In system profile for SDDM theme. TODO: wrapper. kio kjobwidgets knewstuff From e846a1538678f841adc7afe0ba7d00708fe425ac Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 12 Dec 2020 14:39:28 -0600 Subject: [PATCH 35/36] kded: add gsettings-desktop-schemas to wrapper --- pkgs/development/libraries/kde-frameworks/kded.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix index 65377789582..1b326e51de9 100644 --- a/pkgs/development/libraries/kde-frameworks/kded.nix +++ b/pkgs/development/libraries/kde-frameworks/kded.nix @@ -1,16 +1,22 @@ { - mkDerivation, lib, propagate, + mkDerivation, lib, propagate, wrapGAppsHook, extra-cmake-modules, kdoctools, - kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase, + gsettings-desktop-schemas, kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, + kservice, qtbase, }: mkDerivation { name = "kded"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - nativeBuildInputs = [ extra-cmake-modules kdoctools ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ]; buildInputs = [ - kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase + gsettings-desktop-schemas kconfig kcoreaddons kcrash kdbusaddons kinit + kservice qtbase ]; outputs = [ "out" "dev" ]; setupHook = propagate "out"; + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; } From 59f649840c4ad3f687ce84dea89899b275008b1d Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 13 Dec 2020 05:10:27 -0600 Subject: [PATCH 36/36] kpurpose: remove patch applied upstream --- pkgs/development/libraries/kde-frameworks/purpose.nix | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkgs/development/libraries/kde-frameworks/purpose.nix b/pkgs/development/libraries/kde-frameworks/purpose.nix index 662333512fe..6f1527da778 100644 --- a/pkgs/development/libraries/kde-frameworks/purpose.nix +++ b/pkgs/development/libraries/kde-frameworks/purpose.nix @@ -8,12 +8,6 @@ mkDerivation { name = "purpose"; meta = { maintainers = [ lib.maintainers.bkchr ]; }; nativeBuildInputs = [ extra-cmake-modules ]; - patches = [ - (fetchpatch { - url = "https://github.com/KDE/purpose/commit/b3842a0941858792e997bb35b679a3fdf3ef54ca.patch"; - sha256 = "14brpryrrfrli1amk4flpnd03wr4zyycpiirndn9sjz0krqlgf3j"; - }) - ]; buildInputs = [ qtbase qtdeclarative kconfig kcoreaddons ki18n kio kirigami2