diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix index e6cc02e4d491..facaea131ae5 100644 --- a/nixos/modules/services/x11/display-managers/sddm.nix +++ b/nixos/modules/services/x11/display-managers/sddm.nix @@ -19,6 +19,17 @@ let Xsetup = pkgs.writeScript "Xsetup" '' #!/bin/sh + + # Prior to Qt 5.9.2, there is a QML cache invalidation bug which sometimes + # strikes new Plasma 5 releases. If the QML cache is not invalidated, SDDM + # will segfault without explanation. We really tore our hair out for awhile + # before finding the bug: + # https://bugreports.qt.io/browse/QTBUG-62302 + # We work around the problem by deleting the QML cache before startup. It + # will be regenerated, causing a small but perceptible delay when SDDM + # starts. + rm -fr /var/lib/sddm/.cache/sddm-greeter/qmlcache + ${cfg.setupScript} ''; diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix index 3ce8d075410b..86a963bdac48 100644 --- a/pkgs/applications/display-managers/sddm/default.nix +++ b/pkgs/applications/display-managers/sddm/default.nix @@ -1,11 +1,11 @@ -{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch +{ mkDerivation, lib, fetchFromGitHub, fetchpatch , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd }: let - version = "0.15.0"; + version = "0.16.0"; in mkDerivation rec { name = "sddm-${version}"; @@ -14,11 +14,10 @@ in mkDerivation rec { owner = "sddm"; repo = "sddm"; rev = "v${version}"; - sha256 = "1wissgl7wd7fblq8ghz8n2fr6wqip7h88p9fiarfpvi1918fgng8"; + sha256 = "1j0rc8nk8bz7sxa0bc6lx9v7r3zlcfyicngfjqb894ni9k71kzsb"; }; - patches = - copyPathsToStore (lib.readPathsFromFile ./. ./series); + patches = [ ./sddm-ignore-config-mtime.patch ]; postPatch = # Module Qt5::Test must be included in `find_package` before it is used. diff --git a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch index 836df2de292d..aac09dfe876b 100644 --- a/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch +++ b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch @@ -1,28 +1,43 @@ -From e9d82bfbc49993a5be2c93f6b72a969630587f26 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Mon, 23 Nov 2015 06:56:28 -0600 -Subject: [PATCH 1/2] ignore config mtime - ---- - src/common/ConfigReader.cpp | 5 ----- - 1 file changed, 5 deletions(-) - diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index cfc9940..5bf5a6a 100644 +index 4b5983c..911c511 100644 --- a/src/common/ConfigReader.cpp +++ b/src/common/ConfigReader.cpp -@@ -138,11 +138,6 @@ namespace SDDM { - QString currentSection = QStringLiteral(IMPLICIT_SECTION); +@@ -147,16 +147,13 @@ namespace SDDM { + // * m_path (classic fallback /etc/sddm.conf) - QFile in(m_path); -- QDateTime modificationTime = QFileInfo(in).lastModified(); -- if (modificationTime <= m_fileModificationTime) { + QStringList files; +- QDateTime latestModificationTime = QFileInfo(m_path).lastModified(); + + if (!m_sysConfigDir.isEmpty()) { + //include the configDir in modification time so we also reload on any files added/removed + QDir dir(m_sysConfigDir); + if (dir.exists()) { +- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_sysConfigDir).lastModified()); + foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { + files << (file.absoluteFilePath()); +- latestModificationTime = std::max(latestModificationTime, file.lastModified()); + } + } + } +@@ -164,21 +161,14 @@ namespace SDDM { + //include the configDir in modification time so we also reload on any files added/removed + QDir dir(m_configDir); + if (dir.exists()) { +- latestModificationTime = std::max(latestModificationTime, QFileInfo(m_configDir).lastModified()); + foreach (const QFileInfo &file, dir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot, QDir::LocaleAware)) { + files << (file.absoluteFilePath()); +- latestModificationTime = std::max(latestModificationTime, file.lastModified()); + } + } + } + + files << m_path; + +- if (latestModificationTime <= m_fileModificationTime) { - return; - } -- m_fileModificationTime = modificationTime; - - in.open(QIODevice::ReadOnly); - while (!in.atEnd()) { --- -2.6.3 - +- m_fileModificationTime = latestModificationTime; +- + foreach (const QString &filepath, files) { + loadInternal(filepath); + } diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series deleted file mode 100644 index cb6ea65fedb1..000000000000 --- a/pkgs/applications/display-managers/sddm/series +++ /dev/null @@ -1 +0,0 @@ -sddm-ignore-config-mtime.patch \ No newline at end of file diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix index 2bb4b7deceff..a9b3f1781324 100644 --- a/pkgs/desktops/plasma-5/default.nix +++ b/pkgs/desktops/plasma-5/default.nix @@ -133,6 +133,7 @@ let plasma-integration = callPackage ./plasma-integration.nix {}; plasma-nm = callPackage ./plasma-nm {}; plasma-pa = callPackage ./plasma-pa.nix { inherit gconf; }; + plasma-vault = callPackage ./plasma-vault {}; plasma-workspace = callPackage ./plasma-workspace {}; plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {}; polkit-kde-agent = callPackage ./polkit-kde-agent.nix {}; diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index 7513c83c107c..f4d396047261 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.10.5/ -A '*.tar.xz' ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.11.1/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 6bcafc5813a9..63219d8cbe1a 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, - qtsvg, qtx11extras, + qtsvg, qtx11extras, kactivities }: mkDerivation { @@ -9,6 +9,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg - qtx11extras + qtx11extras kactivities ]; } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch b/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch deleted file mode 100644 index d5ac4b250875..000000000000 --- a/pkgs/desktops/plasma-5/plasma-desktop/ibus.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/keyboard/xkb_helper.cpp -+++ plasma-desktop-5.8.5/kcms/keyboard/xkb_helper.cpp -@@ -185,21 +185,5 @@ bool XkbHelper::initializeKeyboardLayout - - bool XkbHelper::preInitialize() - { -- // stop ibus so it does not mess with our layouts, we can remove this when we integrate IM into keyboard module -- -- QString ibusExe = QStandardPaths::findExecutable(QStringLiteral("ibus")); -- if( ibusExe.isEmpty() ) { -- return 0; -- } -- -- KProcess ibusProcess; -- ibusProcess << ibusExe << QStringLiteral("exit"); -- ibusProcess.setOutputChannelMode(KProcess::SeparateChannels); -- int res = ibusProcess.execute(); -- -- if( res == 0 ) { -- qCWarning(KCM_KEYBOARD) << "ibus successfully stopped"; -- } -- - return 0; - } diff --git a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch index def5b577b972..d3f5166d5ed9 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/qml-import-paths.patch @@ -1,27 +1,14 @@ -Index: plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -=================================================================== ---- plasma-desktop-5.8.5.orig/applets/pager/package/contents/ui/main.qml -+++ plasma-desktop-5.8.5/applets/pager/package/contents/ui/main.qml -@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as - import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents - import org.kde.draganddrop 2.0 - import org.kde.plasma.private.pager 2.0 --import "utils.js" as Utils -+import "../code/utils.js" as Utils - - MouseArea { - id: root Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml =================================================================== --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/FolderView.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/FolderView.qml @@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as Plas import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.folder 0.1 as Folder -import "FolderTools.js" as FolderTools +import "../code/FolderTools.js" as FolderTools - + Item { id: main Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -29,14 +16,14 @@ Index: plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml --- plasma-desktop-5.8.5.orig/containments/desktop/package/contents/ui/main.qml +++ plasma-desktop-5.8.5/containments/desktop/package/contents/ui/main.qml @@ -30,8 +30,8 @@ import org.kde.kquickcontrolsaddons 2.0 - + import org.kde.private.desktopcontainment.desktop 0.1 as Desktop - + -import "LayoutManager.js" as LayoutManager -import "FolderTools.js" as FolderTools +import "../code/LayoutManager.js" as LayoutManager +import "../code/FolderTools.js" as FolderTools - + DragDrop.DropArea { id: root Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -46,9 +33,9 @@ Index: plasma-desktop-5.8.5/containments/panel/contents/ui/main.qml @@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as import org.kde.kquickcontrolsaddons 2.0 import org.kde.draganddrop 2.0 as DragDrop - + -import "LayoutManager.js" as LayoutManager +import "../code/LayoutManager.js" as LayoutManager - + DragDrop.DropArea { id: root diff --git a/pkgs/desktops/plasma-5/plasma-desktop/series b/pkgs/desktops/plasma-5/plasma-desktop/series index 36778cd1c560..6334deb7d973 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/series +++ b/pkgs/desktops/plasma-5/plasma-desktop/series @@ -1,4 +1,3 @@ qml-import-paths.patch hwclock-path.patch tzdir.patch -ibus.patch diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix index de46bb4373c6..f69644287624 100644 --- a/pkgs/desktops/plasma-5/plasma-integration.nix +++ b/pkgs/desktops/plasma-5/plasma-integration.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications, - kwayland, libXcursor + kwayland, libXcursor, qtquickcontrols2 }: # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration @@ -12,6 +12,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland - libXcursor + libXcursor qtquickcontrols2 ]; } diff --git a/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch new file mode 100644 index 000000000000..b3f19c4e0025 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/cryfs-path.patch @@ -0,0 +1,17 @@ +diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp +index f6ef54f..160034a 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 + + QProcess *CryFsBackend::cryfs(const QStringList &arguments) const + { +- return process("cryfs", ++ return process(NIXPKGS_CRYFS, + arguments, + { { "CRYFS_FRONTEND", "noninteractive" } }); + } + + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-vault/default.nix b/pkgs/desktops/plasma-5/plasma-vault/default.nix new file mode 100644 index 000000000000..203ff50d7357 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/default.nix @@ -0,0 +1,38 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + + kactivities, + plasma-framework, + kwindowsystem, + libksysguard, + + encfs, + cryfs, + fuse +}: + +mkDerivation { + name = "plasma-vault"; + nativeBuildInputs = [ extra-cmake-modules ]; + + patches = [ + ./encfs-path.patch + ./cryfs-path.patch + ./fusermount-path.patch + ]; + + buildInputs = [ + kactivities plasma-framework kwindowsystem libksysguard + ]; + + NIX_CFLAGS_COMPILE = [ + ''-DNIXPKGS_ENCFS="${lib.getBin encfs}/bin/encfs"'' + ''-DNIXPKGS_ENCFSCTL="${lib.getBin encfs}/bin/encfsctl"'' + + ''-DNIXPKGS_CRYFS="${lib.getBin cryfs}/bin/cryfs"'' + + ''-DNIXPKGS_FUSERMOUNT="${lib.getBin fuse}/bin/fusermount"'' + ]; + +} diff --git a/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch new file mode 100644 index 000000000000..b494df55c5d0 --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/encfs-path.patch @@ -0,0 +1,24 @@ +diff --git a/kded/engine/backends/encfs/encfsbackend.cpp b/kded/engine/backends/encfs/encfsbackend.cpp +index 47bb237..4ff064d 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 + + QProcess *EncFsBackend::encfs(const QStringList &arguments) const + { +- return process("encfs", arguments, {}); ++ return process(NIXPKGS_ENCFS, arguments, {}); + } + + + + QProcess *EncFsBackend::encfsctl(const QStringList &arguments) const + { +- return process("encfsctl", arguments, {}); ++ return process(NIXPKGS_ENCFSCTL, arguments, {}); + } + + + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch new file mode 100644 index 000000000000..cd1b736a103f --- /dev/null +++ b/pkgs/desktops/plasma-5/plasma-vault/fusermount-path.patch @@ -0,0 +1,18 @@ +diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp +index 81ce494..d3c5c9f 100644 +--- a/kded/engine/fusebackend_p.cpp ++++ b/kded/engine/fusebackend_p.cpp +@@ -103,7 +103,7 @@ QProcess *FuseBackend::process(const QString &executable, + + QProcess *FuseBackend::fusermount(const QStringList &arguments) const + { +- return process("fusermount", arguments, {}); ++ return process(NIXPKGS_FUSERMOUNT, arguments, {}); + } + + +@@ -245,4 +245,3 @@ bool FuseBackend::isOpened(const MountPoint &mountPoint) const + } + + } // namespace PlasmaVault +- diff --git a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch index 12eb65caa717..3b3d318d3bbf 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/qml-import-path.patch @@ -1,16 +1,3 @@ -Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml -+++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml -@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1 - - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as PlasmaComponents --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - Item { - id: analogclock Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml =================================================================== --- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml @@ -21,35 +8,9 @@ Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/Battery import org.kde.kcoreaddons 1.0 as KCoreAddons -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batteryItem -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml -@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1 - import org.kde.plasma.core 2.0 as PlasmaCore - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.workspace.components 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - MouseArea { - id: root -Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml -=================================================================== ---- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml -+++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml -@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma - import org.kde.plasma.components 2.0 as Components - import org.kde.plasma.extras 2.0 as PlasmaExtras - import org.kde.kquickcontrolsaddons 2.0 --import "logic.js" as Logic -+import "../code/logic.js" as Logic - - FocusScope { - id: dialog Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml =================================================================== --- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml @@ -60,7 +21,7 @@ Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/battery import org.kde.kquickcontrolsaddons 2.0 -import "logic.js" as Logic +import "../code/logic.js" as Logic - + Item { id: batterymonitor Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml @@ -73,7 +34,7 @@ Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml import org.kde.kquickcontrolsaddons 2.0 -import "data.js" as Data +import "../code/data.js" as Data - + Flow { id: lockout Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml @@ -81,11 +42,11 @@ Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml --- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml +++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas - + import org.kde.plasma.private.notifications 1.0 - + -import "uiproperties.js" as UiProperties +import "../code/uiproperties.js" as UiProperties - + MouseEventListener { id: notificationsApplet diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index 854b86c1640d..900c6c0b2c43 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -3,339 +3,355 @@ { bluedevil = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz"; - sha256 = "01nhfggikkygfzyjbm7zqszhq2x1fhc619wskwjb7hm9p35laj9r"; - name = "bluedevil-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/bluedevil-5.11.1.tar.xz"; + sha256 = "0p1y3p87xg7rjj35n81jg4v4yr2k7bf80qzfnwslbvwrpnzs982q"; + name = "bluedevil-5.11.1.tar.xz"; }; }; breeze = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-5.10.5.tar.xz"; - sha256 = "0rmc3nn9b63jyij814hqx1zg38iphvd03pg7qybkp61zw40ng90v"; - name = "breeze-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-5.11.1.tar.xz"; + sha256 = "0yqbr7j0iqnmczbfv454f1l5x3787vzfchgkrd995d6za2d0w2lp"; + name = "breeze-5.11.1.tar.xz"; }; }; breeze-grub = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz"; - sha256 = "0am1hldqyrsryda907q2qwfc09xcsxrv7bq9v23ig0xmylcsq3if"; - name = "breeze-grub-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-grub-5.11.1.tar.xz"; + sha256 = "0pcri1z4min5m6wb6ncyjavwd9nszyis3cqdyw6mqb4av55z0xl0"; + name = "breeze-grub-5.11.1.tar.xz"; }; }; breeze-gtk = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz"; - sha256 = "0i5ddrq9h1www5362qyfwpqpspn3brr43mbsv7ax7gk30san6w0a"; - name = "breeze-gtk-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-gtk-5.11.1.tar.xz"; + sha256 = "0qb3ykf1mdw1iparsaxnypc4z41lfal6idksz9va25p3vclh02gr"; + name = "breeze-gtk-5.11.1.tar.xz"; }; }; breeze-plymouth = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz"; - sha256 = "197g84mvh8s3f163zx24y1mmzk26fg3ni19pw21njdj2j813hd35"; - name = "breeze-plymouth-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/breeze-plymouth-5.11.1.tar.xz"; + sha256 = "1z175176583aqdvv6gwy7mdkndr50x1c8xdihrrcvdhvqy9qc7hr"; + name = "breeze-plymouth-5.11.1.tar.xz"; }; }; discover = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/discover-5.10.5.tar.xz"; - sha256 = "085lq0y9a6r12jbx2ik7zqp4r9bjw332ykfh2gbzzz4s7l7rj4xf"; - name = "discover-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/discover-5.11.1.tar.xz"; + sha256 = "0zr53nw9lix80wlf7wa7irng2vvy80wccjs439ib8r1yh3ggiq4c"; + name = "discover-5.11.1.tar.xz"; + }; + }; + drkonqi = { + version = "5.11.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.11.1/drkonqi-5.11.1.tar.xz"; + sha256 = "0kq06sz39m8qg19b4cjqfwnx19j3s29hddhls8wywswwxlz4aq35"; + name = "drkonqi-5.11.1.tar.xz"; }; }; kactivitymanagerd = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz"; - sha256 = "19c297iyaq54vxc6xmvqsa1qlj5vr8071ydmkkfx3fa3lijp34v7"; - name = "kactivitymanagerd-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kactivitymanagerd-5.11.1.tar.xz"; + sha256 = "1j36mbngga492xxhm1ndw1bnq1qn480qpvzi94wyax9y3r4szmhg"; + name = "kactivitymanagerd-5.11.1.tar.xz"; }; }; kde-cli-tools = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz"; - sha256 = "1i2frbxvzlqlv210w50ccxn8ksqxranc93v0wfjvnhd7f8p9c7vk"; - name = "kde-cli-tools-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kde-cli-tools-5.11.1.tar.xz"; + sha256 = "0di7ypyhda4gpadhi0lbji4nyi9xk1y844kxfb586wpzkim5w82c"; + name = "kde-cli-tools-5.11.1.tar.xz"; }; }; kdecoration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz"; - sha256 = "0g24gisbnp92niff36bcnjk5pp84qc8cwmx283b887fzcn8v4mf3"; - name = "kdecoration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kdecoration-5.11.1.tar.xz"; + sha256 = "1jpvdscmy5ymyvj22784swvf6181f7ggr875djhx57c7i4shb3ph"; + name = "kdecoration-5.11.1.tar.xz"; }; }; kde-gtk-config = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz"; - sha256 = "1a5q8skykhvr5mixi59db2w1qsh8nj2dqncw4nmsh5nlh2ldmgm5"; - name = "kde-gtk-config-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kde-gtk-config-5.11.1.tar.xz"; + sha256 = "1afbwdrjdv9a2qwyxysgnslavan20cmhrz88kmnf9imxlll0i7al"; + name = "kde-gtk-config-5.11.1.tar.xz"; }; }; kdeplasma-addons = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz"; - sha256 = "1xdsa38i60x24p6xiv4x1cqd7f2xijs15c19qsjv594lnmbizbr5"; - name = "kdeplasma-addons-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kdeplasma-addons-5.11.1.tar.xz"; + sha256 = "09dwmd1aiiivkvdbyv97fili067sd8mw9dpknawair4mh7qb0zln"; + name = "kdeplasma-addons-5.11.1.tar.xz"; }; }; kgamma5 = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz"; - sha256 = "0rci4v5amhfiwawf2sj5f6cmcyq3lrx68mn8id279bpq35mr23v1"; - name = "kgamma5-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kgamma5-5.11.1.tar.xz"; + sha256 = "1m9maxzn5y3zijmj2fkwsfwhinprhz97v9fi312dmwyvfhq3qvyd"; + name = "kgamma5-5.11.1.tar.xz"; }; }; khotkeys = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz"; - sha256 = "1ixxb18nz3f4i2qqr1lvss7b662sgj78kzqjs0gd9mf5ylhqj5is"; - name = "khotkeys-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/khotkeys-5.11.1.tar.xz"; + sha256 = "0d1p1sia9qvdls38m29jijsf1ya8zvza557flmhcajb5ldn243l5"; + name = "khotkeys-5.11.1.tar.xz"; }; }; kinfocenter = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz"; - sha256 = "0flfjypp6v2k99h11srigyc0ahy23869wz3ljbqbm3b0pgqs69sm"; - name = "kinfocenter-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kinfocenter-5.11.1.tar.xz"; + sha256 = "0ivhf460y83qv4qdphdvskx2nlfqzy453xfnq7ldyzp2yacdmcc8"; + name = "kinfocenter-5.11.1.tar.xz"; }; }; kmenuedit = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz"; - sha256 = "0b786l5gm093dq1hvxcn97yg9fr0jmjhfl7sfd0cdn4pkg6almam"; - name = "kmenuedit-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kmenuedit-5.11.1.tar.xz"; + sha256 = "081lqh5ck854pha1f99w6w4j032spl3v28ild61fmhvhzkvx48a6"; + name = "kmenuedit-5.11.1.tar.xz"; }; }; kscreen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz"; - sha256 = "1a8bqa4wqnjav2w0s39dh7hmb3mqxjnhqwsw6mycgaxicl0h37vf"; - name = "kscreen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kscreen-5.11.1.tar.xz"; + sha256 = "1skdg59qacxxkiyz3gc1nn4y4lflbynpcb4mpsliqb2n2xdhvg8r"; + name = "kscreen-5.11.1.tar.xz"; }; }; kscreenlocker = { - version = "5.10.5.1"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz"; - sha256 = "03ih0dyyjljv40wl7mpbssfirkkljw8mnpjjhzk357lzadkplzvp"; - name = "kscreenlocker-5.10.5.1.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kscreenlocker-5.11.1.tar.xz"; + sha256 = "0jgq2w7zi1i4wdlfmfz1jh1kbkcn2lxkdg9ds5brisc3f6r4n3vg"; + name = "kscreenlocker-5.11.1.tar.xz"; }; }; ksshaskpass = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz"; - sha256 = "194ca18kclwmg7j9kcl02hm01cidy0hh2r68j6gxkafnlmn1cjjw"; - name = "ksshaskpass-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/ksshaskpass-5.11.1.tar.xz"; + sha256 = "00ghycjmagc8mjwsgny9bkr45ppnad6aay44ha6fn5gyx973xcmx"; + name = "ksshaskpass-5.11.1.tar.xz"; }; }; ksysguard = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz"; - sha256 = "0ywz0ax29y0gm7c3lxwdkn5xvzpkd82a313wb3cz4iphqqga3jqn"; - name = "ksysguard-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/ksysguard-5.11.1.tar.xz"; + sha256 = "11z29w95ji815gwaggs0n9bw8f040z4fd87ci2wmqcpyrjs7a6z1"; + name = "ksysguard-5.11.1.tar.xz"; }; }; kwallet-pam = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz"; - sha256 = "0ws0835a0j3wqia85hcdsgfn48d71v96dmmvc2y5pp45ki648bn4"; - name = "kwallet-pam-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwallet-pam-5.11.1.tar.xz"; + sha256 = "0zipldqjg3mazm2j7vrxkc0pqp7x7mmdq7cg1vlb1xlj8ld2vl7y"; + name = "kwallet-pam-5.11.1.tar.xz"; }; }; kwayland-integration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz"; - sha256 = "0s1yhrvjgn455ayi368fkmdpmpyxl97c2pxy8rchfnk3g1ffhmdy"; - name = "kwayland-integration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwayland-integration-5.11.1.tar.xz"; + sha256 = "1h1lcvzbcf628hs5hj3ykpzy086ylvf5bz63gr0clhyckjxrbbkh"; + name = "kwayland-integration-5.11.1.tar.xz"; }; }; kwin = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwin-5.10.5.tar.xz"; - sha256 = "1nxyn31a00r9kh0aw5fmvxklw21b2l07y267m0q0n9w6bmn6nzyc"; - name = "kwin-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwin-5.11.1.tar.xz"; + sha256 = "1anc8pblpsb8g7lvnq43ji6fgpwxsnmypc3gkip26lb4j7gqfhqm"; + name = "kwin-5.11.1.tar.xz"; }; }; kwrited = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz"; - sha256 = "0wphhb4l6qb7lbklgxh2sc6wgqij4n3iwnhaarv2d17864r7ykc9"; - name = "kwrited-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/kwrited-5.11.1.tar.xz"; + sha256 = "11y2dpjs0g01nah1924dzf39y1smzlswc6nx1cwgfky3raaz3cj0"; + name = "kwrited-5.11.1.tar.xz"; }; }; libkscreen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz"; - sha256 = "0a2lrrp8wp7ndgdvnh48781isin868ndsqw0xr21rn78n90580n6"; - name = "libkscreen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/libkscreen-5.11.1.tar.xz"; + sha256 = "0drv6f8gzilirwp7p31qrng7cdp7b23ar5v1d5bkdrr1q29z8wdv"; + name = "libkscreen-5.11.1.tar.xz"; }; }; libksysguard = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz"; - sha256 = "0ldcpjxy10cnwwc82ihy8xqjkavycrmv6wlbn0rwhnfs04n2rryn"; - name = "libksysguard-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/libksysguard-5.11.1.tar.xz"; + sha256 = "1m8514jv2487fbypxys65qb0a55psqvyzkw5l81ka4ydnrhl2hhm"; + name = "libksysguard-5.11.1.tar.xz"; }; }; milou = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/milou-5.10.5.tar.xz"; - sha256 = "06kq9s9lij66vy5024aps03pzpcz1ixf0b79a7ii1px2h1s7z4gz"; - name = "milou-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/milou-5.11.1.tar.xz"; + sha256 = "1v7rbjw8i1pdvl60xh8s0srrp17jks360zk42rp3hq9srsffd8cp"; + name = "milou-5.11.1.tar.xz"; }; }; oxygen = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz"; - sha256 = "0p1isrb8v0dkd27jnz6nbq44py7y3zzsjljn9xbv3d02vg802ym9"; - name = "oxygen-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/oxygen-5.11.1.tar.xz"; + sha256 = "0b3yl4q5cbcj6d07xrmifpvwysaa870gf56a7l38zjba6z04819z"; + name = "oxygen-5.11.1.tar.xz"; }; }; plasma-desktop = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz"; - sha256 = "1sxy2k2p15ag5pcy36lpn83nz8d1jb1iyq2nihf4yrc9jlxx9gqm"; - name = "plasma-desktop-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-desktop-5.11.1.tar.xz"; + sha256 = "1r7chviykyq2650k513qcp665pv8vpdczvbrvqfhbpn4yy47crps"; + name = "plasma-desktop-5.11.1.tar.xz"; }; }; plasma-integration = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz"; - sha256 = "15cxwsdp78kx55py0wkwqpv4w8cf130hadmdvdw64lwr4gssvhjn"; - name = "plasma-integration-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-integration-5.11.1.tar.xz"; + sha256 = "0jpshilcpklyx7cbpn0cf96md2h6pwd86bk8lphzm64zv3c655ly"; + name = "plasma-integration-5.11.1.tar.xz"; }; }; plasma-nm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz"; - sha256 = "004nmkfy74qaba6hslv2cyb52l7q6ihpavi5j5ax8k66n5zx00bi"; - name = "plasma-nm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-nm-5.11.1.tar.xz"; + sha256 = "0479cqy7503krish11djg7rc4g7kdlbj3gapsbgvlq9x6j7ixz1p"; + name = "plasma-nm-5.11.1.tar.xz"; }; }; plasma-pa = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz"; - sha256 = "0300x3w7mhyb5wpsj47qsfm73fc90iw1vxrgzl9014pxc3h14np1"; - name = "plasma-pa-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-pa-5.11.1.tar.xz"; + sha256 = "0g565v4dwcn6jppn1p2dvljg5r39xmgjzgf8rcipw70kcwc1nx4c"; + name = "plasma-pa-5.11.1.tar.xz"; }; }; plasma-sdk = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz"; - sha256 = "0mjndw132rn46sqjw5jdin8hn6lbrx5955h05jawk95sncr3d0yb"; - name = "plasma-sdk-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-sdk-5.11.1.tar.xz"; + sha256 = "0ss148yig5zzprkk2ydq3np34gr0bnbh1gn18hgb5z33iglbdl3n"; + name = "plasma-sdk-5.11.1.tar.xz"; }; }; plasma-tests = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-tests-5.10.5.tar.xz"; - sha256 = "0mfh35zdc4n52q01jbagxgr51hsvjlyfmnj6x4l2zpif0fpqpxh8"; - name = "plasma-tests-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-tests-5.11.1.tar.xz"; + sha256 = "03r5dczb9iqigg2s7h0k6zgb616358lqvl2h0k0bg2hxggnh8lpk"; + name = "plasma-tests-5.11.1.tar.xz"; + }; + }; + plasma-vault = { + version = "5.11.1"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.11.1/plasma-vault-5.11.1.tar.xz"; + sha256 = "09wbjk0bsbjyh5n1d5gywdvaimajqr50sd23dbfdbnpi3br0gk10"; + name = "plasma-vault-5.11.1.tar.xz"; }; }; plasma-workspace = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz"; - sha256 = "1n12vzjnrhndkzki7dh9kzrwrvll5xqq0y02srb9bg3gyjbp54jl"; - name = "plasma-workspace-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-5.11.1.tar.xz"; + sha256 = "1fy4bdxrz8mn29nc2qjxjnpxzjy9mynwwdjxj0jr61w0ljd40wiy"; + name = "plasma-workspace-5.11.1.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz"; - sha256 = "1z7mqk9nxh232dxl5jg20zbc5nkq5srks4f8b02va6wzfjhwhc88"; - name = "plasma-workspace-wallpapers-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plasma-workspace-wallpapers-5.11.1.tar.xz"; + sha256 = "0dcfrad2543fxapizmlikv52m9nmdg45gddvh9chc83kangsydlc"; + name = "plasma-workspace-wallpapers-5.11.1.tar.xz"; }; }; plymouth-kcm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz"; - sha256 = "11vfaaqd3mxbnq16rv7xsmfcj33i2cmdljdxib1sg5minybd072y"; - name = "plymouth-kcm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/plymouth-kcm-5.11.1.tar.xz"; + sha256 = "0w3yhazbx79s9k1yc3lj16hanc3wrqphhk9zjl9q1vxsn2rzas8h"; + name = "plymouth-kcm-5.11.1.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.10.5"; + version = "1-5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz"; - sha256 = "158lkf76fz65nr0lx14skkcsk2p3xw98nh43z00wvm2c5qqzmnp2"; - name = "polkit-kde-agent-1-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/polkit-kde-agent-1-5.11.1.tar.xz"; + sha256 = "04ycjqx9hnk3ab8qxk5gqz7b4r7im3bwap613qcgxjqr5cagp66w"; + name = "polkit-kde-agent-1-5.11.1.tar.xz"; }; }; powerdevil = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz"; - sha256 = "0dghlgva8fybvhc09y1avzhgak246n4ad2njjvfnxpazpi2laxv7"; - name = "powerdevil-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/powerdevil-5.11.1.tar.xz"; + sha256 = "02rf8iz2spcc78xs88dknl6a7slwgfgh4ra8lhwk69d210cxgahq"; + name = "powerdevil-5.11.1.tar.xz"; }; }; sddm-kcm = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz"; - sha256 = "13hld5bndxhs6j3lja08zrc6czvpl4k385i8lb3g9zvn9vrk29sw"; - name = "sddm-kcm-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/sddm-kcm-5.11.1.tar.xz"; + sha256 = "0sac2cknq7m26v8a59q1aakn6xjzmspnslfs6k633a8yz8w4lh19"; + name = "sddm-kcm-5.11.1.tar.xz"; }; }; systemsettings = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz"; - sha256 = "0b3wpmfjj2zmi7ickppz32i63dpn4jja3nnjrxn912yw47z4bri2"; - name = "systemsettings-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/systemsettings-5.11.1.tar.xz"; + sha256 = "0bnygmb3g573b7a8g0qg3ddj65miw29v3p25sh0ic9ij5bx6f4rw"; + name = "systemsettings-5.11.1.tar.xz"; }; }; user-manager = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz"; - sha256 = "1fiih72jafshxgwfq4q9csv1i62mgj35qr87lh6lyady6aghajnq"; - name = "user-manager-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/user-manager-5.11.1.tar.xz"; + sha256 = "1iz5wm8d3ljn97msbh1bc7v8zmmgxrfr5mwfzh0ssdldba4wqlpm"; + name = "user-manager-5.11.1.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.10.5"; + version = "5.11.1"; src = fetchurl { - url = "${mirror}/stable/plasma/5.10.5/xdg-desktop-portal-kde-5.10.5.tar.xz"; - sha256 = "0rgv4nqkrwjzvhg8cmkin348n0i6sd4v444bk6j83y4m0lxdi1ba"; - name = "xdg-desktop-portal-kde-5.10.5.tar.xz"; + url = "${mirror}/stable/plasma/5.11.1/xdg-desktop-portal-kde-5.11.1.tar.xz"; + sha256 = "0w822jlg0h7qim70zamm7q5x2b614qmiggz9wr8yxq80lajizxnf"; + name = "xdg-desktop-portal-kde-5.11.1.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix index a24eabc39f31..954a8f9f45ba 100644 --- a/pkgs/desktops/plasma-5/systemsettings.nix +++ b/pkgs/desktops/plasma-5/systemsettings.nix @@ -1,7 +1,8 @@ { mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews, - kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2 + kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2, + kactivities, kactivities-stats, kirigami2 }: mkDerivation { @@ -10,6 +11,7 @@ mkDerivation { buildInputs = [ kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2 + kactivities kactivities-stats kirigami2 ]; outputs = [ "out" "dev" "bin" ]; } diff --git a/pkgs/development/libraries/grantlee/5/default.nix b/pkgs/development/libraries/grantlee/5/default.nix index 6fae90a8d890..3eed4f0c2e29 100644 --- a/pkgs/development/libraries/grantlee/5/default.nix +++ b/pkgs/development/libraries/grantlee/5/default.nix @@ -21,8 +21,12 @@ mkDerivation rec { postFixup = # Disabuse CMake of the notion that libraries are in $dev '' - sed -i $dev/lib/cmake/Grantlee5/GrantleeTargets-release.cmake \ - -e "s|\''${_IMPORT_PREFIX}|$out|" + for way in release debug; do + cmake="$dev/lib/cmake/Grantlee5/GrantleeTargets-$way.cmake" + if [ -f "$cmake" ]; then + sed -i "$cmake" -e "s|\''${_IMPORT_PREFIX}|$out|" + fi + done ''; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index d5995459fd4f..de99503131c1 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -132,6 +132,7 @@ let sonnet = callPackage ./sonnet.nix {}; syntax-highlighting = callPackage ./syntax-highlighting.nix {}; threadweaver = callPackage ./threadweaver.nix {}; + kirigami2 = callPackage ./kirigami2.nix {}; # TIER 2 kactivities = callPackage ./kactivities.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/kirigami2.nix b/pkgs/development/libraries/kde-frameworks/kirigami2.nix new file mode 100644 index 000000000000..f4fc40f6d31d --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kirigami2.nix @@ -0,0 +1,11 @@ +{ mkDerivation, extra-cmake-modules, qtbase, qtquickcontrols2, qttranslations }: + +mkDerivation { + name = "kirigami2"; + meta = { + broken = builtins.compareVersions qtbase.version "5.7.0" < 0; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + buildInputs = [ qtbase qtquickcontrols2 qttranslations ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix index fc5e5d39c63c..ce3f6d157130 100644 --- a/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/qtbase/default.nix @@ -252,6 +252,9 @@ stdenv.mkDerivation { "-inotify" "-system-libjpeg" "-system-libpng" + # gold linker of binutils 2.28 generates duplicate symbols + # TODO: remove for newer version of binutils + "-no-use-gold-linker" ] ++ lib.optionals stdenv.isDarwin [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f9a904120af7..2efb3cef2ae1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10316,7 +10316,7 @@ with pkgs; kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting - threadweaver; + threadweaver kirigami2; ### KDE PLASMA 5 @@ -18259,7 +18259,7 @@ with pkgs; kactivitymanagerd kde-cli-tools kde-gtk-config kdeplasma-addons kgamma5 kinfocenter kmenuedit kscreen kscreenlocker ksshaskpass ksysguard kwallet-pam kwayland-integration kwin kwrited milou oxygen plasma-desktop - plasma-integration plasma-nm plasma-pa plasma-workspace + plasma-integration plasma-nm plasma-pa plasma-vault plasma-workspace plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm startkde systemsettings;