Merge pull request #79011 from ttuegel/update--plasma-5.17.5

Plasma 5.17.5

maintainers/scripts/fetch-kde-qt.sh

@@ -28,7 +28,8 @@ find . -type f | while read src; do
 done
 
 cat >"$SRCS" <<EOF
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+# DO NOT EDIT! This file is generated automatically.
+# Command: $0 $@
 { fetchurl, mirror }:
 
 {

nixos/modules/services/x11/desktop-managers/plasma5.nix

@@ -60,7 +60,7 @@ in
                   -e '/^toolBarFont=/ s/,Regular$//'
           fi
 
-          exec "${getBin plasma5.plasma-workspace}/bin/startkde"
+          exec "${getBin plasma5.plasma-workspace}/bin/startplasma-x11"
         '';
       };
 
@@ -137,6 +137,7 @@ in
           libkscreen
           libksysguard
           milou
+          plasma-browser-integration
           plasma-integration
           polkit-kde-agent
           systemsettings

pkgs/desktops/plasma-5/fetch.sh

@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.16.5/ )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ )

pkgs/desktops/plasma-5/kscreen.nix

@@ -1,17 +1,17 @@
 {
   mkDerivation,
   extra-cmake-modules,
-  kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
+  kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n,
-  kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, kwindowsystem, 
+  kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects,
-  kdeclarative, plasma-framework
+  kwindowsystem, kdeclarative, plasma-framework
 }:
 
 mkDerivation {
   name = "kscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
+    kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n
-    libkscreen qtdeclarative qtgraphicaleffects kwindowsystem kdeclarative
+    kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects
-    plasma-framework
+    kwindowsystem kdeclarative plasma-framework
   ];
 }

pkgs/desktops/plasma-5/kwayland-integration.nix

@@ -1,11 +1,11 @@
 {
   mkDerivation,
   extra-cmake-modules,
-  kidletime, kwayland, kwindowsystem, qtbase,
+  kguiaddons, kidletime, kwayland, kwindowsystem, qtbase,
 }:
 
 mkDerivation {
   name = "kwayland-integration";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kidletime kwindowsystem kwayland qtbase ];
+  buildInputs = [ kguiaddons kidletime kwindowsystem kwayland qtbase ];
 }

pkgs/desktops/plasma-5/kwin/0001-follow-symlinks.patch

@@ -0,0 +1,25 @@
+From 449896c45b23f50c168d8d2789832024c906ec36 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Mon, 27 Jan 2020 05:31:13 -0600
+Subject: [PATCH 1/2] follow symlinks
+
+---
+ plugins/kdecorations/aurorae/src/aurorae.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/kdecorations/aurorae/src/aurorae.cpp b/plugins/kdecorations/aurorae/src/aurorae.cpp
+index fd723a8..fb95633 100644
+--- a/plugins/kdecorations/aurorae/src/aurorae.cpp
++++ b/plugins/kdecorations/aurorae/src/aurorae.cpp
+@@ -211,7 +211,7 @@ void Helper::init()
+     // so let's try to locate our plugin:
+     QString pluginPath;
+     for (const QString &path : m_engine->importPathList()) {
+-        QDirIterator it(path, QDirIterator::Subdirectories);
++        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             it.next();
+             QFileInfo fileInfo = it.fileInfo();
+-- 
+2.23.1
+

pkgs/desktops/plasma-5/kwin/0002-xwayland.patch

@@ -1,8 +1,17 @@
-Index: kwin-5.15.5/xwl/xwayland.cpp
+From d584b075d71c4486710c0bbed6d44038f2ff5075 Mon Sep 17 00:00:00 2001
-===================================================================
+From: Thomas Tuegel <ttuegel@mailbox.org>
---- kwin-5.15.5.orig/xwl/xwayland.cpp
+Date: Mon, 27 Jan 2020 05:31:23 -0600
-+++ kwin-5.15.5/xwl/xwayland.cpp
+Subject: [PATCH 2/2] xwayland
-@@ -143,7 +143,7 @@ void Xwayland::init()
+
+---
+ xwl/xwayland.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xwl/xwayland.cpp b/xwl/xwayland.cpp
+index 5f17d39..b4b69ba 100644
+--- a/xwl/xwayland.cpp
++++ b/xwl/xwayland.cpp
+@@ -145,7 +145,7 @@ void Xwayland::init()
  
      m_xwaylandProcess = new Process(this);
      m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
@@ -11,3 +20,6 @@ Index: kwin-5.15.5/xwl/xwayland.cpp
      QProcessEnvironment env = m_app->processStartupEnvironment();
      env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
      env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM"));
+-- 
+2.23.1
+

pkgs/desktops/plasma-5/kwin/default.nix

@@ -14,6 +14,9 @@
   plasma-framework, qtsensors, libcap, libdrm
 }:
 
+# TODO (ttuegel): investigate qmlplugindump failure
+# TODO (ttuegel): investigate gbm dependency
+
 mkDerivation {
   name = "kwin";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
@@ -30,7 +33,10 @@ mkDerivation {
     libcap libdrm
   ];
   outputs = [ "bin" "dev" "out" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  patches = [
+    ./0001-follow-symlinks.patch
+    ./0002-xwayland.patch
+  ];
   CXXFLAGS = [
     ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''
   ];

pkgs/desktops/plasma-5/kwin/follow-symlinks.patch

@@ -1,13 +0,0 @@
-Index: kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp
-===================================================================
---- kwin-5.7.3.orig/plugins/kdecorations/aurorae/src/aurorae.cpp
-+++ kwin-5.7.3/plugins/kdecorations/aurorae/src/aurorae.cpp
-@@ -211,7 +211,7 @@ void Helper::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();

pkgs/desktops/plasma-5/kwin/no-setcap-install.patch

@@ -1,24 +0,0 @@
-Dont set capabilities on kwin_wayland executable at build time
-
-This is handled by security.wrappers on NixOS
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48cbcdbfe..93b410ed8 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -674,15 +674,6 @@ if (HAVE_LIBCAP)
- endif()
-
- install(TARGETS kwin_wayland         ${INSTALL_TARGETS_DEFAULT_ARGS} )
--if (HAVE_LIBCAP)
--    install(
--    CODE "execute_process(
--            COMMAND
--                ${SETCAP_EXECUTABLE}
--                CAP_SYS_NICE=+ep
--                \$ENV{DESTDIR}${CMAKE_INSTALL_FULL_BINDIR}/kwin_wayland)"
--    )
--endif()
-
- add_subdirectory(platformsupport)
- add_subdirectory(plugins)

pkgs/desktops/plasma-5/kwin/series

@@ -1,3 +0,0 @@
-follow-symlinks.patch
-xwayland.patch
-no-setcap-install.patch

pkgs/desktops/plasma-5/milou.nix

@@ -1,15 +1,15 @@
 {
   mkDerivation,
   extra-cmake-modules,
-  kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
+  kcoreaddons, kdeclarative, ki18n, kitemmodels, krunner, kservice,
-  qtscript, qtdeclarative
+  plasma-framework, qtscript, qtdeclarative
 }:
 
 mkDerivation {
   name = "milou";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
+    kcoreaddons kdeclarative ki18n kitemmodels krunner kservice plasma-framework
     qtdeclarative qtscript
   ];
 }

pkgs/desktops/plasma-5/plasma-browser-integration.nix

@@ -1,11 +1,18 @@
-{ mkDerivation, extra-cmake-modules, qtbase, kio, ki18n, kconfig
+{
-, kdbusaddons, knotifications, krunner, kwindowsystem, kactivities
+  mkDerivation,
+  extra-cmake-modules,
+  qtbase,
+  kfilemetadata, kio, ki18n, kconfig , kdbusaddons, knotifications, kpurpose,
+  krunner, kwindowsystem, kactivities,
 }:
 
 mkDerivation {
   name = "plasma-browser-integration";
   nativeBuildInputs = [
-    extra-cmake-modules qtbase kio ki18n kconfig kdbusaddons
+    extra-cmake-modules
-    knotifications krunner kwindowsystem kactivities
+  ];
+  buildInputs = [
+    qtbase kfilemetadata kio ki18n kconfig kdbusaddons knotifications kpurpose
+    krunner kwindowsystem kactivities
   ];
 }

pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch

@@ -0,0 +1,129 @@
+From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Tue, 28 Jan 2020 05:00:53 -0600
+Subject: [PATCH 1/2] startkde
+
+---
+ startkde/startplasma-waylandsession.cpp |  2 +-
+ startkde/startplasma-x11.cpp            |  2 +-
+ startkde/startplasma.cpp                | 32 ++++++++-----------------
+ 3 files changed, 12 insertions(+), 24 deletions(-)
+
+diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
+index 87c71c6..5fc5314 100644
+--- a/startkde/startplasma-waylandsession.cpp
++++ b/startkde/startplasma-waylandsession.cpp
+@@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/)
+     waitForKonqi();
+     out << "startplasma-waylandsession: Shutting down...\n";
+ 
+-    runSync(QStringLiteral("kdeinit5_shutdown"), {});
++    runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
+ 
+     cleanupX11();
+     out << "startplasma-waylandsession: Done.\n";
+diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
+index 3314b62..14cbe29 100644
+--- a/startkde/startplasma-x11.cpp
++++ b/startkde/startplasma-x11.cpp
+@@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/)
+ 
+     out << "startkde: Shutting down...\n";
+ 
+-    runSync(QStringLiteral("kdeinit5_shutdown"), {});
++    runSync(QStringLiteral(NIXPKGS_KDEINIT5_SHUTDOWN), {});
+ 
+     cleanupPlasmaEnvironment();
+     cleanupX11();
+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
+index e0f7004..8ac41fd 100644
+--- a/startkde/startplasma.cpp
++++ b/startkde/startplasma.cpp
+@@ -34,7 +34,7 @@ QTextStream out(stderr);
+ void messageBox(const QString &text)
+ {
+     out << text;
+-    runSync(QStringLiteral("xmessage"), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
++    runSync(QStringLiteral(NIXPKGS_XMESSAGE), {QStringLiteral("-geometry"), QStringLiteral("500x100"), text});
+ }
+ 
+ QStringList allServices(const QLatin1String& prefix)
+@@ -184,14 +184,6 @@ void runEnvironmentScripts()
+         }
+     }
+     sourceFiles(scripts);
+-
+-    // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+-    // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
+-    // to set it to a list of paths *not* including the KDE prefix if it's not /usr or
+-    // /usr/local.
+-    if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) {
+-        qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share");
+-    }
+ }
+ 
+ 
+@@ -240,15 +232,15 @@ void setupX11()
+ //     If the user has overwritten fonts, the cursor font may be different now
+ //     so don't move this up.
+ 
+-    runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
+-    runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
+-    runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
++    runSync(QStringLiteral(NIXPKGS_XSETROOT), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
++    runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("8t"), QStringLiteral("-set"), QStringLiteral("KDE_FULL_SESSION"), QStringLiteral("true")});
++    runSync(QStringLiteral(NIXPKGS_XPROP), {QStringLiteral("-root"), QStringLiteral("-f"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("32c"), QStringLiteral("-set"), QStringLiteral("KDE_SESSION_VERSION"), QStringLiteral("5")});
+ }
+ 
+ void cleanupX11()
+ {
+-    runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
+-    runSync(QStringLiteral("xprop"), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
++    runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION") });
++    runSync(QStringLiteral(NIXPKGS_XPROP), { QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION") });
+ }
+ 
+ // TODO: Check if Necessary
+@@ -265,11 +257,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;
+ }
+ 
+@@ -285,7 +273,7 @@ void setupFontDpi()
+     //TODO port to c++?
+     const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0));
+     QProcess p;
+-    p.start(QStringLiteral("xrdb"), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
++    p.start(QStringLiteral(NIXPKGS_XRDB), { QStringLiteral("-quiet"), QStringLiteral("-merge"), QStringLiteral("-nocpp") });
+     p.setProcessChannelMode(QProcess::ForwardedChannels);
+     p.write(input);
+     p.closeWriteChannel();
+@@ -307,7 +295,7 @@ QProcess* setupKSplash()
+         KConfigGroup ksplashCfg = cfg.group("KSplash");
+         if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
+             p = new QProcess;
+-            p->start(QStringLiteral("ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
++            p->start(QStringLiteral(CMAKE_INSTALL_FULL_BINDIR "/ksplashqml"), { ksplashCfg.readEntry("Theme", QStringLiteral("Breeze")) });
+         }
+     }
+     return p;
+@@ -329,7 +317,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.23.1
+

pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch

@@ -0,0 +1,22 @@
+From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@mailbox.org>
+Date: Wed, 5 Feb 2020 05:03:11 -0600
+Subject: [PATCH 2/2] absolute-wallpaper-install-dir
+
+---
+ sddm-theme/theme.conf.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake
+index ea9a943..c8458ba 100644
+--- a/sddm-theme/theme.conf.cmake
++++ b/sddm-theme/theme.conf.cmake
+@@ -2,4 +2,4 @@
+ type=image
+ color=#1d99f3
+ fontSize=10
+-background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png
++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png
+-- 
+2.23.1
+

pkgs/desktops/plasma-5/plasma-workspace/default.nix

@@ -6,12 +6,12 @@
   coreutils, dbus, gnugrep, gnused, isocodes, libdbusmenu, libSM, libXcursor,
   libXtst, pam, wayland, xmessage, xprop, xrdb, xsetroot,
 
-  baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
+  baloo, breeze-qt5, kactivities, kactivities-stats, kcmutils, kconfig, kcrash,
-  kdelibs4support, kdesu, kglobalaccel, kidletime, kinit, kjsembed, knewstuff,
+  kdbusaddons, kdeclarative, kdelibs4support, kdesu, kglobalaccel, kidletime,
-  knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
+  kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner,
-  kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate,
+  kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin,
-  networkmanager-qt, phonon, plasma-framework, prison, solid, kholidays,
+  kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt,
-  breeze-qt5,
+  phonon, plasma-framework, prison, solid, kholidays,
 
   qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools,
   qtwayland, qtx11extras,
@@ -26,11 +26,12 @@ mkDerivation {
   buildInputs = [
     isocodes libdbusmenu libSM libXcursor libXtst pam wayland
 
-    baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
+    baloo kactivities kactivities-stats kcmutils kconfig kcrash kdbusaddons
-    kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
+    kdeclarative kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
-    knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
+    knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor
-    kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate
+    ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
-    networkmanager-qt phonon plasma-framework prison solid kholidays
+    libqalculate networkmanager-qt phonon plasma-framework prison solid
+    kholidays
 
     qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras
   ];
@@ -38,41 +39,22 @@ mkDerivation {
   outputs = [ "out" "dev" ];
 
   cmakeFlags = [
-    "-DNIXPKGS_XMESSAGE=${getBin xmessage}/bin/xmessage"
+    ''-DNIXPKGS_BREEZE_WALLPAPERS=${getBin breeze-qt5}/share/wallpapers''
-    "-DNIXPKGS_MKDIR=${getBin coreutils}/bin/mkdir"
-    "-DNIXPKGS_XRDB=${getBin xrdb}/bin/xrdb"
-    "-DNIXPKGS_QTPATHS=${getBin qttools}/bin/qtpaths"
-    "-DNIXPKGS_XSETROOT=${getBin xsetroot}/bin/xsetroot"
-    "-DNIXPKGS_XPROP=${getBin xprop}/bin/xprop"
-    "-DNIXPKGS_ID=${getBin coreutils}/bin/id"
-    "-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT=${getBin dbus}/bin/dbus-update-activation-environment"
-    "-DNIXPKGS_START_KDEINIT_WRAPPER=${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"
-    "-DNIXPKGS_QDBUS=${getBin qttools}/bin/qdbus"
-    "-DNIXPKGS_KWRAPPER5=${getBin kinit}/bin/kwrapper5"
-    "-DNIXPKGS_KREADCONFIG5=${getBin kconfig}/bin/kreadconfig5"
-    "-DNIXPKGS_GREP=${getBin gnugrep}/bin/grep"
-    "-DNIXPKGS_KDEINIT5_SHUTDOWN=${getBin kinit}/bin/kdeinit5_shutdown"
-    "-DNIXPKGS_SED=${getBin gnused}/bin/sed"
-    "-DNIXPKGS_WALLPAPER_INSTALL_DIR=${getBin breeze-qt5}/share/wallpapers/"
   ];
 
-  # To regenerate ./plasma-workspace.patch,
-  #
-  # > git clone https://github.com/ttuegel/plasma-workspace
-  # > cd plasma-workspace
-  # > git checkout nixpkgs/$x.$y  # where $x.$y.$z == $version
-  # ... make some commits ...
-  # > git diff v$x.$y.$z
-  #
-  # Add upstream patches to the list below. For new patchs, particularly if not
-  # submitted upstream, please make a pull request and add it to
-  # ./plasma-workspace.patch.
   patches = [
-    ./plasma-workspace.patch
+    ./0001-startkde.patch
+    ./0002-absolute-wallpaper-install-dir.patch
   ];
 
-  preConfigure = ''
+
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_KDOSTARTUPCONFIG5=\"''${!outputBin}/bin/kdostartupconfig5\""
+  NIX_CFLAGS_COMPILE = [
-    cmakeFlags+=" -DNIXPKGS_STARTPLASMA=''${!outputBin}/libexec/startplasma"
+    ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"''
-  '';
+    ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"''
+    ''-DNIXPKGS_XSETROOT="${getBin xsetroot}/bin/xsetroot"''
+    ''-DNIXPKGS_XPROP="${getBin xprop}/bin/xprop"''
+    ''-DNIXPKGS_DBUS_UPDATE_ACTIVATION_ENVIRONMENT="${getBin dbus}/bin/dbus-update-activation-environment"''
+    ''-DNIXPKGS_START_KDEINIT_WRAPPER="${getLib kinit}/libexec/kf5/start_kdeinit_wrapper"''
+    ''-DNIXPKGS_KDEINIT5_SHUTDOWN="${getBin kinit}/bin/kdeinit5_shutdown"''
+  ];
 }

pkgs/desktops/plasma-5/srcs.nix

@@ -1,365 +1,374 @@
-# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
+# DO NOT EDIT! This file is generated automatically.
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/
 { fetchurl, mirror }:
 
 {
   bluedevil = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/bluedevil-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/bluedevil-5.17.5.tar.xz";
-      sha256 = "60ac3471d30cb113b1959eacdaa1f4898f04f779f94a35dbca00993cda4ea464";
+      sha256 = "22e9c683dfc56a559e652809ade238f8eb0ffb09d5ab042f5cd4b8216f647c09";
-      name = "bluedevil-5.16.5.tar.xz";
+      name = "bluedevil-5.17.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/breeze-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/breeze-5.17.5.tar.xz";
-      sha256 = "09225021a2cf396e74cabe692b0a5dcf9a12f0b47f02fb14df6ccc9db01f2e6b";
+      sha256 = "f89bf857321b18789089efc9271d7bd7b6459a173dd078dd03242775db76c8d7";
-      name = "breeze-5.16.5.tar.xz";
+      name = "breeze-5.17.5.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/breeze-grub-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/breeze-grub-5.17.5.tar.xz";
-      sha256 = "ce73297350e7b79b04aa8ba44594e8eca2d37c0342eb331bd5d31679f3887878";
+      sha256 = "591a1d7a510c76a1f2729a61a4d14c0f33db4d1e8ea5dbc87b74f2e7e7e2a2ba";
-      name = "breeze-grub-5.16.5.tar.xz";
+      name = "breeze-grub-5.17.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/breeze-gtk-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/breeze-gtk-5.17.5.tar.xz";
-      sha256 = "d9849ecf6c2fc85fde76912410ab36c46ca65b96d80b4e51819ca35015a88098";
+      sha256 = "6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66";
-      name = "breeze-gtk-5.16.5.tar.xz";
+      name = "breeze-gtk-5.17.5.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/breeze-plymouth-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/breeze-plymouth-5.17.5.tar.xz";
-      sha256 = "bb10d2f0185181e6f2fe8e3b85415dfcce6069595e0074b182688c6f567dd0b0";
+      sha256 = "e95f9eaf04e74383f5e1abe74d999787e408be7a34fd07a4f64e253e35150af0";
-      name = "breeze-plymouth-5.16.5.tar.xz";
+      name = "breeze-plymouth-5.17.5.tar.xz";
     };
   };
   discover = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/discover-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/discover-5.17.5.tar.xz";
-      sha256 = "26c47a5c0f59a31f37da85e894a926c76805b66f91dde8ba6d2de8015842d5c1";
+      sha256 = "986ef367aef59c5a956d4163f987a60cfd3674a300880376ddedc0222769789f";
-      name = "discover-5.16.5.tar.xz";
+      name = "discover-5.17.5.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/drkonqi-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/drkonqi-5.17.5.tar.xz";
-      sha256 = "b4ae1518108c2d3ccbc533708801b52b83b7e9efd6eed9f1ee9d67936b9e78ff";
+      sha256 = "756c50f2458a8c564e608ea97244f6b2b3d5fb4a675a8cec29307be1d5ab5457";
-      name = "drkonqi-5.16.5.tar.xz";
+      name = "drkonqi-5.17.5.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kactivitymanagerd-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kactivitymanagerd-5.17.5.tar.xz";
-      sha256 = "e35dbf7aae8a7b7f21b2304935cad96881af558a7c9d947f0114093038b1c4bc";
+      sha256 = "362721c3a9712751fba29cd1f1ef440a1e74561a611f2d171692a4ddc895b3e4";
-      name = "kactivitymanagerd-5.16.5.tar.xz";
+      name = "kactivitymanagerd-5.17.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kde-cli-tools-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kde-cli-tools-5.17.5.tar.xz";
-      sha256 = "bc82b159d3c9a23f0ecb47a8314b645041b01692887a3be0ef0582d54f926de2";
+      sha256 = "d14299ebeaf89854cb89435cfaaa4da1d84bf23a97df23ff8c7f95dae5bec55f";
-      name = "kde-cli-tools-5.16.5.tar.xz";
+      name = "kde-cli-tools-5.17.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kdecoration-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kdecoration-5.17.5.tar.xz";
-      sha256 = "2b8c7b7cf114d0eff4ec842009cda264d8cf1254ec4bf65868b6d26f263829bb";
+      sha256 = "7d8f0128306d436aeba010e47a3dddbcb9fb9fd05ef9308cbad1934914875cd9";
-      name = "kdecoration-5.16.5.tar.xz";
+      name = "kdecoration-5.17.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kde-gtk-config-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kde-gtk-config-5.17.5.tar.xz";
-      sha256 = "f78abf129aaa7afac2c7a71105b36b9553a975bbcb89ec65a0166099d1cca8c1";
+      sha256 = "5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010";
-      name = "kde-gtk-config-5.16.5.tar.xz";
+      name = "kde-gtk-config-5.17.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kdeplasma-addons-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kdeplasma-addons-5.17.5.tar.xz";
-      sha256 = "a4737a54b75143053a9f8a5bc28c608f843c524872c665d4e5a65bd2853e1e00";
+      sha256 = "997d6a3542ab1f1fd7fb17580693dc8281ff29b03c82577dbae3fc1ec4cccdb8";
-      name = "kdeplasma-addons-5.16.5.tar.xz";
+      name = "kdeplasma-addons-5.17.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kgamma5-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kgamma5-5.17.5.tar.xz";
-      sha256 = "838fabf4312f022ee3df5bba940c0c73e26260cfee39235c1ba8da8a2e61bfa0";
+      sha256 = "3b8fd1539d035d4d39dcde6ca0dd214e6653c98778ac79b9cbf2f7009b155ca9";
-      name = "kgamma5-5.16.5.tar.xz";
+      name = "kgamma5-5.17.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/khotkeys-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/khotkeys-5.17.5.tar.xz";
-      sha256 = "e7b866b5249ff7c5860a5a222dca79691ca1f09af176f786021fbbadbd718c8c";
+      sha256 = "cf78b5bfb8568fb4eea592b209bdb79aeac92bd08a580c3b6c08d45dd34a2d56";
-      name = "khotkeys-5.16.5.tar.xz";
+      name = "khotkeys-5.17.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kinfocenter-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz";
-      sha256 = "e3bbc5e2baedf35dc8750c99e18c115b651f2665218a105c08177bc5250eb9b1";
+      sha256 = "679870f10ee6494136d87a897a57a23c2905054d7a83ff11a4e85c204eb9fd9a";
-      name = "kinfocenter-5.16.5.tar.xz";
+      name = "kinfocenter-5.17.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kmenuedit-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kmenuedit-5.17.5.tar.xz";
-      sha256 = "8e95b81b910e5e78689fc7d4427c813ba7d39426df24cf8606adb850913a19a4";
+      sha256 = "59beed03298cd9fd6b05d67844794ed6a77be0d1b25b55d5bbcdf72e15e357de";
-      name = "kmenuedit-5.16.5.tar.xz";
+      name = "kmenuedit-5.17.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kscreen-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kscreen-5.17.5.tar.xz";
-      sha256 = "ce35f554014cee819767180f0c9381d539e497edfb9c290b279fa78e9dea4bb0";
+      sha256 = "de8a00b33d0254245a53a5c097347aa86709d415754b3e3c675eef8fb4fe5bc0";
-      name = "kscreen-5.16.5.tar.xz";
+      name = "kscreen-5.17.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kscreenlocker-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kscreenlocker-5.17.5.tar.xz";
-      sha256 = "5ed6fdeac9aaba014edf67c5f782fc210d58310d083afaa589d0ff1bb3e8e02d";
+      sha256 = "078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f";
-      name = "kscreenlocker-5.16.5.tar.xz";
+      name = "kscreenlocker-5.17.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/ksshaskpass-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/ksshaskpass-5.17.5.tar.xz";
-      sha256 = "78eaa38ebbf888a8905e9385173e7161335041d6d07720283ce6f3fa06426a33";
+      sha256 = "b09e0d780340fc5a6a65e67a30d08a3f117f31e2dbfbb35579aa4cefb15c3b27";
-      name = "ksshaskpass-5.16.5.tar.xz";
+      name = "ksshaskpass-5.17.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/ksysguard-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz";
-      sha256 = "5558977389cb1fac4a5ce52c9430b27d9d1ee92705ae1995d92bed5340477282";
+      sha256 = "69bc12311dcf363b168a259139d30456ed395ec03b948bd35e992300c7e7bd82";
-      name = "ksysguard-5.16.5.tar.xz";
+      name = "ksysguard-5.17.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kwallet-pam-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kwallet-pam-5.17.5.tar.xz";
-      sha256 = "4a12a8ed51973f9ea318a39a699523bcc99ae4e1cac932fccd19dedd45e758a8";
+      sha256 = "c829c7a44408e58beb87c71f5c70bccd349d285c3fcefb16df98bf2f29357fe9";
-      name = "kwallet-pam-5.16.5.tar.xz";
+      name = "kwallet-pam-5.17.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kwayland-integration-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kwayland-integration-5.17.5.tar.xz";
-      sha256 = "63724ecfb6db053ee949273979b393192309dbeed45b59bc193a605f90232282";
+      sha256 = "818b4e14611e26f297ef60427d399edc458a44e113bc092390fa65ecababcedb";
-      name = "kwayland-integration-5.16.5.tar.xz";
+      name = "kwayland-integration-5.17.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kwin-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kwin-5.17.5.tar.xz";
-      sha256 = "7ff0e114e323ff7e10d78a157f8242b1d3cfa03967898d9e3fd3c039b7c9918b";
+      sha256 = "8517adaf8270d783aea7b3886d86b5abed6a5ec2b5c78b632479597d956baadc";
-      name = "kwin-5.16.5.tar.xz";
+      name = "kwin-5.17.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/kwrited-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/kwrited-5.17.5.tar.xz";
-      sha256 = "4b122099b0a362fc409b50b7523689ba8a112508dad26f58753c6b648e7c5313";
+      sha256 = "ca22b1fa3e657fa2e58bf0c9dc1ebff3be8c0e003750223e7a7c5932d5b90823";
-      name = "kwrited-5.16.5.tar.xz";
+      name = "kwrited-5.17.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/libkscreen-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/libkscreen-5.17.5.tar.xz";
-      sha256 = "fd2d1e849315ac745ecfe757d6b2c5cc6486e0be5397f686dae3916c0252c938";
+      sha256 = "aa186e5751287701daec4d036aba776a911e4b84ca7eea44dc5fb531875afd94";
-      name = "libkscreen-5.16.5.tar.xz";
+      name = "libkscreen-5.17.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/libksysguard-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/libksysguard-5.17.5.tar.xz";
-      sha256 = "f09b99737a937df890ecdd2a33720b6cba3c79fc8bc17ef1470572748a6e1976";
+      sha256 = "f5d237af554d65740a28360e6d8fa39d4912239c5f21288846b1c934897a7e14";
-      name = "libksysguard-5.16.5.tar.xz";
+      name = "libksysguard-5.17.5.tar.xz";
     };
   };
   milou = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/milou-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/milou-5.17.5.tar.xz";
-      sha256 = "bfcdba29262dda9f386ee99132053ad5751194b2df8219899fcbb0b3699afcd5";
+      sha256 = "b89796e34cc8b6d6d4196169e814249f7b75c1c15763e0b4c1da5c97ccc2c8cf";
-      name = "milou-5.16.5.tar.xz";
+      name = "milou-5.17.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/oxygen-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/oxygen-5.17.5.tar.xz";
-      sha256 = "0e85dcd874d2e69aaa2d4eefc379289c7dd572437f53e42f1d6d260d97c2f8a2";
+      sha256 = "58954374a4b9067365ee5d50b32b1986b2e7dd31e73cbf79fda8d978949943be";
-      name = "oxygen-5.16.5.tar.xz";
+      name = "oxygen-5.17.5.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-browser-integration-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-browser-integration-5.17.5.tar.xz";
-      sha256 = "99269c7e27fddb0c075bff28a5afba41298dc8d28297d69f35f6bc30f3af1d35";
+      sha256 = "07bc4285991ab43830873a12b8c07f60e4faea1ec81121db783c425f18a4f87d";
-      name = "plasma-browser-integration-5.16.5.tar.xz";
+      name = "plasma-browser-integration-5.17.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-desktop-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-desktop-5.17.5.tar.xz";
-      sha256 = "49dc4c9eff5742eb52fc0d12c139c194eda837945389cd09f498a0c4c352a20f";
+      sha256 = "7f741ab026989bdcc68701955fc290d5ead38bf4bc310f18a2f32c64b411ab04";
-      name = "plasma-desktop-5.16.5.tar.xz";
+      name = "plasma-desktop-5.17.5.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-integration-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-integration-5.17.5.tar.xz";
-      sha256 = "635f109e7b59bb440c6be0c7a4baae70d2f44e659ab0522e170693b664e6d709";
+      sha256 = "169206bebd790d2fee49cec621c46f6f64a8e20ee3e56bf16ee7373f61cad959";
-      name = "plasma-integration-5.16.5.tar.xz";
+      name = "plasma-integration-5.17.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-nm-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-nm-5.17.5.tar.xz";
-      sha256 = "b519429bd784ff2ede0bf10e1e943822ef08ea5cf85e901363fda36d32907460";
+      sha256 = "2165e47a0654d17735abc97aec287b46b52a2eafccc3591b667ea2755b731255";
-      name = "plasma-nm-5.16.5.tar.xz";
+      name = "plasma-nm-5.17.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-pa-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-pa-5.17.5.tar.xz";
-      sha256 = "e029563d50cc6266a4a3e22574c33fef4670e1aaab18630eb30769e2167acc96";
+      sha256 = "933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23";
-      name = "plasma-pa-5.16.5.tar.xz";
+      name = "plasma-pa-5.17.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-sdk-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-sdk-5.17.5.tar.xz";
-      sha256 = "1b05f0501309099f241ebae857c24b31bc4e61fde8bfc33e854d3a1dd3d37385";
+      sha256 = "ff736029b1ae5773991db06f5827d9dcbd8e7a4e9a430c9014c35ddee2c55314";
-      name = "plasma-sdk-5.16.5.tar.xz";
+      name = "plasma-sdk-5.17.5.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-tests-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-tests-5.17.5.tar.xz";
-      sha256 = "236a83c2caa99801b6db1debce53a6c7390087115899410a8139ad3b7268b7f7";
+      sha256 = "1b566b7118a5c8d1b25078d331a6bc77f48781010fbd3425d85b137811218982";
-      name = "plasma-tests-5.16.5.tar.xz";
+      name = "plasma-tests-5.17.5.tar.xz";
+    };
+  };
+  plasma-thunderbolt = {
+    version = "5.17.5";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.17.5/plasma-thunderbolt-5.17.5.tar.xz";
+      sha256 = "3743f9841d269d51f1b1419e24d5cd1b26a0ba5a90e76b531328a8cc43184382";
+      name = "plasma-thunderbolt-5.17.5.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-vault-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-vault-5.17.5.tar.xz";
-      sha256 = "2bb40a80c35f3eaedc729013a8b6b76641cc74eca4fd171f1cda99237f83198c";
+      sha256 = "3e5c6b4dd6c1122b6a221205da506881959ab905e467b74b0536e7f5fe130d71";
-      name = "plasma-vault-5.16.5.tar.xz";
+      name = "plasma-vault-5.17.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-5.17.5.tar.xz";
-      sha256 = "43364fe4e7ea10ad7b5b1d7af4f1baa1d8796b60692f2dfc0d58693f63e458ff";
+      sha256 = "764488e66d52bc3017efb2c1471f57196aa50fbfa3a80637bf48f24955cfba88";
-      name = "plasma-workspace-5.16.5.tar.xz";
+      name = "plasma-workspace-5.17.5.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plasma-workspace-wallpapers-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-wallpapers-5.17.5.tar.xz";
-      sha256 = "ff6e0eac42c540c72556439e6477fb78be2dab456386218813cce021f82d42d9";
+      sha256 = "8a28ef67b65c340d40ff8f5bfc333ead68e6d8c9e410769c43af847ced9b4ca9";
-      name = "plasma-workspace-wallpapers-5.16.5.tar.xz";
+      name = "plasma-workspace-wallpapers-5.17.5.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/plymouth-kcm-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/plymouth-kcm-5.17.5.tar.xz";
-      sha256 = "db839c5fe9f6df882b95f436983c129cd553dd50e6cf1065c4410a91b20f1dcc";
+      sha256 = "bbd6994f60ed9d63b4e4dd0abe78bf1f9c14b8ecce8ba4355d16cd52a0a86528";
-      name = "plymouth-kcm-5.16.5.tar.xz";
+      name = "plymouth-kcm-5.17.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.16.5";
+    version = "1-5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/polkit-kde-agent-1-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/polkit-kde-agent-1-5.17.5.tar.xz";
-      sha256 = "6f7a17990d72bb25c93acae919b764f95ac226754209b2e177075fbe9251f95f";
+      sha256 = "a79d76a2f584f6567639228fde6f75b3960484f7a65cfc69b6acb6df1de53f5d";
-      name = "polkit-kde-agent-1-5.16.5.tar.xz";
+      name = "polkit-kde-agent-1-5.17.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/powerdevil-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/powerdevil-5.17.5.tar.xz";
-      sha256 = "ac868f31df8c6bcc6b1c850efa0640695ba698caabefcb21fc0b0c3405712139";
+      sha256 = "27904361e85e1267d933d8f0a0d3be4dc712099ed2eb3cf90959209a4443dd82";
-      name = "powerdevil-5.16.5.tar.xz";
+      name = "powerdevil-5.17.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/sddm-kcm-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/sddm-kcm-5.17.5.tar.xz";
-      sha256 = "4220d18f1a04c767649bffee1aed6c2b2c12c60cd7d6ca6fabc3dbec1ec3f127";
+      sha256 = "e85fb9e014439e8c0e73638112139561aff9a9f71f26c3eafedff5a98a07b33b";
-      name = "sddm-kcm-5.16.5.tar.xz";
+      name = "sddm-kcm-5.17.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/systemsettings-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/systemsettings-5.17.5.tar.xz";
-      sha256 = "57944cf3f566cf5e25d5859f5716b2ad5dbd87de259f8d77efdfdd50a16fe1ec";
+      sha256 = "50fa4d7866639995a6859446fc6a02a73ae05203e8f2ed31221e232ed3491eaf";
-      name = "systemsettings-5.16.5.tar.xz";
+      name = "systemsettings-5.17.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/user-manager-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/user-manager-5.17.5.tar.xz";
-      sha256 = "e9df3ec2718de68b0b46d0b86f993fe450b236e13dda6219f350121f08f4c468";
+      sha256 = "10ed3196063c7dfed3b3f25dd199a48ca39fa86db5d0126ec84a543b1c212f0d";
-      name = "user-manager-5.16.5.tar.xz";
+      name = "user-manager-5.17.5.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.16.5";
+    version = "5.17.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.16.5/xdg-desktop-portal-kde-5.16.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.17.5/xdg-desktop-portal-kde-5.17.5.tar.xz";
-      sha256 = "4884652b642fb6e8db791a04e9d42b5fec53f28cc0f0d26f49eb2bdaaa1709df";
+      sha256 = "a993bd4b86a44c8237a3f4957c2594aa2ca8916204ad866f8af32f7df34740f6";
-      name = "xdg-desktop-portal-kde-5.16.5.tar.xz";
+      name = "xdg-desktop-portal-kde-5.17.5.tar.xz";
     };
   };
 }