From a604b073b7516e4f237a8c23bca1f1fe54d5f8aa Mon Sep 17 00:00:00 2001 From: Tom Hall Date: Sat, 5 Sep 2020 15:18:05 +0100 Subject: [PATCH] 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 39299d8c83c0..b916a1708205 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 abb5659526f7..3af0147ce4a7 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 000000000000..771e093bb9e8 --- /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 000000000000..86f025589fe4 --- /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 e2fb0877ec86..388921dbf203 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 96d113e11fb6..40f223dd100c 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 73e449a13624..a07a50f04927 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 120800926296..37f8502e766c 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 6f9214ccd60c..d246588b589e 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"; }; }; }