From 7e0e4ce6addd80cbc2a9b1b961f5646b73f14696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 20 Sep 2018 12:29:15 +0200 Subject: [PATCH] plasma5: 5.13.5 -> 5.14.0 --- pkgs/desktops/plasma-5/breeze-qt5.nix | 4 +- pkgs/desktops/plasma-5/fetch.sh | 2 +- .../kde-gtk-config/patches/gsettings.patch | 16 +- .../plasma-5/plasma-integration/D9070.patch | 24 -- .../plasma-5/plasma-integration/default.nix | 7 - .../plasma-5/plasma-vault/cryfs-path.patch | 14 +- .../plasma-5/plasma-vault/encfs-path.patch | 20 +- .../plasma-vault/fusermount-path.patch | 6 +- .../plasma-5/plasma-workspace/default.nix | 4 - .../plasma-workspace/plasma-workspace.patch | 34 +- pkgs/desktops/plasma-5/srcs.nix | 360 +++++++++--------- 11 files changed, 225 insertions(+), 266 deletions(-) delete mode 100644 pkgs/desktops/plasma-5/plasma-integration/D9070.patch diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix index 1448bb40d78c..3f3222e05cdb 100644 --- a/pkgs/desktops/plasma-5/breeze-qt5.nix +++ b/pkgs/desktops/plasma-5/breeze-qt5.nix @@ -3,7 +3,7 @@ extra-cmake-modules, frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative, - qtx11extras + qtx11extras, fftw }: mkDerivation { @@ -13,7 +13,7 @@ mkDerivation { propagatedBuildInputs = [ frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative - qtx11extras + qtx11extras fftw ]; outputs = [ "bin" "dev" "out" ]; cmakeFlags = [ "-DUSE_Qt4=OFF" ]; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index fc1850b3c2a4..64907e6271d8 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.13.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.14.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch index b4bc89d59e9e..69f7bc4e56a0 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch +++ b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch @@ -1,11 +1,11 @@ -Index: kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/gtkconfigkcmodule.cpp -+++ kde-gtk-config-5.12.4/src/gtkconfigkcmodule.cpp -@@ -78,6 +78,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWi - m_iconsModel = new IconThemesModel(false, this); - ui->cb_icon->setModel(m_iconsModel); - ui->cb_icon_fallback->setModel(m_iconsModel); +diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp +index 7b82d50..96831d8 100644 +--- a/src/gtkconfigkcmodule.cpp ++++ b/src/gtkconfigkcmodule.cpp +@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args ) + iconsProxyModel->sort(0); + ui->cb_icon->setModel(iconsProxyModel); + ui->cb_icon_fallback->setModel(iconsProxyModel); + + // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. + // Normally this would be done by wrapGAppsHook, but this plugin diff --git a/pkgs/desktops/plasma-5/plasma-integration/D9070.patch b/pkgs/desktops/plasma-5/plasma-integration/D9070.patch deleted file mode 100644 index 66fef4712a7b..000000000000 --- a/pkgs/desktops/plasma-5/plasma-integration/D9070.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: src/platformtheme/kfontsettingsdata.cpp -=================================================================== ---- src/platformtheme/kfontsettingsdata.cpp -+++ src/platformtheme/kfontsettingsdata.cpp -@@ -70,15 +70,18 @@ - const KFontData &fontData = DefaultFontData[fontType]; - cachedFont = new QFont(QLatin1String(fontData.FontName), fontData.Size, fontData.Weight); - cachedFont->setStyleHint(fontData.StyleHint); -- cachedFont->setStyleName(QLatin1String(fontData.StyleName)); - - const KConfigGroup configGroup(mKdeGlobals, fontData.ConfigGroupKey); - QString fontInfo = configGroup.readEntry(fontData.ConfigKey, QString()); - - //If we have serialized information for this font, restore it - //NOTE: We are not using KConfig directly because we can't call QFont::QFont from here - if (!fontInfo.isEmpty()) { - cachedFont->fromString(fontInfo); -+ } else { -+ // set the canonical stylename here, where it cannot override -+ // user-specific font attributes if those do not include a stylename. -+ cachedFont->setStyleName(QLatin1String(fontData.StyleName)); - } - - mFonts[fontType] = cachedFont; diff --git a/pkgs/desktops/plasma-5/plasma-integration/default.nix b/pkgs/desktops/plasma-5/plasma-integration/default.nix index d33ecf050242..f69644287624 100644 --- a/pkgs/desktops/plasma-5/plasma-integration/default.nix +++ b/pkgs/desktops/plasma-5/plasma-integration/default.nix @@ -14,11 +14,4 @@ mkDerivation { breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland libXcursor qtquickcontrols2 ]; - patches = [ - # See also: https://phabricator.kde.org/D9070 - # ttuegel: The patch is checked into Nixpkgs because I could not get - # Phabricator to give me a stable link to it. - ./D9070.patch - ]; - patchFlags = "-p0"; } diff --git a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch index b3f19c4e0025..6bab35fe4a97 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch +++ b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch @@ -1,17 +1,13 @@ diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp -index f6ef54f..160034a 100644 +index 58a6929..7212980 100644 --- a/kded/engine/backends/cryfs/cryfsbackend.cpp +++ b/kded/engine/backends/cryfs/cryfsbackend.cpp -@@ -136,11 +136,10 @@ bool CryFsBackend::isInitialized(const Device &device) const +@@ -241,7 +241,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const + auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); + KConfigGroup backendConfig(config, "CryfsBackend"); - QProcess *CryFsBackend::cryfs(const QStringList &arguments) const - { - return process("cryfs", + return process(NIXPKGS_CRYFS, - arguments, + arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), { { "CRYFS_FRONTEND", "noninteractive" } }); } - - - } // namespace PlasmaVault -- diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch index b494df55c5d0..e1c325e16934 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch +++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch @@ -1,16 +1,17 @@ diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp -index 47bb237..4ff064d 100644 +index 628af7b..6edd38e 100644 --- a/kded/engine/backends/encfs/encfsbackend.cpp +++ b/kded/engine/backends/encfs/encfsbackend.cpp -@@ -132,17 +132,16 @@ bool EncFsBackend::isInitialized(const Device &device) const +@@ -137,7 +137,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const + auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); + KConfigGroup backendConfig(config, "EncfsBackend"); - QProcess *EncFsBackend::encfs(const QStringList &arguments) const - { -- return process("encfs", arguments, {}); -+ return process(NIXPKGS_ENCFS, arguments, {}); +- return process("encfs", ++ return process(NIXPKGS_ENCFS, + arguments + backendConfig.readEntry("extraMountOptions", QStringList{}), + {}); } - - +@@ -146,7 +146,7 @@ QProcess *EncFsBackend::encfs(const QStringList &arguments) const QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const { @@ -19,6 +20,3 @@ index 47bb237..4ff064d 100644 } - - } // namespace PlasmaVault -- diff --git a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch index cd1b736a103f..b2a7866531bf 100644 --- a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch +++ b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch @@ -1,8 +1,8 @@ diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp -index 81ce494..d3c5c9f 100644 +index d07e313..ea7d81c 100644 --- a/kded/engine/fusebackend_p.cpp +++ b/kded/engine/fusebackend_p.cpp -@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable, +@@ -106,7 +106,7 @@ QProcess *FuseBackend::process(const QString &executable, QProcess *FuseBackend::fusermount(const QStringList &arguments) const { @@ -11,7 +11,7 @@ index 81ce494..d3c5c9f 100644 } -@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const +@@ -279,4 +279,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const } } // namespace PlasmaVault diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index ab011576b2b7..2866cddbea18 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -68,10 +68,6 @@ mkDerivation { # ./plasma-workspace.patch. patches = [ ./plasma-workspace.patch - (fetchpatch { - url = "https://github.com/KDE/plasma-workspace/commit/11e570d861858f3b3e2694e5f9ec242d7f9f12b9.patch"; - sha256 = "1vk9yacb59k0v5mgbpgmciflca9r0ll4wh1d83ffx2y2v8sqwiv2"; - }) ]; preConfigure = '' diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch index 9027f6ad8a4a..dd5f7321f0e2 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch @@ -36,7 +36,7 @@ index 493218ea..d507aa55 100644 + return system( NIXPKGS_KDOSTARTUPCONFIG5 ); } diff --git a/startkde/startkde.cmake b/startkde/startkde.cmake -index f9e2e429..0a4267a9 100644 +index 714a9bf1..9733c612 100644 --- a/startkde/startkde.cmake +++ b/startkde/startkde.cmake @@ -1,22 +1,31 @@ @@ -454,7 +454,7 @@ index f9e2e429..0a4267a9 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -306,34 +352,37 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & +@@ -306,12 +352,16 @@ qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit & # We only check for 255 which means that the ksmserver process could not be # started, any problems thereafter, e.g. ksmserver failing to initialize, # will remain undetected. @@ -474,11 +474,9 @@ index f9e2e429..0a4267a9 100644 if test $? -eq 255; then # Startup error echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2 - test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null -- xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." - fi - - #Anything after here is logout/shutdown +@@ -322,36 +372,36 @@ fi + #Anything after here is logout + #It is not called after shutdown/restart -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` +wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) @@ -498,12 +496,13 @@ index f9e2e429..0a4267a9 100644 # ask remaining drkonqis to die in a graceful way - qdbus | grep 'org.kde.drkonqi-' | while read address ; do - qdbus "$address" "/MainApplication" "quit" +- done +- break + @NIXPKGS_QDBUS@ | @NIXPKGS_GREP@ 'org.kde.drkonqi-' | while read address ; do + @NIXPKGS_QDBUS@ "$address" "/MainApplication" "quit" - done - break fi -@@ -342,15 +391,17 @@ fi + done + fi echo 'startkde: Shutting down...' 1>&2 # just in case @@ -526,7 +525,7 @@ index f9e2e429..0a4267a9 100644 echo 'startkde: Done.' 1>&2 diff --git a/startkde/startplasma.cmake b/startkde/startplasma.cmake -index f7330ab3..5eedbb11 100644 +index de98541c..39c0b521 100644 --- a/startkde/startplasma.cmake +++ b/startkde/startplasma.cmake @@ -1,6 +1,6 @@ @@ -668,14 +667,15 @@ index f7330ab3..5eedbb11 100644 # finally, give the session control to the session manager # see kdebase/ksmserver for the description of the rest of the startup sequence -@@ -163,19 +109,19 @@ if test $? -eq 255; then - xmessage -geometry 500x100 "Could not start ksmserver. Check your installation." - fi +@@ -166,19 +112,19 @@ fi + #Anything after here is logout + #It is not called after shutdown/restart -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true` -+wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) - +- -if test x"$wait_drkonqi"x = x"true"x ; then ++wait_drkonqi=$(@NIXPKGS_KREADCONFIG5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true) ++ +if [ x"$wait_drkonqi"x = x"true"x ]; then # wait for remaining drkonqi instances with timeout (in seconds) - wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900` @@ -695,7 +695,7 @@ index f7330ab3..5eedbb11 100644 done break fi -@@ -184,15 +130,17 @@ fi +@@ -187,15 +133,17 @@ fi echo 'startplasma: Shutting down...' 1>&2 # just in case diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index a6c3cb66f6a2..690f5fafef27 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,363 +3,363 @@ { bluedevil = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/bluedevil-5.13.5.tar.xz"; - sha256 = "0am708cb6jfccx1jfbriwc2jgwd4ajqllirc9i0bg4jz5ydxbjxg"; - name = "bluedevil-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/bluedevil-5.14.0.tar.xz"; + sha256 = "0d1bw6cp2vwhs17j0bgc3gysy3g2syb1z0zwg28sa889l8a3qyv9"; + name = "bluedevil-5.14.0.tar.xz"; }; }; breeze = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-5.13.5.tar.xz"; - sha256 = "09jkkfdmngvbp8i2y6irlv6yvrzpc86mw6apmqvphiaqsilyxaw0"; - name = "breeze-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-5.14.0.tar.xz"; + sha256 = "0gd95a7km0pqc0qinn2p0kv72j0ihdl96vs14f5jr5n78a2r7r9a"; + name = "breeze-5.14.0.tar.xz"; }; }; breeze-grub = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-grub-5.13.5.tar.xz"; - sha256 = "03hsq77gi75chgyq9pzh3ry6k6bi78pfm33zn8gx784k9fx7gvqr"; - name = "breeze-grub-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-grub-5.14.0.tar.xz"; + sha256 = "17kghx9qv7flm2019alqg1a6pnacgczj1hc9sc0bvj8znh9hhxvh"; + name = "breeze-grub-5.14.0.tar.xz"; }; }; breeze-gtk = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-gtk-5.13.5.tar.xz"; - sha256 = "1knh0b27b81rnd87s31s2mawqcl1yzwjcakk5npzfm3nj23xakv3"; - name = "breeze-gtk-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-gtk-5.14.0.tar.xz"; + sha256 = "1zlhyv26k3zqm2bbd9mk7123q5xy5g2cp6ayavhglgxxb8n0zyx9"; + name = "breeze-gtk-5.14.0.tar.xz"; }; }; breeze-plymouth = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/breeze-plymouth-5.13.5.tar.xz"; - sha256 = "0xsjl602wsb5ak1xg19w8y0fv9404cwbj1rcrm0hgjv735m32c57"; - name = "breeze-plymouth-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/breeze-plymouth-5.14.0.tar.xz"; + sha256 = "1ilf3cp7cg3lpkxvd8n7h33wvsbbikrvd514gan2ns16j9d4ziz1"; + name = "breeze-plymouth-5.14.0.tar.xz"; }; }; discover = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/discover-5.13.5.tar.xz"; - sha256 = "1q3nc5lih95vs5masd8z897hvfvpwidiisj8bg62iq0cblsgwz6d"; - name = "discover-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/discover-5.14.0.tar.xz"; + sha256 = "1chkf5hjpnb4laq5sn7rr8f4fv90mg4brdsx71cz1b5xbvgyy1sf"; + name = "discover-5.14.0.tar.xz"; }; }; drkonqi = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/drkonqi-5.13.5.tar.xz"; - sha256 = "02kbmymzzhsf9slaf64xlp8sfv59gl7qf1g2ahcq58sqry5bqjnk"; - name = "drkonqi-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/drkonqi-5.14.0.tar.xz"; + sha256 = "0i5zgafkdxw6wqqfw81ygdmg5fffy2gkf6sciq7f8nfxxglw6pkp"; + name = "drkonqi-5.14.0.tar.xz"; }; }; kactivitymanagerd = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kactivitymanagerd-5.13.5.tar.xz"; - sha256 = "0zfvypxh748vsl270l8wn6inmp8shi2m051yy699qdqbyb039wjq"; - name = "kactivitymanagerd-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kactivitymanagerd-5.14.0.tar.xz"; + sha256 = "03jxvf4mgh0wmphykskc8ra49ghrjv5in4mgzpafswn7w8q8gyii"; + name = "kactivitymanagerd-5.14.0.tar.xz"; }; }; kde-cli-tools = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kde-cli-tools-5.13.5.tar.xz"; - sha256 = "0p1az420p4ldinmxnkdwl69542ddm0r4f3wmdysfird7d68yw2hp"; - name = "kde-cli-tools-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kde-cli-tools-5.14.0.tar.xz"; + sha256 = "1n51vaiy073jzs051wlpll7652bb7vwg5qmravndhl8ibqrv7qaz"; + name = "kde-cli-tools-5.14.0.tar.xz"; }; }; kdecoration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kdecoration-5.13.5.tar.xz"; - sha256 = "04p77fs5c9b4mbpcl4a2c1wc0i09g51b7c1v7n9fd4nfkm7z8sqs"; - name = "kdecoration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kdecoration-5.14.0.tar.xz"; + sha256 = "01gkl0yqplm1l2qa4gfw7rzi5zfdxq7d3a25qicdwhas69hc8nzm"; + name = "kdecoration-5.14.0.tar.xz"; }; }; kde-gtk-config = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kde-gtk-config-5.13.5.tar.xz"; - sha256 = "06j64y7p5kxnrc3407hma0drh3sb8jvjp3mx6na6b86z4xxf1kj6"; - name = "kde-gtk-config-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kde-gtk-config-5.14.0.tar.xz"; + sha256 = "0mb1am14hd3x5gkmy3vcg3wb9g29c8y38ywhr0f93riphws0nhvh"; + name = "kde-gtk-config-5.14.0.tar.xz"; }; }; kdeplasma-addons = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kdeplasma-addons-5.13.5.tar.xz"; - sha256 = "1a4f61bbwhc2y0lnrglbq3sas16bxff0ga3im9d15nq5a5q637i1"; - name = "kdeplasma-addons-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kdeplasma-addons-5.14.0.tar.xz"; + sha256 = "0k98ms851z2naw4rjmxldy6pl9a51mmwvq6c4znm2pnrw04jz15d"; + name = "kdeplasma-addons-5.14.0.tar.xz"; }; }; kgamma5 = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kgamma5-5.13.5.tar.xz"; - sha256 = "08brmdi5y69iwhj7506q2l0bfm92c9l9ds9w4d1ipcgnbydrhfyn"; - name = "kgamma5-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kgamma5-5.14.0.tar.xz"; + sha256 = "17vb1bb4glw6ccd1s1chjm07lvpkklcvny7rdjgmz2r00vk6mjqy"; + name = "kgamma5-5.14.0.tar.xz"; }; }; khotkeys = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/khotkeys-5.13.5.tar.xz"; - sha256 = "16kp5ck6zfpnmnvspdnqklix54np3sxvj5ixs9saqf3gd5rk49mp"; - name = "khotkeys-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/khotkeys-5.14.0.tar.xz"; + sha256 = "0b2q4s0j6wji8112l89347fc8ph9vrf2p8ngig0c4dn4ayk7hqd1"; + name = "khotkeys-5.14.0.tar.xz"; }; }; kinfocenter = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kinfocenter-5.13.5.tar.xz"; - sha256 = "15r9j33z3l31gip9q3fw015s4mxakgy5wqfs04w5p0aq8x9xkpzl"; - name = "kinfocenter-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kinfocenter-5.14.0.tar.xz"; + sha256 = "0pc1jc7d26w2asa2yj8rr04rgjvmavlyhw3wd0dqv08rhr0rl7pj"; + name = "kinfocenter-5.14.0.tar.xz"; }; }; kmenuedit = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kmenuedit-5.13.5.tar.xz"; - sha256 = "0zha39cd3p5nmrbkhkbcavxns2n2wnb6chc5kcsk5km9wn4laxz0"; - name = "kmenuedit-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kmenuedit-5.14.0.tar.xz"; + sha256 = "0ld9q5jq7zc6kz72pg9qqg10rbargkwyks657cnv8id1pna17bsr"; + name = "kmenuedit-5.14.0.tar.xz"; }; }; kscreen = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kscreen-5.13.5.tar.xz"; - sha256 = "0kf1cf88n46b4js7x9r504605v68wp5hwpwid6phvfqdyqrvbb77"; - name = "kscreen-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kscreen-5.14.0.tar.xz"; + sha256 = "1y28a96kal2gziga2vr6vg5swv2ynfiv3804n06v9847rd7s3ixk"; + name = "kscreen-5.14.0.tar.xz"; }; }; kscreenlocker = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kscreenlocker-5.13.5.tar.xz"; - sha256 = "171zjk9r333kbkb9pashw0rdmiwq11nzfin4wnmqzwp7rrclxs18"; - name = "kscreenlocker-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kscreenlocker-5.14.0.tar.xz"; + sha256 = "1nyd8jy4ngpg51nq46cx038i4w1qak9zi4d4v69blkhzd65gckj1"; + name = "kscreenlocker-5.14.0.tar.xz"; }; }; ksshaskpass = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/ksshaskpass-5.13.5.tar.xz"; - sha256 = "1znhj8x8kag1jrw0j1kfvqgprdayrcfbmawz2jap1ik2bjq7dp81"; - name = "ksshaskpass-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/ksshaskpass-5.14.0.tar.xz"; + sha256 = "0nqvr3z7058hfymw8gglnfmcxx976km6sf0msyd3ykfpymxsmz74"; + name = "ksshaskpass-5.14.0.tar.xz"; }; }; ksysguard = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/ksysguard-5.13.5.tar.xz"; - sha256 = "1qjqhqc23rbimz3qj8gr3dhp0griwgbiajhvjngh1jl55fb3q29j"; - name = "ksysguard-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/ksysguard-5.14.0.tar.xz"; + sha256 = "0hbcx20r57lfh566q2974rs2kzlq5ghxadnd1ghiwz5141xh02bm"; + name = "ksysguard-5.14.0.tar.xz"; }; }; kwallet-pam = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwallet-pam-5.13.5.tar.xz"; - sha256 = "145daahh8qjpbfcvjk2zyd6k3sr22npgnv3n23j9aim75qiwz1ac"; - name = "kwallet-pam-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwallet-pam-5.14.0.tar.xz"; + sha256 = "0cw173wbf105p7028xik33lm38z82b1rlc7090l4khwsgmwgff97"; + name = "kwallet-pam-5.14.0.tar.xz"; }; }; kwayland-integration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwayland-integration-5.13.5.tar.xz"; - sha256 = "1qhkrs8md36z5gndkm88pyv6mspqsdsdavjz8klfwfv1hii6qyds"; - name = "kwayland-integration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwayland-integration-5.14.0.tar.xz"; + sha256 = "19xbqb7m6hxyg8s8jdbg1x9qcfia2ypm0z4k6zgva6mwqwhqcbw1"; + name = "kwayland-integration-5.14.0.tar.xz"; }; }; kwin = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwin-5.13.5.tar.xz"; - sha256 = "0ld1pclni1axrh7jww3gxlfwkbjsfbqb9z7gygj2ff3nmc6khgfm"; - name = "kwin-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwin-5.14.0.tar.xz"; + sha256 = "0rd6hkyg6n0w2jnj648sp7gs7n624igraz8ajyrglfzvxkxvqi8i"; + name = "kwin-5.14.0.tar.xz"; }; }; kwrited = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/kwrited-5.13.5.tar.xz"; - sha256 = "150nhjk4vcigs2r2bxqk309g81lxpnkkv8l44hiyivcbmwvc3aya"; - name = "kwrited-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/kwrited-5.14.0.tar.xz"; + sha256 = "0s9lgi5a945xzpl1j5gdn65n8bywqlwfnrig56x90550achbvmlq"; + name = "kwrited-5.14.0.tar.xz"; }; }; libkscreen = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/libkscreen-5.13.5.tar.xz"; - sha256 = "04719va15i66qn1xqx318v6risxhp8bfcnhxh9mqm5h9qx5c6c4k"; - name = "libkscreen-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/libkscreen-5.14.0.tar.xz"; + sha256 = "1fsi9cb724kwr0cll60dl9qh67290r3gp8lcsmlyw30zk9mqwgdi"; + name = "libkscreen-5.14.0.tar.xz"; }; }; libksysguard = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/libksysguard-5.13.5.tar.xz"; - sha256 = "0pccjjjzk8dxgmkj5vrq20nwb3qpf9isjd1zmg5nc127jld924x6"; - name = "libksysguard-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/libksysguard-5.14.0.tar.xz"; + sha256 = "00s1dkiqykw2drlmvzs3hkdrkbk8n86s751kl4xlvcbslbijzcv0"; + name = "libksysguard-5.14.0.tar.xz"; }; }; milou = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/milou-5.13.5.tar.xz"; - sha256 = "0rhgj10l2iik1mgnv2bixxqjyc3pl731bs1bqz9gsa3wiazspwrv"; - name = "milou-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/milou-5.14.0.tar.xz"; + sha256 = "1k413zs70ggsamwxxidlfjdf8aqrcnzznar86z30q3ki1y14xf1l"; + name = "milou-5.14.0.tar.xz"; }; }; oxygen = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/oxygen-5.13.5.tar.xz"; - sha256 = "0wm2mngh0gb0lqvx8g82ml2sdv0kbkx14mpb8c6aw3hslcwma7yd"; - name = "oxygen-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/oxygen-5.14.0.tar.xz"; + sha256 = "0kbafhzjkm61dpznx1w713jwyicj7qq76vk7zf6vz2g90b8c47na"; + name = "oxygen-5.14.0.tar.xz"; }; }; plasma-browser-integration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-browser-integration-5.13.5.tar.xz"; - sha256 = "0bhpbq4n29x8m0nmxlli5ljmgpw9da7sfbmf3j5c3wnxqja16sgy"; - name = "plasma-browser-integration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-browser-integration-5.14.0.tar.xz"; + sha256 = "1s8cxlfyp8crq2j4appffnhc3cgx9igmqhxyyk9pr4jbb4cwv42b"; + name = "plasma-browser-integration-5.14.0.tar.xz"; }; }; plasma-desktop = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-desktop-5.13.5.tar.xz"; - sha256 = "14isrq3n9lm1nzmyv8zdgq6pwnv2zmg4dwxyp7fvqjxfls8851vp"; - name = "plasma-desktop-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-desktop-5.14.0.tar.xz"; + sha256 = "0qrqd78bp9n73rr142wxiynxij2i8cw41ckgd46iw8an550v8s80"; + name = "plasma-desktop-5.14.0.tar.xz"; }; }; plasma-integration = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-integration-5.13.5.tar.xz"; - sha256 = "0j57ra79p5lkj81d05hhb87mrxgyj6qikkpzcb0p2dr2x8cmkng2"; - name = "plasma-integration-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-integration-5.14.0.tar.xz"; + sha256 = "1dv43iwh6rp5ldn16jd6krkab6nmplav47j5qvngcp88src31k47"; + name = "plasma-integration-5.14.0.tar.xz"; }; }; plasma-nm = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-nm-5.13.5.tar.xz"; - sha256 = "1z8f5iybgra72vhpiayiwpysvv2z8x2r5xal8rhgf7y24xcjwxmi"; - name = "plasma-nm-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-nm-5.14.0.tar.xz"; + sha256 = "1pr4dg90vw22jzsrbhzx3rycyj9by8r4239ypprw0i5d9795mian"; + name = "plasma-nm-5.14.0.tar.xz"; }; }; plasma-pa = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-pa-5.13.5.tar.xz"; - sha256 = "0p54x4zr3w009nn7g00qmxh7xil35x7b48d0l0flz5d7hvkk6nd8"; - name = "plasma-pa-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-pa-5.14.0.tar.xz"; + sha256 = "1b95vyirgxfpjrccnl81bynlk3zdxz0bf7czsap0bnwhal0mcp2w"; + name = "plasma-pa-5.14.0.tar.xz"; }; }; plasma-sdk = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-sdk-5.13.5.tar.xz"; - sha256 = "1x8hq343xzwlcsdvf0jy0qgn64xw8l11lawhknbjrf90qq58axga"; - name = "plasma-sdk-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-sdk-5.14.0.tar.xz"; + sha256 = "0b5h7qvan0f5afdf4d19dmpalgbd9gyxgkq3r5h7axqdfdanz38f"; + name = "plasma-sdk-5.14.0.tar.xz"; }; }; plasma-tests = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-tests-5.13.5.tar.xz"; - sha256 = "00nm0d0c4zccbwnhy8sc1qb4sf7bs5vfky3n7lihwyng3syqwz3d"; - name = "plasma-tests-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-tests-5.14.0.tar.xz"; + sha256 = "01li04p44f1yajnjhvhhqd8mjwv8si5d02749p5dn0x80fkxgh9d"; + name = "plasma-tests-5.14.0.tar.xz"; }; }; plasma-vault = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-vault-5.13.5.tar.xz"; - sha256 = "1045zb58pmcyn0cznb81bmcpd4hkhxm6509rznrjykkhcfcrbf8z"; - name = "plasma-vault-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-vault-5.14.0.tar.xz"; + sha256 = "1kclryjld7lanimr6n7r1b9y8wqgyjvcsky9cfq3ql1ssfc0ncm3"; + name = "plasma-vault-5.14.0.tar.xz"; }; }; plasma-workspace = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-5.13.5.tar.xz"; - sha256 = "1qcmw60lyp966rhvw9raaqrvxdv09pr8zc7x3fx1vpm9kphh3lv3"; - name = "plasma-workspace-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-5.14.0.tar.xz"; + sha256 = "1fgz06dnszrrq5kqa3zn22cj93adz8vwg9n9vdihgi6c77rqlxyf"; + name = "plasma-workspace-5.14.0.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plasma-workspace-wallpapers-5.13.5.tar.xz"; - sha256 = "1wbnm6bzvgx2ssig4dk3plhrsjiw3lq1yhr2dfga6vvlyi6wg9mg"; - name = "plasma-workspace-wallpapers-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plasma-workspace-wallpapers-5.14.0.tar.xz"; + sha256 = "10j006wc1l2hjw9s9w7sxwimpahrnlpidnrrdgwjp0fswmnyqj5c"; + name = "plasma-workspace-wallpapers-5.14.0.tar.xz"; }; }; plymouth-kcm = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/plymouth-kcm-5.13.5.tar.xz"; - sha256 = "0flgr68rms40acgl2f4539mvp53m36ifignxix27raqmibaf38s1"; - name = "plymouth-kcm-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/plymouth-kcm-5.14.0.tar.xz"; + sha256 = "0smjnh3adhsbp2ds8gvi5k3jq21i85zvaf9pvr0ih4nqpn4plalk"; + name = "plymouth-kcm-5.14.0.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.13.5"; + version = "1-5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/polkit-kde-agent-1-5.13.5.tar.xz"; - sha256 = "00f05ii3www8knn2ycgkc6izc8ydb3vjy4f657k38hkzl2sjnhl6"; - name = "polkit-kde-agent-1-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/polkit-kde-agent-1-5.14.0.tar.xz"; + sha256 = "0bzz2qmxslmms7mrs4l8myg9byx0w7dz6xrmvi8v11wyk2lngsb0"; + name = "polkit-kde-agent-1-5.14.0.tar.xz"; }; }; powerdevil = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/powerdevil-5.13.5.tar.xz"; - sha256 = "1k7ilcvm5nvx6sd43j0djar9ay6ag84g4m8f420yf7q4yryp76yn"; - name = "powerdevil-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/powerdevil-5.14.0.tar.xz"; + sha256 = "057hj7c3pq5a064ydx2r6kkf0q8lj7rl0jfrzcpr72s0yri3wcjr"; + name = "powerdevil-5.14.0.tar.xz"; }; }; sddm-kcm = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/sddm-kcm-5.13.5.tar.xz"; - sha256 = "122g83ajh0xqylvmicrhgw0fm8bmzpw26v7fjckfk9if5zqzk8ch"; - name = "sddm-kcm-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/sddm-kcm-5.14.0.tar.xz"; + sha256 = "0dz6iz0qf4ycfic1ad99cqxj05pa4m92m5l74as8pkqviv8mm33d"; + name = "sddm-kcm-5.14.0.tar.xz"; }; }; systemsettings = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/systemsettings-5.13.5.tar.xz"; - sha256 = "14029a3mf2d6cw87lyffnwy88yvj0n3jmi0glr69zwi8lmz0cbsv"; - name = "systemsettings-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/systemsettings-5.14.0.tar.xz"; + sha256 = "0gywcc1zcqp7613gd7m9811plmmk8hr9frd2v0ari69ppm1ndmpj"; + name = "systemsettings-5.14.0.tar.xz"; }; }; user-manager = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/user-manager-5.13.5.tar.xz"; - sha256 = "12550xvl084rab0y331r8dm3qwpcvm83k3j02gxrwrigv1vckas8"; - name = "user-manager-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/user-manager-5.14.0.tar.xz"; + sha256 = "17qdpdq1j53h49i71ri8f91fby9m47ngpd7gn6qp7gzsfcyqky3j"; + name = "user-manager-5.14.0.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.13.5"; + version = "5.14.0"; src = fetchurl { - url = "${mirror}/stable/plasma/5.13.5/xdg-desktop-portal-kde-5.13.5.tar.xz"; - sha256 = "0i9pcbdxfh2cbv9ybk9i11l7vcm2ifx0zm3gkj3ry3bjxxbphn4f"; - name = "xdg-desktop-portal-kde-5.13.5.tar.xz"; + url = "${mirror}/stable/plasma/5.14.0/xdg-desktop-portal-kde-5.14.0.tar.xz"; + sha256 = "0xziyrrccv0jjjf8h8p5w2wx0qz745ilib1i2l50amy6dwy0k0s9"; + name = "xdg-desktop-portal-kde-5.14.0.tar.xz"; }; }; }