Merge pull request #95893 from NixOS/u/kapps_2008

kdeApplications: 20.04.3 -> 20.08.0

18 files changed, 886 insertions, 1157 deletions

diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix
index 485397ec4aac..1537bd25d55e 100644
--- a/pkgs/applications/kde/calendarsupport.nix
+++ b/pkgs/applications/kde/calendarsupport.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs,
+  akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs,
   kholidays, kidentitymanagement, kmime, pimcommon, qttools,
 }:
 
@@ -13,7 +13,7 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools
+    akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools
   ];
   propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ];
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index ea2e37224194..8816ae3cbbc6 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -100,7 +100,6 @@ let
       kcalutils = callPackage ./kcalutils.nix {};
       kcharselect = callPackage ./kcharselect.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
-      kdav = callPackage ./kdav.nix {};
       kdebugsettings = callPackage ./kdebugsettings.nix {};
       kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {};
       kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 3d632271869b..f0ce412cff11 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src)
+WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.0/src)
diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix
index bb8a97e8341e..0e815127fa1d 100644
--- a/pkgs/applications/kde/grantleetheme/default.nix
+++ b/pkgs/applications/kde/grantleetheme/default.nix
@@ -11,7 +11,6 @@ mkDerivation {
     maintainers = kdepimTeam;
   };
   output = [ "out" "dev" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase
diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
deleted file mode 100644
index ebb81248475f..000000000000
--- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp
-index 27d5bc8..8d43140 100644
---- a/src/grantleetheme.cpp
-+++ b/src/grantleetheme.cpp
-@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other)
-     , description(other.description)
-     , name(other.name)
-     , dirName(other.dirName)
--    , absolutePath(other.absolutePath)
-+    , absolutePaths(other.absolutePaths)
-     , author(other.author)
-     , email(other.email)
-     , loader(other.loader)
-@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine()
- 
- void ThemePrivate::setupLoader()
- {
--    // Get the parent dir with themes, we set the theme directory separately
--    QDir dir(absolutePath);
--    dir.cdUp();
-+    QStringList templateDirs;
-+    for (const QString& path : absolutePaths) {
-+        QDir dir(path);
-+        dir.cdUp();
-+        templateDirs << dir.absolutePath();
-+    }
- 
-     loader = QSharedPointer<GrantleeTheme::QtResourceTemplateLoader>::create();
--    loader->setTemplateDirs({ dir.absolutePath() });
-+    loader->setTemplateDirs(templateDirs);
-     loader->setTheme(dirName);
- 
-     if (!sEngine) {
-@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de
-     KConfigGroup group(&config, QStringLiteral("Desktop Entry"));
-     if (group.isValid()) {
-         d->dirName = dirName;
--        d->absolutePath = themePath;
-+        d->absolutePaths = QStringList(themePath);
-         d->name = group.readEntry("Name", QString());
-         d->description = group.readEntry("Description", QString());
-         d->themeFileName = group.readEntry("FileName", QString());
-@@ -140,7 +143,7 @@ Theme::~Theme()
- 
- bool Theme::operator==(const Theme &other) const
- {
--    return isValid() && other.isValid() && d->absolutePath == other.absolutePath();
-+    return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths();
- }
- 
- Theme &Theme::operator=(const Theme &other)
-@@ -184,7 +187,12 @@ QString Theme::dirName() const
- 
- QString Theme::absolutePath() const
- {
--    return d->absolutePath;
-+    return d->absolutePaths.first();
-+}
-+
-+QStringList Theme::absolutePaths() const
-+{
-+    return d->absolutePaths;
- }
- 
- QString Theme::author() const
-@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con
-     return result;
- }
- 
-+void Theme::addThemeDir(const QString& path)
-+{
-+    QDir dir(path);
-+    dir.cdUp();
-+    d->absolutePaths << dir.absolutePath();
-+}
-+
- void Theme::addPluginPath(const QString &path)
- {
-     if (!ThemePrivate::sEngine) {
-diff --git a/src/grantleetheme.h b/src/grantleetheme.h
-index a25c27b..be38299 100644
---- a/src/grantleetheme.h
-+++ b/src/grantleetheme.h
-@@ -48,11 +48,14 @@ public:
-     Q_REQUIRED_RESULT QStringList displayExtraVariables() const;
-     Q_REQUIRED_RESULT QString dirName() const;
-     Q_REQUIRED_RESULT QString absolutePath() const;
-+    Q_REQUIRED_RESULT QStringList absolutePaths() const;
-     Q_REQUIRED_RESULT QString author() const;
-     Q_REQUIRED_RESULT QString authorEmail() const;
- 
-     Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray());
- 
-+    void addThemeDir(const QString&);
-+
-     static void addPluginPath(const QString &path);
- 
- private:
-diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h
-index eb73dcb..00510e9 100644
---- a/src/grantleetheme_p.h
-+++ b/src/grantleetheme_p.h
-@@ -43,7 +43,7 @@ public:
-     QString description;
-     QString name;
-     QString dirName;
--    QString absolutePath;
-+    QStringList absolutePaths;
-     QString author;
-     QString email;
- 
-diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp
-index 606d717..dc99041 100644
---- a/src/grantleethememanager.cpp
-+++ b/src/grantleethememanager.cpp
-@@ -125,25 +125,18 @@ public:
- 
-         for (const QString &directory : qAsConst(themesDirectories)) {
-             QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot);
--            QStringList alreadyLoadedThemeName;
-             while (dirIt.hasNext()) {
-                 dirIt.next();
-                 const QString dirName = dirIt.fileName();
-                 GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
-                 if (theme.isValid()) {
-                     QString themeName = theme.name();
--                    if (alreadyLoadedThemeName.contains(themeName)) {
--                        int i = 2;
--                        const QString originalName(theme.name());
--                        while (alreadyLoadedThemeName.contains(themeName)) {
--                            themeName = originalName + QStringLiteral(" (%1)").arg(i);
--                            ++i;
--                        }
--                        theme.d->name = themeName;
-+                    QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName);
-+                    if (i != themes.end()) {
-+                        i.value().addThemeDir(dirIt.filePath());
-+                    } else {
-+                        themes.insert(dirName, theme);
-                     }
--                    alreadyLoadedThemeName << themeName;
--                    themes.insert(dirName, theme);
--                    //qDebug()<<" theme.name()"<<theme.name();
-                 }
-             }
-             watch->addDir(directory);
-@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS
-                 GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName);
-                 if (theme.isValid()) {
-                     if (dirName == themeName) {
--                        return theme.absolutePath();
-+                        return theme.absolutePaths().first();
-                     }
-                 }
-             }
diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series
deleted file mode 100644
index 9095599ea56b..000000000000
--- a/pkgs/applications/kde/grantleetheme/series
+++ /dev/null
@@ -1 +0,0 @@
-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix
index 8224b98253b6..30955d1c2743 100644
--- a/pkgs/applications/kde/incidenceeditor.nix
+++ b/pkgs/applications/kde/incidenceeditor.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs,
-  kdiagram, kldap, kmime, qtbase,
+  kdiagram, kldap, kmime, pimcommon, qtbase
 }:
 
 mkDerivation {
@@ -14,7 +14,7 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram
-    kldap kmime qtbase
+    kldap kmime pimcommon qtbase
   ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/applications/kde/kdav.nix
deleted file mode 100644
index 800c92511de2..000000000000
--- a/pkgs/applications/kde/kdav.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  mkDerivation, lib, kdepimTeam,
-  extra-cmake-modules, kdoctools,
-  kcoreaddons, kio, qtxmlpatterns,
-}:
-
-mkDerivation {
-  name = "kdav";
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-    maintainers = kdepimTeam;
-  };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcoreaddons kio qtxmlpatterns ];
-  outputs = [ "out" "dev" ];
-}
diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix
index 6189e8706db0..a9b906b7b238 100644
--- a/pkgs/applications/kde/kdepim-apps-libs/default.nix
+++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix
@@ -11,7 +11,6 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = kdepimTeam;
   };
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets
diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
deleted file mode 100644
index 02c369cc4ee8..000000000000
--- a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-===================================================================
---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp
-@@ -50,9 +50,9 @@ public:
-         mTemplateLoader.clear();
-     }
- 
--    void changeGrantleePath(const QString &path)
-+    void changeGrantleePath(const QStringList &paths)
-     {
--        mTemplateLoader->setTemplateDirs(QStringList() << path);
-+        mTemplateLoader->setTemplateDirs(paths);
-         mEngine->addTemplateLoader(mTemplateLoader);
- 
-         mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html"));
-@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee
- 
- void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path)
- {
--    d->changeGrantleePath(path);
-+    d->changeGrantleePath(QStringList(path));
- }
- 
- void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
- {
--    d->changeGrantleePath(theme.absolutePath());
-+    d->changeGrantleePath(theme.absolutePaths());
- }
- 
- inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value)
-Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-===================================================================
---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp
-@@ -74,9 +74,9 @@ public:
-         mTemplateLoader.clear();
-     }
- 
--    void changeGrantleePath(const QString &path)
-+    void changeGrantleePath(const QStringList &paths)
-     {
--        mTemplateLoader->setTemplateDirs(QStringList() << path);
-+        mTemplateLoader->setTemplateDirs(paths);
-         mEngine->addTemplateLoader(mTemplateLoader);
- 
-         mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html"));
-@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta
- 
- void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path)
- {
--    d->changeGrantleePath(path);
-+    d->changeGrantleePath(QStringList(path));
- }
- 
- void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme)
- {
--    d->changeGrantleePath(theme.absolutePath());
-+    d->changeGrantleePath(theme.absolutePaths());
- }
- 
- void GrantleeContactFormatter::setForceDisableQRCode(bool b)
diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series
deleted file mode 100644
index 1e8a52b55e96..000000000000
--- a/pkgs/applications/kde/kdepim-apps-libs/series
+++ /dev/null
@@ -1 +0,0 @@
-kdepim-apps-libs-grantlee-merge-theme-dirs.patch
diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix
index 65719514f96b..27ca6ff9aaf4 100644
--- a/pkgs/applications/kde/kdepim-runtime/default.nix
+++ b/pkgs/applications/kde/kdepim-runtime/default.nix
@@ -4,8 +4,8 @@
   shared-mime-info,
   akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes,
   kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement,
-  kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
-  pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns,
+  kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig,
+  pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns,
 }:
 
 mkDerivation {
@@ -18,7 +18,7 @@ mkDerivation {
   buildInputs = [
     akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes
     kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap
-    kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
-    pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns
+    kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine
+    pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns
   ];
 }
diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix
index 6b8941e57876..d225eba82234 100644
--- a/pkgs/applications/kde/kmail.nix
+++ b/pkgs/applications/kde/kmail.nix
@@ -27,5 +27,4 @@ mkDerivation {
     kdepim-addons
   ];
   propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ];
-  patches = [ ./kmail.patch ];
 }
diff --git a/pkgs/applications/kde/kmail.patch b/pkgs/applications/kde/kmail.patch
deleted file mode 100644
index 71a23be2d839..000000000000
--- a/pkgs/applications/kde/kmail.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt
-index 48ed076..9c56896 100644
---- a/agents/archivemailagent/CMakeLists.txt
-+++ b/agents/archivemailagent/CMakeLists.txt
-@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui )
- add_library(archivemailagent STATIC ${libarchivemailagent_SRCS})
- target_link_libraries(archivemailagent
-     KF5::MailCommon
-+    KF5::Libkdepim
-     KF5::I18n
-     KF5::Notifications
-     KF5::IconThemes
-diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt
-index a56b730..83604cf 100644
---- a/agents/followupreminderagent/CMakeLists.txt
-+++ b/agents/followupreminderagent/CMakeLists.txt
-@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent
-     KF5::AkonadiMime
-     KF5::AkonadiAgentBase
-     KF5::DBusAddons
-+    KF5::FollowupReminder
-     KF5::XmlGui
-     KF5::KIOWidgets
-     KF5::Notifications
diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix
index 978baa925e5a..eb28458392ce 100644
--- a/pkgs/applications/kde/kontact.nix
+++ b/pkgs/applications/kde/kontact.nix
@@ -4,7 +4,7 @@
   qtwebengine,
   kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem,
   akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit,
-  mailcommon, libkdepim
+  mailcommon, libkdepim, pimcommon
 }:
 
 mkDerivation {
@@ -18,6 +18,6 @@ mkDerivation {
     qtwebengine
     kcmutils kcrash kdbusaddons kparts kwindowsystem
     akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit
-    mailcommon libkdepim
+    mailcommon libkdepim pimcommon
   ];
 }
diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix
index f002ff0f3403..5de58658777a 100644
--- a/pkgs/applications/kde/mailimporter.nix
+++ b/pkgs/applications/kde/mailimporter.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
   akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n,
-  kmime, kxmlgui, libkdepim
+  kmime, kxmlgui, libkdepim, pimcommon
 }:
 
 mkDerivation {
@@ -14,6 +14,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime
-    kxmlgui libkdepim
+    kxmlgui libkdepim pimcommon
   ];
 }
diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix
index cd9ff2528fac..2e74f528aeb1 100644
--- a/pkgs/applications/kde/pimcommon.nix
+++ b/pkgs/applications/kde/pimcommon.nix
@@ -1,9 +1,9 @@
 {
   mkDerivation, lib, kdepimTeam,
   extra-cmake-modules, kdoctools,
-  akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs,
+  akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs,
   kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons,
-  kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit,
+  kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit,
   kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine
 }:
 
@@ -15,12 +15,12 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets
-    kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit
+    akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets
+    kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit
     kpurpose kwallet kwindowsystem libkdepim qtwebengine
   ];
   propagatedBuildInputs = [
-    akonadi akonadi-contacts kconfig kcontacts kimap
+    akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap
   ];
   outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index 12a84991adb7..78674306e2fa 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -4,1739 +4,1731 @@
 
 {
   akonadi = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz";
-      sha256 = "c91cc53afd2f81fbeed55700cd86010ee865de2594948769410167e6992bdb32";
-      name = "akonadi-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-20.08.0.tar.xz";
+      sha256 = "a18ce2d8c9e9fc7f195a7546ee5b7c2541e37ceb7afa0aa25e9ade4f54de2813";
+      name = "akonadi-20.08.0.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz";
-      sha256 = "ff8732b0d09b87ce0760b7df02ee390d3c0c064780076ed4c6ed05c52ca634bb";
-      name = "akonadi-calendar-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-20.08.0.tar.xz";
+      sha256 = "4664e2dc6bc0762d999662188c64410fa70be2cef1be221569ec3b9270f80fd8";
+      name = "akonadi-calendar-20.08.0.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz";
-      sha256 = "654fec93158e6623a8a81a371fa85d0a18b9f486f6c29926d97a8105a2d65ed2";
-      name = "akonadi-calendar-tools-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-tools-20.08.0.tar.xz";
+      sha256 = "f994db29d374b0fbfd3328fc618df44680b0dfaec1cf9f842a7a9c6ecbb841fa";
+      name = "akonadi-calendar-tools-20.08.0.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz";
-      sha256 = "acd6d63a30af49ec66ff30c3ecdd4e53c4f4a15c4d1e41ffd988366b5106447c";
-      name = "akonadiconsole-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadiconsole-20.08.0.tar.xz";
+      sha256 = "a43c6b756a69301f7756464deea58c72aaefaa1b47f1136959588e8f41b7b91b";
+      name = "akonadiconsole-20.08.0.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz";
-      sha256 = "5bcd7acc70631e844ed77e127ff895efb573b62ef79062a6065e24b8826af39d";
-      name = "akonadi-contacts-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-contacts-20.08.0.tar.xz";
+      sha256 = "206f0704768a789201ead784e78d7138aba6b50b8f3880369df8799730fca8b4";
+      name = "akonadi-contacts-20.08.0.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz";
-      sha256 = "225615f9d64166ce33718817dfda7aadada5876204c939edc1455ae01b7bf1b2";
-      name = "akonadi-import-wizard-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-import-wizard-20.08.0.tar.xz";
+      sha256 = "d742ced3b498f39edff33f7fc73db1e882bf4b1e17b35d5f734f8732cb1e7bde";
+      name = "akonadi-import-wizard-20.08.0.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz";
-      sha256 = "92e9bab71f87c0de8e3437dd4779054332826fe2522c36a7c038c789b207f7ac";
-      name = "akonadi-mime-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-mime-20.08.0.tar.xz";
+      sha256 = "c0a709e25fef86f778ef21adbf78c6beab203f4f4a8d9f5e17a4d3175fe01d33";
+      name = "akonadi-mime-20.08.0.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz";
-      sha256 = "e1b4b6d2347038774589a9a8a935e4697d248008dfd2b5b496e6555974c96a55";
-      name = "akonadi-notes-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-notes-20.08.0.tar.xz";
+      sha256 = "aeb348d6af30e8775d60cab0894634c6e5ac95a3baf97f69407602dea5944525";
+      name = "akonadi-notes-20.08.0.tar.xz";
     };
   };
   akonadi-search = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz";
-      sha256 = "21ca09d39d6e550ca01e80f1a112557f00387e014763b1f47824d53d41cb5bdf";
-      name = "akonadi-search-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akonadi-search-20.08.0.tar.xz";
+      sha256 = "06974398ddd6cbd42d0cb9dc3cac4b6ad6bdc8062d1f94523a973ed702b40e2f";
+      name = "akonadi-search-20.08.0.tar.xz";
     };
   };
   akregator = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz";
-      sha256 = "e175a1b60270ad76afaf16e8e5630d237cdc068c06d0ae93591494b18ad4584c";
-      name = "akregator-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/akregator-20.08.0.tar.xz";
+      sha256 = "e8dbef1b8e8c165e824f108a33f9d2a6a0ea8668299f808fcc2ce2b4d398dcf5";
+      name = "akregator-20.08.0.tar.xz";
     };
   };
   analitza = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz";
-      sha256 = "f9d1873c6190dc1eaeb6fad97d4197256342e0b729f7e8199e15bfb495f854b7";
-      name = "analitza-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/analitza-20.08.0.tar.xz";
+      sha256 = "51bc5ecd31e557fcf5660e57458aa866ee44e386550bb2c37c22fae252405aa1";
+      name = "analitza-20.08.0.tar.xz";
     };
   };
   ark = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz";
-      sha256 = "e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc";
-      name = "ark-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/ark-20.08.0.tar.xz";
+      sha256 = "7627ffa17466d31dfdedabaa07b491ce14b46041d04f8b20316a0fa731fab098";
+      name = "ark-20.08.0.tar.xz";
     };
   };
   artikulate = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz";
-      sha256 = "394e93df2b370ba1e6621b2bcf871be42efde6fa2189de29d4c8198e387767ea";
-      name = "artikulate-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/artikulate-20.08.0.tar.xz";
+      sha256 = "30ef4eedabebccfb600eec1ba7bc691e8ad4e0de8d7fdcf56a630714d6b9848b";
+      name = "artikulate-20.08.0.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz";
-      sha256 = "af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929";
-      name = "audiocd-kio-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/audiocd-kio-20.08.0.tar.xz";
+      sha256 = "7a01d5b89f5271ee1eba203e15c46b146879e4651643ec6348e1033c0ffdc8c7";
+      name = "audiocd-kio-20.08.0.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz";
-      sha256 = "29394f9d47407074a5ec0f85ceade5dcc8c03f0d9a83c1e339310f19f7711ae3";
-      name = "baloo-widgets-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/baloo-widgets-20.08.0.tar.xz";
+      sha256 = "37800c3cde7e2a9cfbab2e11f21dd1ae76b2a31b687802bc45027966a8734985";
+      name = "baloo-widgets-20.08.0.tar.xz";
     };
   };
   blinken = {
-    version = "20.04.3";
+    version = "20.08.0";
     src = fetchurl {
-      url = "${mirror}/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz";
-      sha256 = "d6901fe40768ba8319609bfd143b2d1c585b04a148aedcb4b358b041db7f1afb";
-      name = "blinken-20.04.3.tar.xz";
+      url = "${mirror}/stable/release-service/20.08.0/src/blinken-20.08.0.tar.xz";
+      sha256 = "0a08f5fc8e0c100956bb99910265d9630191e462f8f812842e7