From 65ccb6f831a38059ff8df891a983959d9f3df2b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 8 Jun 2026 23:12:43 +0300 Subject: [PATCH] kdePackages: Plasma 6.6.5 -> 6.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: 𝑷𝒉𝒊𝒍𝒐𝒄𝒂𝒍𝒚𝒔𝒕 Co-authored-by: adisbladis --- maintainers/scripts/kde/collect-logs.nu | 4 +- maintainers/scripts/kde/generate-sources.py | 1 + .../services/desktop-managers/plasma6.nix | 3 + pkgs/kde/default.nix | 1 + pkgs/kde/generated/licenses.json | 33 +- pkgs/kde/generated/projects.json | 46 +- pkgs/kde/generated/sources/plasma.json | 448 +++++++++--------- pkgs/kde/misc/cxx-rust-cssparser/default.nix | 55 +++ pkgs/kde/plasma/default.nix | 2 + pkgs/kde/plasma/kdeplasma-addons/default.nix | 32 +- .../plasma/kinfocenter/0001-tool-paths.patch | 75 +-- pkgs/kde/plasma/krdp/default.nix | 3 + pkgs/kde/plasma/kscreen/default.nix | 8 +- ...er-CAP_SYS_NICE-from-the-ambient-set.patch | 40 -- ...lugins-qpa-allow-using-nixos-wrapper.patch | 21 +- pkgs/kde/plasma/kwin/default.nix | 2 - pkgs/kde/plasma/plasma-bigscreen/default.nix | 39 ++ pkgs/kde/plasma/plasma-desktop/default.nix | 5 - .../plasma/plasma-desktop/hwclock-path.patch | 24 - pkgs/kde/plasma/plasma-desktop/tzdir.patch | 18 - pkgs/kde/plasma/plasma-keyboard/default.nix | 4 + .../plasma-login-manager/config-mtime.patch | 14 - .../plasma/plasma-login-manager/default.nix | 1 - .../plasma-login-manager/kwin-path.patch | 5 +- pkgs/kde/plasma/plasma-nm/default.nix | 2 + .../plasma/plasma-vault/hardcode-paths.patch | 20 +- pkgs/kde/plasma/plasma-workspace/default.nix | 2 + .../plasma-workspace/dependency-paths.patch | 24 +- pkgs/kde/plasma/powerdevil/default.nix | 4 - .../plasma/powerdevil/rb-batterymonitor.patch | 10 - pkgs/kde/plasma/print-manager/default.nix | 6 +- pkgs/kde/plasma/spectacle/default.nix | 10 - pkgs/kde/plasma/union/default.nix | 11 + 33 files changed, 539 insertions(+), 434 deletions(-) create mode 100644 pkgs/kde/misc/cxx-rust-cssparser/default.nix delete mode 100644 pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch create mode 100644 pkgs/kde/plasma/plasma-bigscreen/default.nix delete mode 100644 pkgs/kde/plasma/plasma-desktop/hwclock-path.patch delete mode 100644 pkgs/kde/plasma/plasma-desktop/tzdir.patch delete mode 100644 pkgs/kde/plasma/plasma-login-manager/config-mtime.patch delete mode 100644 pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch create mode 100644 pkgs/kde/plasma/union/default.nix diff --git a/maintainers/scripts/kde/collect-logs.nu b/maintainers/scripts/kde/collect-logs.nu index 1d07fa9d2caf..656a97a0ce38 100755 --- a/maintainers/scripts/kde/collect-logs.nu +++ b/maintainers/scripts/kde/collect-logs.nu @@ -6,6 +6,8 @@ mkdir logs nix-env -qaP -f . -A kdePackages --json --out-path | from json | values | par-each { |it| echo $"Processing ($it.pname)..." if "outputs" in $it { - nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log" + try { + nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log" + } } } diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index 2966e7ef9675..11a24f7c47ed 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -37,6 +37,7 @@ PROJECTS_WITH_RUST = { "akonadi-search", "angelfish", "kdepim-addons", + "kdeplasma-addons", } def to_sri(hash): diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 0785f4f809d1..0813b1b6b84c 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -172,6 +172,9 @@ in # touch keyboard plasma-keyboard qtvirtualkeyboard # used by plasma-keyboard KCM + + # experimental(?) Union theme + union ] ++ lib.optional config.networking.networkmanager.enable qrca ++ lib.optionals config.hardware.sensor.iio.enable [ diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 58cdeab2dfc8..e97e6d866a7d 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -69,6 +69,7 @@ let selenium-webdriver-at-spi = null; # Used for integration tests that we don't run, stub alpaka = self.callPackage ./misc/alpaka { }; + cxx-rust-cssparser = self.callPackage ./misc/cxx-rust-cssparser { }; glaxnimate = self.callPackage ./misc/glaxnimate { }; kdiagram = self.callPackage ./misc/kdiagram { }; kdevelop-pg-qt = self.callPackage ./misc/kdevelop-pg-qt { }; diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json index c0fe90c9efe5..f7210a6880d8 100644 --- a/pkgs/kde/generated/licenses.json +++ b/pkgs/kde/generated/licenses.json @@ -236,6 +236,7 @@ "LicenseRef-SJFonts" ], "bluedevil": [ + "BSD-2-Clause", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", @@ -278,6 +279,7 @@ "breeze-grub": [ "BSD-2-Clause", "CC-BY-SA-4.0", + "CC0-1.0", "Font-exception-2.0", "GPL-2.0-or-later", "GPL-3.0-only", @@ -2674,6 +2676,19 @@ "LicenseRef-KDE-Accepted-GPL", "LicenseRef-KDE-Accepted-LGPL" ], + "plasma-bigscreen": [ + "CC-BY-SA-4.0", + "CC0-1.0", + "GPL-2.0-only", + "GPL-2.0-or-later", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-GPL", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], "plasma-browser-integration": [ "BSD-2-Clause", "CC0-1.0", @@ -2897,6 +2912,7 @@ ], "plasma-welcome": [ "BSD-2-Clause", + "CC-BY-SA-4.0", "CC0-1.0", "GPL-2.0-only", "GPL-2.0-or-later", @@ -2911,6 +2927,7 @@ "GPL-2.0-or-later", "GPL-3.0-only", "GPL-3.0-or-later", + "ISC", "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", @@ -2964,20 +2981,19 @@ "GPL-2.0-only", "GPL-2.0-or-later", "GPL-3.0-only", - "GPL-3.0-or-later", "LGPL-2.0-only", "LGPL-2.0-or-later", "LGPL-2.1-only", "LGPL-2.1-or-later", "LGPL-3.0-only", "LicenseRef-KDE-Accepted-GPL", - "LicenseRef-KDE-Accepted-LGPL", - "MIT" + "LicenseRef-KDE-Accepted-LGPL" ], "poxml": [ "CC0-1.0" ], "print-manager": [ + "BSD-2-Clause", "BSD-3-Clause", "CC0-1.0", "GPL-2.0-or-later", @@ -3204,6 +3220,17 @@ "LicenseRef-KDE-Accepted-GPL", "MIT" ], + "union": [ + "BSD-2-Clause", + "CC0-1.0", + "GPL-2.0-only", + "GPL-3.0-only", + "LGPL-2.0-or-later", + "LGPL-2.1-only", + "LGPL-3.0-only", + "LicenseRef-KDE-Accepted-LGPL", + "MIT" + ], "wacomtablet": [], "xdg-desktop-portal-kde": [ "BSD-2-Clause", diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json index 2c7c29ac958c..f873a3b645f8 100644 --- a/pkgs/kde/generated/projects.json +++ b/pkgs/kde/generated/projects.json @@ -83,6 +83,12 @@ "project_path": "pim/akonadi-contacts", "repo_path": "pim/akonadi-contacts" }, + "akonadi-e2e-tests": { + "description": "Test suite for end-to-end testing of Akonadi Resources against real servers.", + "name": "akonadi-e2e-tests", + "project_path": "pim/akonadi-e2e-tests", + "repo_path": "pim/akonadi-e2e-tests" + }, "akonadi-exchange": { "description": "Akonadi plugin for Exchange groupware functionality", "name": "akonadi-exchange", @@ -1715,6 +1721,12 @@ "project_path": "frameworks/kconfig", "repo_path": "frameworks/kconfig" }, + "kconfigeditor": { + "description": "Graphical editor for KConfig files", + "name": "kconfigeditor", + "project_path": "system/kconfigeditor", + "repo_path": "system/kconfigeditor" + }, "kconfigwidgets": { "description": "Widgets for KConfig", "name": "kconfigwidgets", @@ -2531,6 +2543,12 @@ "project_path": "utilities/keepsecret", "repo_path": "utilities/keepsecret" }, + "kemoji": { + "description": "Framework providing an emoji dictionary, model, search and basic components for use in applications.", + "name": "kemoji", + "project_path": "libraries/kemoji", + "repo_path": "libraries/kemoji" + }, "kemoticons": { "description": "KEmoticons", "name": "kemoticons", @@ -2897,6 +2915,12 @@ "project_path": "libs/kirigami-addons", "repo_path": "libraries/kirigami-addons" }, + "kirigami-app-components": { + "description": "Kirigami addons and modules necessary to do a full featured KDE application, such as integration with configurable keyboard shortcuts and standard actions.", + "name": "kirigami-app-components", + "project_path": "libraries/kirigami-app-components", + "repo_path": "libraries/kirigami-app-components" + }, "kirigami-gallery": { "description": "Kirigami component gallery application", "name": "kirigami-gallery", @@ -3089,6 +3113,12 @@ "project_path": "pim/kmbox", "repo_path": "pim/kmbox" }, + "kmcpclientinspector": { + "description": "App which allows the user to inspect apps which implement MCP protocol support.", + "name": "kmcpclientinspector", + "project_path": "sdk/kmcpclientinspector", + "repo_path": "sdk/kmcpclientinspector" + }, "kmediaplayer": { "description": "KMediaPlayer", "name": "kmediaplayer", @@ -3104,8 +3134,8 @@ "kmime": { "description": "Library to assist handling MIME data", "name": "kmime", - "project_path": "pim/kmime", - "repo_path": "pim/kmime" + "project_path": "frameworks/kmime", + "repo_path": "frameworks/kmime" }, "kmines": { "description": "KMines is the classic Minesweeper game", @@ -5399,6 +5429,12 @@ "project_path": "graphics/optiimage", "repo_path": "graphics/optiimage" }, + "os-autoinst-distri-kdelinux": { + "description": "End-to-end tests for KDE Linux using openQA", + "name": "os-autoinst-distri-kdelinux", + "project_path": "kde-linux/os-autoinst-distri-kdelinux", + "repo_path": "kde-linux/os-autoinst-distri-kdelinux" + }, "osx-patches": { "description": "Fixes for KDE problems that occur on Apple OS X", "name": "osx-patches", @@ -8015,6 +8051,12 @@ "project_path": "websites/libregraphicsmeeting-org-2026", "repo_path": "websites/libregraphicsmeeting-org-2026" }, + "websites-linux-kde-org": { + "description": "Website for KDE Linux - linux.kde.org", + "name": "websites-linux-kde-org", + "project_path": "websites/linux-kde-org", + "repo_path": "websites/linux-kde-org" + }, "websites-lists-kde-org": { "description": "Necessary code to redirect from lists.kde.org to appropriate mail archives", "name": "websites-lists-kde-org", diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 991bcead5d2c..5f74fe6626b9 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,367 +1,377 @@ { "aurorae": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/aurorae-6.6.5.tar.xz", - "hash": "sha256-58PecQp1+Z34xPgKdB49HpDlxcra5Eo9GAhh0PXJ3Pk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/aurorae-6.7.0.tar.xz", + "hash": "sha256-U4Ij6+dSEwXSmHPCePheeRDreBCjHSppaY7edqXA2jw=" }, "bluedevil": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/bluedevil-6.6.5.tar.xz", - "hash": "sha256-Q5ZEeoO12rXEhnaQgkGAw29POSIQdGNyL+1CIC2KRf8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/bluedevil-6.7.0.tar.xz", + "hash": "sha256-P9q0pyS6JGoQ8mNwdspTMniP/1w8YZPM806wMeiXPp0=" }, "breeze": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-6.6.5.tar.xz", - "hash": "sha256-BsTD5GbNA6jB5BGjiwR1a24UWHmlYFNLL8RGZtQTMPQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-6.7.0.tar.xz", + "hash": "sha256-zzdbuqpF9bobPfA2vwxAt+39eJ6yb25G+d0dMldpy9U=" }, "breeze-grub": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-grub-6.6.5.tar.xz", - "hash": "sha256-Ww6HUYdDOwyBDFb732sTpeYPcXdBIqYZNwmc63MPpUY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-grub-6.7.0.tar.xz", + "hash": "sha256-x+atJoKHKWS9cJucyrD8uTKKz1YpQHwji3XvfYA8+iE=" }, "breeze-gtk": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-gtk-6.6.5.tar.xz", - "hash": "sha256-dsqtTKLjzosCrh6+DAaBAbsH21HaR/iPo6QM3OOTq/Y=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-gtk-6.7.0.tar.xz", + "hash": "sha256-KFmeF3tBZqezMvg0pyaWz4gs+fap7hknCKJ/R0wQJ8A=" }, "breeze-plymouth": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/breeze-plymouth-6.6.5.tar.xz", - "hash": "sha256-0QLuiuPG/pNTVTqPxPxfFSwSh+UEws6XXCxyHzwsiBo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/breeze-plymouth-6.7.0.tar.xz", + "hash": "sha256-2gNHVU33S38RsXA71s3eF2kXQuMqXMzfyTJaGzJhBqU=" }, "discover": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/discover-6.6.5.tar.xz", - "hash": "sha256-DRRxrfSws7+SrJMiXi5IYEk2d/P7mgLb9EsZOufBU1c=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/discover-6.7.0.tar.xz", + "hash": "sha256-A9SisXVxdla/7pB/T7lBILhs3MhmPZTnkkrG8nelWyc=" }, "drkonqi": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/drkonqi-6.6.5.tar.xz", - "hash": "sha256-srEE1fMCJLyogoAkbKmQrDFNgcsb8NOFdhP/aD25LYI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/drkonqi-6.7.0.tar.xz", + "hash": "sha256-VeZibrxQCJmKInVcjNJx8jNYcqUM3fZfFY/dXNI319M=" }, "flatpak-kcm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/flatpak-kcm-6.6.5.tar.xz", - "hash": "sha256-BhN3wGTCrAb3fShQ5xGGfpF2jDyDM9/7jysLohgDsBo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/flatpak-kcm-6.7.0.tar.xz", + "hash": "sha256-SmSQaW60yGQ4sE6X3BY75QsM17t+rPuyBGkglP9gt2s=" }, "kactivitymanagerd": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kactivitymanagerd-6.6.5.tar.xz", - "hash": "sha256-hZu456bvtCEKglEqvsTXtuqaxviDorHbTT3lyhFFIiQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kactivitymanagerd-6.7.0.tar.xz", + "hash": "sha256-7QZcLXbIXPjhDdcv+PiechNvxMhVYabJheuX3FGERqE=" }, "kde-cli-tools": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kde-cli-tools-6.6.5.tar.xz", - "hash": "sha256-F+ygLPPVDSZshfREv+87fBwHpZss3r9sok5v2BuA0SI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kde-cli-tools-6.7.0.tar.xz", + "hash": "sha256-JyD/fvv5e+9GmwL1RInz2bKguYyHGu25Fazbr5nzGZg=" }, "kde-gtk-config": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kde-gtk-config-6.6.5.tar.xz", - "hash": "sha256-KQKgErqF0tIB+HnRfwtPUZEOQ6HLDXYXiLBjsMF9exA=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kde-gtk-config-6.7.0.tar.xz", + "hash": "sha256-2W5YIUxmMrSR0yyqSusVrihPg+inXTu5SFl49Cr0q9k=" }, "kdecoration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kdecoration-6.6.5.tar.xz", - "hash": "sha256-BujtBLjzzc0wV6ni0jKR70Gjl2+W/Iz5F0eSGIcaqf0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kdecoration-6.7.0.tar.xz", + "hash": "sha256-rP5WV9iJvw3VuLUBMrvpxi9ItQdPy6gmWhy4TWwie10=" }, "kdeplasma-addons": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kdeplasma-addons-6.6.5.tar.xz", - "hash": "sha256-SP2ufPqiYEKlkCf76N+DeJsXJFi8KvCiOgFaBLgHGvk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kdeplasma-addons-6.7.0.tar.xz", + "hash": "sha256-i4awt5sK8toJfYHc4JmRPUNXTgjEQop5JYcGkheLQpg=" }, "kgamma": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kgamma-6.6.5.tar.xz", - "hash": "sha256-+rcERciMmM6QfoltjHHL93cQRIgLXvEW/ulphj5TNgo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kgamma-6.7.0.tar.xz", + "hash": "sha256-6MM9ukfaPqD4kFPpQCmCqx+9tpwlm/CLEEegUEsH3ZI=" }, "kglobalacceld": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kglobalacceld-6.6.5.tar.xz", - "hash": "sha256-M8lft7PN2rV2bgywY6chr195ayhBEUGDpiRuDvVX7cM=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kglobalacceld-6.7.0.tar.xz", + "hash": "sha256-/1423Ly4GC8baVBimTqeosxz0mdTay9ZJt4Dn6dzLGU=" }, "kinfocenter": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kinfocenter-6.6.5.tar.xz", - "hash": "sha256-m3d/hw8SCTnjdCFc4s7TiVcdS9609vAJLJCLjC4ML9Y=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kinfocenter-6.7.0.tar.xz", + "hash": "sha256-303tKcuH12W31fSxYcKaQlWGOES+5kJH5vDT8Miz5aM=" }, "kmenuedit": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kmenuedit-6.6.5.tar.xz", - "hash": "sha256-HCTxXhPRatnAZD6ioISUIDKf0Qti/SYrSM2t5ngnSCg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kmenuedit-6.7.0.tar.xz", + "hash": "sha256-8n/tXImJrQCtxxS8fzd638qXQsTM06//lHjVAu6v/6s=" }, "knighttime": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/knighttime-6.6.5.tar.xz", - "hash": "sha256-XyZpKoZFQLmTNREG9Uaf0Xk5vVXnn5Mcj5c5XZxagJ0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/knighttime-6.7.0.tar.xz", + "hash": "sha256-wvx1Kc7zs6gL5HFShtAn/IkI7w/oBArqEGgxpSZfwRM=" }, "kpipewire": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kpipewire-6.6.5.tar.xz", - "hash": "sha256-eu1/chxboF8ggS6ozeBH3MbjN1ulIbvd2CwlkVq/M00=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kpipewire-6.7.0.tar.xz", + "hash": "sha256-2/g5t3nFCMICC9+dZCdiOHy6hQWSkd6rOOigwVIjuts=" }, "krdp": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/krdp-6.6.5.tar.xz", - "hash": "sha256-heNRMfZAwmn422svhY+wQ/b2JmsfZQMBKdEQwK3LgGE=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/krdp-6.7.0.tar.xz", + "hash": "sha256-5lylbPL5ZplFENzOzVOJKSLiYa19upkR0vN0BgKTxts=" }, "kscreen": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kscreen-6.6.5.tar.xz", - "hash": "sha256-dT68AM91NZwue6OquyD/NZbQ+74vC20+1gmNJygqMnY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kscreen-6.7.0.tar.xz", + "hash": "sha256-rVekMmpkl5poqlBopxUXAtmwLbByBnDkvj4XiQW+2lY=" }, "kscreenlocker": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kscreenlocker-6.6.5.tar.xz", - "hash": "sha256-m6Cu4yNkBR7rIT1I3TwgiuDOcGIZCjD4VXNbpO/jicw=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kscreenlocker-6.7.0.tar.xz", + "hash": "sha256-wxVLaKiF7VXUzVd/gT9VU+oLMdvdMbMrN0SQVVD+w9E=" }, "ksshaskpass": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/ksshaskpass-6.6.5.tar.xz", - "hash": "sha256-sOiKJUajmiaVeO7e9eooFJpxmnrJdXAZ6f8/klTXWkI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/ksshaskpass-6.7.0.tar.xz", + "hash": "sha256-TY7lYdv64xjil4QR2z1/3wkmY/XUXTafHjqSNNhyzuA=" }, "ksystemstats": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/ksystemstats-6.6.5.tar.xz", - "hash": "sha256-a14vKmqq6XSJ51gY5/g8JYZXgCJ2CCHGd83rzvpULjY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/ksystemstats-6.7.0.tar.xz", + "hash": "sha256-IiTOQeQudYRaqIbhkueDPOY4uGqjHKDk48sx7zbkBms=" }, "kwallet-pam": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwallet-pam-6.6.5.tar.xz", - "hash": "sha256-VDSlD0IYZ/wRGQOJvevENAS2TK3MfYex8I/5XvGZhT4=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwallet-pam-6.7.0.tar.xz", + "hash": "sha256-cdvV1qtSQ+eMUjzjgtU70Uw1cxrwlJf76Sm8pBtprtk=" }, "kwayland": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwayland-6.6.5.tar.xz", - "hash": "sha256-r7zVPKil+1AQOEFfFHPD0RVW61btj2U+zgP3fXmcrQE=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwayland-6.7.0.tar.xz", + "hash": "sha256-hiHRfpEAvmDqNAI1II0ET9ApMdvvdqMtmkd94xyOM/Q=" }, "kwayland-integration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwayland-integration-6.6.5.tar.xz", - "hash": "sha256-JyB2THOWP+Br144uyjKeumH7Yl3/bT3PSmjsFndmzm4=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwayland-integration-6.7.0.tar.xz", + "hash": "sha256-IRld2c69WlxzhmOybw4dFaspj1ncqvkkNethi540JcM=" }, "kwin": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwin-6.6.5.tar.xz", - "hash": "sha256-bBh856VQYJC0OO+QAQODb6BTdnTd6LMeW0l+8yFkPLQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwin-6.7.0.tar.xz", + "hash": "sha256-0gt5gJSp9Y5X3lXso9WLHNy32yk564v3ORjE+rbZrsU=" }, "kwin-x11": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwin-x11-6.6.5.tar.xz", - "hash": "sha256-1RcnctW53W7w8yMMtfinjfkUjdBwGdjygqCTHK2UayQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwin-x11-6.7.0.tar.xz", + "hash": "sha256-msC4W1kBbfuRWH+MGXD71cbyFdEsmkGazQv30PBJNgY=" }, "kwrited": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/kwrited-6.6.5.tar.xz", - "hash": "sha256-ud9jS+KqFELYJH1iUKh9ffsczW+bzQHA5iEC1atpNqc=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/kwrited-6.7.0.tar.xz", + "hash": "sha256-dUOaklYfbDMoBNHSfa4VvFdVuMmvKNp50WwDLVCQOxA=" }, "layer-shell-qt": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/layer-shell-qt-6.6.5.tar.xz", - "hash": "sha256-6MFFVFrEnVMl8W/3ELUh3qtuW5dF/MGKtDElIiSo+YI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/layer-shell-qt-6.7.0.tar.xz", + "hash": "sha256-5vSLbr4sPKqjwu9thHBVCQTQMK00lrwQpUCYddstqrA=" }, "libkscreen": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/libkscreen-6.6.5.tar.xz", - "hash": "sha256-8v0R8vZf+cpP87ULmVMBipKbG/MmOzLsFxxCmORmIUk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/libkscreen-6.7.0.tar.xz", + "hash": "sha256-bvulgFeiY12m8YVbprCOV+Y2yXZCG6Xj9fZn5qV7DOE=" }, "libksysguard": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/libksysguard-6.6.5.tar.xz", - "hash": "sha256-8IiFSgIQKLew9qc1yJ6apTvRPpA68R7RaknJROM7AN8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/libksysguard-6.7.0.tar.xz", + "hash": "sha256-40wBQ4OZ/CMJDN5NRyJbzY9giZ0TjsrpnMWZZZU2rOM=" }, "libplasma": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/libplasma-6.6.5.tar.xz", - "hash": "sha256-guArIJj0uskPKM3U+dOk2kVXRA7INHIg2P7ik8H5jYs=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/libplasma-6.7.0.tar.xz", + "hash": "sha256-ioXkyessPAC1aDzOOqLJSdBrlWyIeJwbHBELarriAxI=" }, "milou": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/milou-6.6.5.tar.xz", - "hash": "sha256-P2KF5ftqncdjQ1K7Ov+ALcORBA6SzTx/G5YB3Z1cVNA=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/milou-6.7.0.tar.xz", + "hash": "sha256-jJSkw875vGJbVByz1MLwqVv6E9MfPBgGM/fvnScB2x4=" }, "ocean-sound-theme": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/ocean-sound-theme-6.6.5.tar.xz", - "hash": "sha256-RrdhYOaZjgOzmQxmnW2hZr14XaNWhBGT61SLNYEdxt8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/ocean-sound-theme-6.7.0.tar.xz", + "hash": "sha256-ELK6ypKrcZirzCDVjdrTGRDIxr7uRxH8KkohUFRG8TU=" }, "oxygen": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/oxygen-6.6.5.tar.xz", - "hash": "sha256-QDSMe+uRHsYcuWxMu16i5hHhifr05MnSspgTvCj3K0o=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/oxygen-6.7.0.tar.xz", + "hash": "sha256-ER+2K8PZ86lZ53/TX+VWLKNK14PLzcDBZFh/Vklc/ww=" }, "oxygen-sounds": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/oxygen-sounds-6.6.5.tar.xz", - "hash": "sha256-TGSFVf58y5vPRvsLRFLahcWCEgFEXrcuxFtdleV5QvY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/oxygen-sounds-6.7.0.tar.xz", + "hash": "sha256-YqPdeoilcNacNwpxomHI3QTZLa+QJQyiqdI8KeZ+HIo=" }, "plasma-activities": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-activities-6.6.5.tar.xz", - "hash": "sha256-VNBqIqV2WqHpKDSIXQKrx84b+Na9qVM7s0ctT+9XVWI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-activities-6.7.0.tar.xz", + "hash": "sha256-OP+VeZagnBUjbpOwNboSNICliv90iUtht98QIOxEK1k=" }, "plasma-activities-stats": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-activities-stats-6.6.5.tar.xz", - "hash": "sha256-k6929cQXHQic2aT1ArumOmXyo3GqGoPAxs+wAhpe+6Y=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-activities-stats-6.7.0.tar.xz", + "hash": "sha256-K0qu2cRoW8LAVqDLqE1CfvLx63pPhB1Yd9A0e1sRzBM=" + }, + "plasma-bigscreen": { + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-bigscreen-6.7.0.tar.xz", + "hash": "sha256-IS6811bk2oY4UsvKj9qPE+h/6IDSKSy9S+iPJs8k9IY=" }, "plasma-browser-integration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-browser-integration-6.6.5.tar.xz", - "hash": "sha256-PFS/Fc1wxI8mu2Xm14egE6hvI3XY/v0sCsq2ULN4Rvk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-browser-integration-6.7.0.tar.xz", + "hash": "sha256-zVtIPuKJHea7Bi3q62r+DAop6VHgclEMASwVtJsblUs=" }, "plasma-desktop": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-desktop-6.6.5.tar.xz", - "hash": "sha256-HXWN/8xC4dP7v+oFAACdPceVzxMTuTtXTag2JBdwhfM=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-desktop-6.7.0.tar.xz", + "hash": "sha256-Y1E7VPb2CzzX7DXKLwlivfJWaXKTiOhRWsHTuIme5H8=" }, "plasma-dialer": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-dialer-6.6.5.tar.xz", - "hash": "sha256-LfdMa2g78IA06CyvYLquTV26VB9U2Lp/44r8eomprK0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-dialer-6.7.0.tar.xz", + "hash": "sha256-CKULmVTY8yxCgJknsUz7Kg/GaKc1XhdWGbsNL86izUc=" }, "plasma-disks": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-disks-6.6.5.tar.xz", - "hash": "sha256-ZgYJofSJwZfTVBmurLwI7HJMXhNTinNus9gawzG59jk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-disks-6.7.0.tar.xz", + "hash": "sha256-mYiOJyaPD1q9+9hd42KxjxymxnDps5LnbaMPUafVzc8=" }, "plasma-firewall": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-firewall-6.6.5.tar.xz", - "hash": "sha256-1KytApwk6qqY8wfl/zmQOqanLzc8gPOjwX7e36RQ+Ow=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-firewall-6.7.0.tar.xz", + "hash": "sha256-eHwVBebooyw/hVu2X0YVY3fuItbcMhpyB5sWB68N8n0=" }, "plasma-integration": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-integration-6.6.5.tar.xz", - "hash": "sha256-woSC3I0zh7mncP3Jmd0TSAsUcUVoOVyNhr1WiwGBkgo=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-integration-6.7.0.tar.xz", + "hash": "sha256-U3sFzUurGwcG+zH5gj+GZt9yleZH51YU8Ctr8UWO/x0=" }, "plasma-keyboard": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-keyboard-6.6.5.tar.xz", - "hash": "sha256-O7i+EJzESa9U0D8ozBwank1BUMsBua+RalUW7WR0BnE=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-keyboard-6.7.0.tar.xz", + "hash": "sha256-gxGV8wjQgRuNeLTIRYFdyhZIuz/sg8nsY30b4ltTq3Q=" }, "plasma-login-manager": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-login-manager-6.6.5.tar.xz", - "hash": "sha256-F1jwAAMTMmXUljravgaPVXAotTWPQx/ESPWL7txND38=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-login-manager-6.7.0.tar.xz", + "hash": "sha256-A8WFlhQcwSYsKxxXSdm2TW5yJclyjUIcblr7ZJNWbuE=" }, "plasma-mobile": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-mobile-6.6.5.tar.xz", - "hash": "sha256-FkOApuHXXcb7ByCQyqPE5fuAu7PxiNMFvOdnyQueRgA=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-mobile-6.7.0.tar.xz", + "hash": "sha256-NCaqC2KblFsHbqzhMMSrvG//b2xd0cK/9/8Ney1HfkI=" }, "plasma-nano": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-nano-6.6.5.tar.xz", - "hash": "sha256-5RQ97bvNDXW73ktEJ4DMfzeSRw7ngvxFX8sVGQpXllg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-nano-6.7.0.tar.xz", + "hash": "sha256-xOL0nSQVfO62vCWYHi1xYA3SEXJJ6CsMwE+klAEZMYE=" }, "plasma-nm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-nm-6.6.5.tar.xz", - "hash": "sha256-yS0J0peNu+a1yJe+rIIs0FPBdHPx1hUG4VK/y0a3C5s=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-nm-6.7.0.tar.xz", + "hash": "sha256-spaAzBfEu+UuO5iNW+Q37EtSS1VPoYDq0TvIkQFEz5g=" }, "plasma-pa": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-pa-6.6.5.tar.xz", - "hash": "sha256-tjwBmB6g0yn9CAE+/ySyR7YJIqvhSXvgEjRmDBXLOCY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-pa-6.7.0.tar.xz", + "hash": "sha256-utzogREH7ldyBxYnWsX8EhFmibw0zkk8q+cijhtlj1E=" }, "plasma-sdk": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-sdk-6.6.5.tar.xz", - "hash": "sha256-7VQKi9oaYziB/KQfff6WrhfJplS3E3SnnobPVH78yVk=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-sdk-6.7.0.tar.xz", + "hash": "sha256-1G1SKRVGImSuXUl7rBb3U7DQtrW1uZtG/fiCP0xWLtM=" }, "plasma-setup": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-setup-6.6.5.tar.xz", - "hash": "sha256-z756OF13wLUHaJXJ/N3BPHFYBebvEWxzkRNlQGTXxe8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-setup-6.7.0.tar.xz", + "hash": "sha256-3I+l3XRXBW3hwtAEPw83zTBhAg/s0hmMq/83i9XJVx4=" }, "plasma-systemmonitor": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-systemmonitor-6.6.5.tar.xz", - "hash": "sha256-tuv3web3pCyRoLURlx/WcEHU2bYX7cOk/AsIr0oOx48=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-systemmonitor-6.7.0.tar.xz", + "hash": "sha256-9lthyXWIbtxXSZVnAKWkxAWeeRXEl4aFeI/oGKFxS0I=" }, "plasma-thunderbolt": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-thunderbolt-6.6.5.tar.xz", - "hash": "sha256-VuOigzCWJ5w6nsHbtLU6X6S8NrNWnj9+wZHwAvQL9x8=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-thunderbolt-6.7.0.tar.xz", + "hash": "sha256-Pepo91aAHJVHM2ykFVJnLDaTCRwpu/iWjuAf8pKHk6A=" }, "plasma-vault": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-vault-6.6.5.tar.xz", - "hash": "sha256-aKTjzRYNsVZGiCxaQK7Dqj63CXAaO0J00Ctjk/6rsmg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-vault-6.7.0.tar.xz", + "hash": "sha256-i9cLPTeHidOWpm5pOoCd1rIe3EgWYnWTL399AgdPzhw=" }, "plasma-welcome": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-welcome-6.6.5.tar.xz", - "hash": "sha256-vJQn1znNyLp/Sf5i0CpxY1Gnct8bK2lsbB8IaVxBJqI=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-welcome-6.7.0.tar.xz", + "hash": "sha256-SD8WkxtswsVmaPVCBBjnsvja1XarqgG8dVRsE2HyGQM=" }, "plasma-workspace": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-workspace-6.6.5.tar.xz", - "hash": "sha256-ZNdTyty5zeasCe7t9rAuxczfvQFyLF6fJTP9CZOw2FQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-workspace-6.7.0.tar.xz", + "hash": "sha256-mn8qBOikS/JNpNKUu6JwmEoJDvF6CCzR6yXLgYJlHTw=" }, "plasma-workspace-wallpapers": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma-workspace-wallpapers-6.6.5.tar.xz", - "hash": "sha256-SgIdvadh2nqvcZLo0DiqHyMFpXalfyOE9UvI7ZBzFBg=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma-workspace-wallpapers-6.7.0.tar.xz", + "hash": "sha256-DpIiDArgt8QmROvtb+FZ+wCXqJLmQMsSQgR8kpkx6go=" }, "plasma5support": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plasma5support-6.6.5.tar.xz", - "hash": "sha256-X0Vofi0oHN/AZmoK13et/Lu7JTQoTKZFDTqn1wC592M=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plasma5support-6.7.0.tar.xz", + "hash": "sha256-5g4eR6Pe6TUYZH1mOTwh4kBvd3np6eQ4LXzqaM67+3s=" }, "plymouth-kcm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/plymouth-kcm-6.6.5.tar.xz", - "hash": "sha256-eUbJGS4+/JCLtHH+ZCSHgNyBQk2Fs3N60q9o+l5Br6o=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/plymouth-kcm-6.7.0.tar.xz", + "hash": "sha256-KrVY7wsm/U4C+iZ4ZBL28be8UHZAe7nuR6fByffgJUc=" }, "polkit-kde-agent-1": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/polkit-kde-agent-1-6.6.5.tar.xz", - "hash": "sha256-kZkLnNE/IFqZY/iP5gWUK56LbunpEDQxIWv1EZRM4Sc=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/polkit-kde-agent-1-6.7.0.tar.xz", + "hash": "sha256-Dyf/KqNhBBhiDEKAS5w9wi9peeXAOCL5OXnUT77R2r8=" }, "powerdevil": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/powerdevil-6.6.5.tar.xz", - "hash": "sha256-sSX2TnPMjc+ePn4/FU9P67RAZCZZfK1uu+jEgzLjXns=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/powerdevil-6.7.0.tar.xz", + "hash": "sha256-djXv/9UD542SvMAwM9VoHlFXfskrxtpy8qsoKLsKNNs=" }, "print-manager": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/print-manager-6.6.5.tar.xz", - "hash": "sha256-ZeHm9VlBGZXGhRb0XF57f8JCv6K2hxHmIEsxmYGjrm0=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/print-manager-6.7.0.tar.xz", + "hash": "sha256-v3tqkw7cG4Ped65YV0O9pOGjpYKt5tICovuiYWrcpbM=" }, "qqc2-breeze-style": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/qqc2-breeze-style-6.6.5.tar.xz", - "hash": "sha256-jSeflmkDIZchlB6p9BaBYw3BT6RXadnGcsV0k/bJlgM=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/qqc2-breeze-style-6.7.0.tar.xz", + "hash": "sha256-gfsPQ/4VwrzRxi50LKuoTWCk65OAwLzsRHtbdyjin7s=" }, "sddm-kcm": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/sddm-kcm-6.6.5.tar.xz", - "hash": "sha256-RJgRgj8faK3ZZC6uISfiqh8HYc+M48N9t8J+YW6L/9g=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/sddm-kcm-6.7.0.tar.xz", + "hash": "sha256-A7Heo6c4BIoGRjO57bgCcWAE9GMLP2p/Bo/QdNcZ700=" }, "spacebar": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/spacebar-6.6.5.tar.xz", - "hash": "sha256-wULqeA4Qp0QjK2dKAlFvJ4KJ2SBON3VxJgmNKBio4fQ=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/spacebar-6.7.0.tar.xz", + "hash": "sha256-XwtcSkDFHaPKxaXWg6uDq/2KNX5FkXYmjs7RWPAxSIU=" }, "spectacle": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/spectacle-6.6.5.tar.xz", - "hash": "sha256-o333cxpryJvCOsCK0fmVzp8e+zMPPrrZv5Jtym67X8c=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/spectacle-6.7.0.tar.xz", + "hash": "sha256-Sw5J3iGyGP9fEwLQzebgZyC8RSQ5bIUA02zWRMnVDGQ=" }, "systemsettings": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/systemsettings-6.6.5.tar.xz", - "hash": "sha256-YTNO/2RWetIJ4nn2DG0asTtnD5owD96UgP6TWWIyqYY=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/systemsettings-6.7.0.tar.xz", + "hash": "sha256-WfJKRQRrZp0awW+A7ngyPrbxchMKusMcbWXPYfBfp58=" + }, + "union": { + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/union-6.7.0.tar.xz", + "hash": "sha256-0JJd9wpnQiRuadl3btE508UuPDzNtoaT66vKLE6M9Fk=" }, "wacomtablet": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/wacomtablet-6.6.5.tar.xz", - "hash": "sha256-RLZfANmwMjbTm64P5BPZ9TE32cuWrpabRxDg+xFKDx4=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/wacomtablet-6.7.0.tar.xz", + "hash": "sha256-4lBGcIom7JKbkTYcPYZAgu3m/toDgrcSntOKl1SiwKw=" }, "xdg-desktop-portal-kde": { - "version": "6.6.5", - "url": "mirror://kde/stable/plasma/6.6.5/xdg-desktop-portal-kde-6.6.5.tar.xz", - "hash": "sha256-IdaZWFKUBk/OfHTe5oXCCT73PdCVeXkT5o7xR4CFayc=" + "version": "6.7.0", + "url": "mirror://kde/stable/plasma/6.7.0/xdg-desktop-portal-kde-6.7.0.tar.xz", + "hash": "sha256-9a/Ab5SLc7KgED2e5uV3RKmISj8uCBCAd3bsS/cQKto=" } } \ No newline at end of file diff --git a/pkgs/kde/misc/cxx-rust-cssparser/default.nix b/pkgs/kde/misc/cxx-rust-cssparser/default.nix new file mode 100644 index 000000000000..17b0cf8a5f0e --- /dev/null +++ b/pkgs/kde/misc/cxx-rust-cssparser/default.nix @@ -0,0 +1,55 @@ +{ + lib, + mkKdeDerivation, + fetchFromGitLab, + rustPlatform, + rustc, + cargo, + cxx-rs, + corrosion, +}: + +mkKdeDerivation rec { + pname = "cxx-rust-cssparser"; + version = "1.0.0"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "libraries"; + repo = "cxx-rust-cssparser"; + tag = "v${version}"; + hash = "sha256-zYY9GmQb/Qbbu8AhOGHfrrQ563cIrnx9KMGkdledURw="; + }; + + extraNativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustc + cargo + cxx-rs + ]; + + extraBuildInputs = [ + corrosion + ]; + + cargoRoot = "rust"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit + pname + version + src + cargoRoot + ; + hash = "sha256-CdOvP7VxS2JMD3MlRtc6QNUCGiVMGxiKayLG6vn6n+8="; + }; + + dontWrapQtApps = true; + + meta.license = with lib.licenses; [ + bsd2 + cc0 + lgpl2Only + lgpl3Only + ]; +} diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index 18a9a67a9162..56b463830ad5 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -41,6 +41,7 @@ oxygen-sounds = callPackage ./oxygen-sounds { }; plasma-activities = callPackage ./plasma-activities { }; plasma-activities-stats = callPackage ./plasma-activities-stats { }; + plasma-bigscreen = callPackage ./plasma-bigscreen { }; plasma-browser-integration = callPackage ./plasma-browser-integration { }; plasma-desktop = callPackage ./plasma-desktop { }; plasma-dialer = callPackage ./plasma-dialer { }; @@ -71,6 +72,7 @@ spacebar = callPackage ./spacebar { }; spectacle = callPackage ./spectacle { }; systemsettings = callPackage ./systemsettings { }; + union = callPackage ./union { }; wacomtablet = callPackage ./wacomtablet { }; xdg-desktop-portal-kde = callPackage ./xdg-desktop-portal-kde { }; } diff --git a/pkgs/kde/plasma/kdeplasma-addons/default.nix b/pkgs/kde/plasma/kdeplasma-addons/default.nix index e23fdacdf158..1e33f1fcdc5b 100644 --- a/pkgs/kde/plasma/kdeplasma-addons/default.nix +++ b/pkgs/kde/plasma/kdeplasma-addons/default.nix @@ -1,9 +1,37 @@ { mkKdeDerivation, + sources, + rustPlatform, + rustc, + cargo, + pkg-config, + corrosion, qtwebengine, + hidapi, }: -mkKdeDerivation { +mkKdeDerivation rec { pname = "kdeplasma-addons"; - extraBuildInputs = [ qtwebengine ]; + inherit (sources.${pname}) version; + + cargoRoot = "kdeds/kameleon/qmk/kameleon-qmk-helper"; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit pname version cargoRoot; + src = sources.${pname}; + hash = "sha256-2gtz9D05VloEKkQGF9/0fuMrFUtp2NpE/mcEd7D3Gkc="; + }; + + extraNativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustc + cargo + pkg-config + ]; + + extraBuildInputs = [ + corrosion + qtwebengine + hidapi + ]; } diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index fcf367a9ffdd..d696d3c095bf 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -1,8 +1,8 @@ diff --git a/kcms/audio_information/kcm_audio_information.json b/kcms/audio_information/kcm_audio_information.json -index 5648bb73..28db7ffb 100644 +index baa7fbea..24b3c30b 100644 --- a/kcms/audio_information/kcm_audio_information.json +++ b/kcms/audio_information/kcm_audio_information.json -@@ -82,7 +82,7 @@ +@@ -90,7 +90,7 @@ "Name[zh_CN]": "音频", "Name[zh_TW]": "音訊" }, @@ -25,10 +25,10 @@ index adb196fd..9d6c8675 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/block_devices/kcm_block_devices.json b/kcms/block_devices/kcm_block_devices.json -index 5d864d49..8ea55707 100644 +index 37912e43..1adfadb3 100644 --- a/kcms/block_devices/kcm_block_devices.json +++ b/kcms/block_devices/kcm_block_devices.json -@@ -82,7 +82,7 @@ +@@ -90,7 +90,7 @@ "Name[zh_CN]": "块设备", "Name[zh_TW]": "區塊裝置" }, @@ -51,10 +51,10 @@ index 2de923f3..6b14f7fb 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/cpu/kcm_cpu.json b/kcms/cpu/kcm_cpu.json -index 7541b258..3ba7f289 100644 +index 05b3b039..e769cdba 100644 --- a/kcms/cpu/kcm_cpu.json +++ b/kcms/cpu/kcm_cpu.json -@@ -102,7 +102,7 @@ +@@ -104,7 +104,7 @@ "Name[zh_CN]": "CPU", "Name[zh_TW]": "CPU" }, @@ -90,10 +90,10 @@ index da803598..4e24eaaf 100755 printf "%s\n\n" "$data" done diff --git a/kcms/edid/kcm_edid.json b/kcms/edid/kcm_edid.json -index 4639da41..1afb5522 100644 +index cf0f6cfe..2e6650a1 100644 --- a/kcms/edid/kcm_edid.json +++ b/kcms/edid/kcm_edid.json -@@ -74,7 +74,7 @@ +@@ -82,7 +82,7 @@ "Name[zh_CN]": "EDID", "Name[zh_TW]": "EDID" }, @@ -116,10 +116,10 @@ index 9f04e7fd..8ef37d2c 100644 [[nodiscard]] CommandOutputContext *outputContext() const { diff --git a/kcms/egl/kcm_egl.json b/kcms/egl/kcm_egl.json -index a5a21cd6..cddef596 100644 +index 8af87ff5..42382afe 100644 --- a/kcms/egl/kcm_egl.json +++ b/kcms/egl/kcm_egl.json -@@ -102,7 +102,7 @@ +@@ -104,7 +104,7 @@ "Name[zh_CN]": "OpenGL (EGL)", "Name[zh_TW]": "OpenGL (EGL)" }, @@ -155,10 +155,10 @@ index eab20e0f..5a0d2499 100644 {executable}, Qt::TextFormat::RichText, diff --git a/kcms/glx/kcm_glx.json b/kcms/glx/kcm_glx.json -index 900d8d6a..c1bef34f 100644 +index b3525b4f..e2e237a7 100644 --- a/kcms/glx/kcm_glx.json +++ b/kcms/glx/kcm_glx.json -@@ -101,7 +101,7 @@ +@@ -103,7 +103,7 @@ "Name[zh_CN]": "OpenGL (GLX)", "Name[zh_TW]": "OpenGL (GLX)" }, @@ -197,10 +197,10 @@ index 2c009acd..f6c1c8e5 100644 KAuth::ActionReply DMIDecodeHelper::memoryinformation(const QVariantMap &args) diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -index d173229d..71815467 100644 +index d3a071a5..43cc1c38 100644 --- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in +++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -@@ -95,7 +95,7 @@ +@@ -99,7 +99,7 @@ "Name[zh_CN]": "窗口管理器", "Name[zh_TW]": "視窗管理員" }, @@ -223,10 +223,10 @@ index ddb55b5c..8dc6b668 100644 parent); } diff --git a/kcms/memory/kcm_memory.json b/kcms/memory/kcm_memory.json -index 87ad4a4c..e3f07e81 100644 +index a0e573e1..a1acfc7e 100644 --- a/kcms/memory/kcm_memory.json +++ b/kcms/memory/kcm_memory.json -@@ -134,7 +134,7 @@ +@@ -139,7 +139,7 @@ "Name[zh_CN]": "内存", "Name[zh_TW]": "記憶體" }, @@ -236,10 +236,10 @@ index 87ad4a4c..e3f07e81 100644 "X-KDE-Keywords": "Memory,RAM,dmidecode", "X-KDE-Keywords[ar]": "Memory,RAM,dmidecode,رام,ذاكرة,ذاكرة حية", diff --git a/kcms/network/kcm_network.json b/kcms/network/kcm_network.json -index 4ab2e0f1..559baf6f 100644 +index 55df7791..f932c500 100644 --- a/kcms/network/kcm_network.json +++ b/kcms/network/kcm_network.json -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@ "Name[zh_CN]": "网络接口", "Name[zh_TW]": "網路介面" }, @@ -262,10 +262,10 @@ index a49284d3..77818fe2 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/opencl/kcm_opencl.json b/kcms/opencl/kcm_opencl.json -index e63b60a9..93f1f484 100644 +index 73d1e8c9..5688b964 100644 --- a/kcms/opencl/kcm_opencl.json +++ b/kcms/opencl/kcm_opencl.json -@@ -92,7 +92,7 @@ +@@ -96,7 +96,7 @@ "Name[zh_CN]": "OpenCL", "Name[zh_TW]": "OpenCL" }, @@ -301,10 +301,10 @@ index 36d82ef8..16ce2703 100644 endif() diff --git a/kcms/sensors/kcm_sensors.json b/kcms/sensors/kcm_sensors.json -index 4f9959dc..1cba9e5f 100644 +index d67d8435..96f04ace 100644 --- a/kcms/sensors/kcm_sensors.json +++ b/kcms/sensors/kcm_sensors.json -@@ -66,7 +66,7 @@ +@@ -76,7 +76,7 @@ "Name[zh_CN]": "传感器", "Name[zh_TW]": "感測器" }, @@ -314,31 +314,34 @@ index 4f9959dc..1cba9e5f 100644 "X-KDE-Keywords": "lm_sensors,sensors,temp,temperature,volt,voltage,sensors,fan,fan speed,monitoring,amp,amps,current,power", "X-KDE-Keywords[ar]": "مستشعرات lm,مستشعرات,درجة الحرارة,درجة الحرارة,فولت,جهد,مستشعرات,مروحة,سرعة المروحة,مراقبة,أمبير,أمبير,تيار,طاقة", diff --git a/kcms/sensors/main.cpp b/kcms/sensors/main.cpp -index 8dae9f8f..ee70f381 100644 +index 276280db..aa8856b6 100644 --- a/kcms/sensors/main.cpp +++ b/kcms/sensors/main.cpp -@@ -18,7 +18,7 @@ public: - explicit KCMSensors(QObject *parent, const KPluginMetaData &data) +@@ -21,9 +21,9 @@ public: : KQuickConfigModule(parent, data) { -- m_outputContext = new CommandOutputContext(u"sensors"_s, {}, parent); -+ m_outputContext = new CommandOutputContext(u"@sensors@"_s, {}, parent); + if (QLocale().measurementSystem() == QLocale::ImperialUSSystem) { +- m_outputContext = new CommandOutputContext(u"sensors"_s, {u"-f"_s}, parent); ++ m_outputContext = new CommandOutputContext(u"@sensors@"_s, {u"-f"_s}, parent); + } else { +- m_outputContext = new CommandOutputContext(u"sensors"_s, {}, parent); ++ m_outputContext = new CommandOutputContext(u"@sensors@"_s, {}, parent); + } m_outputContext->setAutoRefreshMs(1000); } - CommandOutputContext *outputContext() const diff --git a/kcms/vulkan/kcm_vulkan.json b/kcms/vulkan/kcm_vulkan.json -index ca4cf9e0..4f6af805 100644 +index 3e6df405..ae08bc95 100644 --- a/kcms/vulkan/kcm_vulkan.json +++ b/kcms/vulkan/kcm_vulkan.json -@@ -100,7 +100,7 @@ +@@ -102,7 +102,7 @@ "Name[zh_CN]": "Vulkan", "Name[zh_TW]": "Vulkan" }, - "TryExec": "vulkaninfo", + "TryExec": "@vulkaninfo@", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag", - "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag", + "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag,vulkaninfo", + "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag,vulkaninfo", diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp index 5665d9d2..008f1bf0 100644 --- a/kcms/vulkan/main.cpp @@ -353,10 +356,10 @@ index 5665d9d2..008f1bf0 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/wayland/kcm_wayland.json b/kcms/wayland/kcm_wayland.json -index 7ca1dcb7..e814570b 100644 +index 3a1a9ad1..572af87e 100644 --- a/kcms/wayland/kcm_wayland.json +++ b/kcms/wayland/kcm_wayland.json -@@ -106,7 +106,7 @@ +@@ -108,7 +108,7 @@ "Name[zh_CN]": "Wayland", "Name[zh_TW]": "Wayland" }, @@ -379,10 +382,10 @@ index 3a4825c7..4633927b 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json -index 5b12997a..9debc887 100644 +index b22ecf03..e9240ce7 100644 --- a/kcms/xserver/kcm_xserver.json +++ b/kcms/xserver/kcm_xserver.json -@@ -146,7 +146,7 @@ +@@ -147,7 +147,7 @@ "Name[zh_CN]": "X 服务器", "Name[zh_TW]": "X 伺服器" }, diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 1f477f7f9aea..5f41a9783974 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -6,6 +6,7 @@ pam, pkg-config, qtwayland, + kirigami-addons, freerdp, }: mkKdeDerivation { @@ -21,6 +22,8 @@ mkKdeDerivation { extraBuildInputs = [ qtwayland + kirigami-addons + freerdp pam ]; diff --git a/pkgs/kde/plasma/kscreen/default.nix b/pkgs/kde/plasma/kscreen/default.nix index 2f91e980bbfa..1d543af28794 100644 --- a/pkgs/kde/plasma/kscreen/default.nix +++ b/pkgs/kde/plasma/kscreen/default.nix @@ -3,8 +3,10 @@ pkg-config, qtsensors, qtwayland, - dbus, + kitemmodels, + plasma5support, wayland-protocols, + dbus, }: mkKdeDerivation { pname = "kscreen"; @@ -14,6 +16,10 @@ mkKdeDerivation { extraBuildInputs = [ qtsensors qtwayland + + kitemmodels + plasma5support + wayland-protocols ]; diff --git a/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch b/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch deleted file mode 100644 index e6408605aa43..000000000000 --- a/pkgs/kde/plasma/kwin/0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 232e480ab1303f37d37d295b57fdcbb6b6648bca Mon Sep 17 00:00:00 2001 -From: Alois Wohlschlager -Date: Sun, 7 Aug 2022 16:12:31 +0200 -Subject: [PATCH] Lower CAP_SYS_NICE from the ambient set - -The capabilities wrapper raises CAP_SYS_NICE into the ambient set so it -is inherited by the wrapped program. However, we don't want it to leak -into the entire desktop environment. - -Lower the capability again at startup so that the kernel will clear it -on exec. ---- - src/main_wayland.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/main_wayland.cpp b/src/main_wayland.cpp -index 1720e14e7..f2bb446b0 100644 ---- a/src/main_wayland.cpp -+++ b/src/main_wayland.cpp -@@ -39,7 +39,9 @@ - #include - #include - -+#include - #include -+#include - #include - - #include -@@ -285,6 +287,7 @@ static QString automaticBackendSelection() - - int main(int argc, char *argv[]) - { -+ prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, CAP_SYS_NICE, 0, 0); - KWin::Application::setupMalloc(); - KWin::Application::setupLocalizedString(); - KWin::gainRealTime(); --- -2.37.1 - diff --git a/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch index d0be721b044c..845106916b76 100644 --- a/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch +++ b/pkgs/kde/plasma/kwin/0003-plugins-qpa-allow-using-nixos-wrapper.patch @@ -1,26 +1,13 @@ -From 8d49f5ef8692c352a62f4f8b1bc68e6e210bbee6 Mon Sep 17 00:00:00 2001 -From: Yaroslav Bolyukin -Date: Wed, 23 Dec 2020 18:02:14 +0300 -Subject: [PATCH 3/3] plugins/qpa: allow using nixos wrapper - -Signed-off-by: Yaroslav Bolyukin ---- - src/plugins/qpa/main.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/src/plugins/qpa/main.cpp b/src/plugins/qpa/main.cpp -index efd236b..a69c046 100644 +index c26092700a..2aa3e21e7d 100644 --- a/src/plugins/qpa/main.cpp +++ b/src/plugins/qpa/main.cpp @@ -23,7 +23,7 @@ public: - + QPlatformIntegration *KWinIntegrationPlugin::create(const QString &system, const QStringList ¶mList) { -- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { -+ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1String("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { +- if (!QCoreApplication::applicationFilePath().endsWith(QLatin1StringView("kwin_wayland")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { ++ if (!QCoreApplication::applicationFilePath().endsWith(QLatin1StringView("kwin_wayland")) && !QCoreApplication::applicationFilePath().endsWith(QLatin1String(".kwin_wayland-wrapped")) && !qEnvironmentVariableIsSet("KWIN_FORCE_OWN_QPA")) { // Not KWin return nullptr; } --- -2.29.2 - diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index 140b98923d03..4e6e471ddc42 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -18,7 +18,6 @@ pipewire, krunner, python3, - fetchpatch, }: mkKdeDerivation { pname = "kwin"; @@ -26,7 +25,6 @@ mkKdeDerivation { patches = [ ./0003-plugins-qpa-allow-using-nixos-wrapper.patch ./0001-NixOS-Unwrap-executable-name-for-.desktop-search.patch - ./0001-Lower-CAP_SYS_NICE-from-the-ambient-set.patch ]; postPatch = '' diff --git a/pkgs/kde/plasma/plasma-bigscreen/default.nix b/pkgs/kde/plasma/plasma-bigscreen/default.nix new file mode 100644 index 000000000000..311a6e33a498 --- /dev/null +++ b/pkgs/kde/plasma/plasma-bigscreen/default.nix @@ -0,0 +1,39 @@ +{ + mkKdeDerivation, + plasma-workspace, + pkg-config, + qtwebengine, + libcec, + sdl3, +}: + +mkKdeDerivation { + pname = "plasma-bigscreen"; + + postPatch = '' + substituteInPlace bin/plasma-bigscreen-wayland.in \ + --replace-fail @KDE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + + substituteInPlace bin/plasma-bigscreen-wayland.desktop.cmake \ + --replace-fail @CMAKE_INSTALL_FULL_LIBEXECDIR@ "${plasma-workspace}/libexec" + ''; + + extraCmakeFlags = [ + "-DQT_FIND_PRIVATE_MODULES=ON" + ]; + + extraNativeBuildInputs = [ + pkg-config + ]; + + extraBuildInputs = [ + qtwebengine + + libcec + sdl3 + ]; + + dontQmlLint = true; + + passthru.providedSessions = [ "plasma-bigscreen-wayland" ]; +} diff --git a/pkgs/kde/plasma/plasma-desktop/default.nix b/pkgs/kde/plasma/plasma-desktop/default.nix index 30de7c407e2d..e9fa2ec669f4 100644 --- a/pkgs/kde/plasma/plasma-desktop/default.nix +++ b/pkgs/kde/plasma/plasma-desktop/default.nix @@ -6,7 +6,6 @@ glib, gsettings-desktop-schemas, replaceVars, - util-linux, pkg-config, qtsvg, qtwayland, @@ -35,13 +34,9 @@ mkKdeDerivation { pname = "plasma-desktop"; patches = [ - (replaceVars ./hwclock-path.patch { - hwclock = "${lib.getBin util-linux}/bin/hwclock"; - }) (replaceVars ./kcm-access.patch { gsettings = "${gsettings-wrapper}/bin/gsettings"; }) - ./tzdir.patch ./no-discover-shortcut.patch (replaceVars ./wallpaper-paths.patch { wallpapers = "${lib.getBin breeze}/share/wallpapers"; diff --git a/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch b/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch deleted file mode 100644 index 4c0891db97a6..000000000000 --- a/pkgs/kde/plasma/plasma-desktop/hwclock-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp -+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -@@ -48,10 +48,6 @@ - #include - #endif - --// We cannot rely on the $PATH environment variable, because D-Bus activation --// clears it. So we have to use a reasonable default. --static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin"); -- - int ClockHelper::ntp(const QStringList &ntpServers, bool ntpEnabled) - { - int ret = 0; -@@ -227,7 +223,7 @@ int ClockHelper::tzreset() - - void ClockHelper::toHwclock() - { -- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':'))); -+ QString hwclock = QLatin1String("@hwclock@"); - if (!hwclock.isEmpty()) { - KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); - } diff --git a/pkgs/kde/plasma/plasma-desktop/tzdir.patch b/pkgs/kde/plasma/plasma-desktop/tzdir.patch deleted file mode 100644 index 97504b330fed..000000000000 --- a/pkgs/kde/plasma/plasma-desktop/tzdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -=================================================================== ---- plasma-desktop-5.8.5.orig/kcms/dateandtime/helper.cpp -+++ plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp -@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& sele - - val = selectedzone; - #else -- QString tz = "/usr/share/zoneinfo/" + selectedzone; -+ QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR")); -+ QString tz = tzdir + "/" + selectedzone; -+ if (tzdir.isEmpty()) { -+ // Standard Linux path -+ tz = "/usr/share/zoneinfo/" + selectedzone; -+ } - - if (QFile::exists(tz)) { // make sure the new TZ really exists - QFile::remove(QStringLiteral("/etc/localtime")); diff --git a/pkgs/kde/plasma/plasma-keyboard/default.nix b/pkgs/kde/plasma/plasma-keyboard/default.nix index be510d3ef01d..06f738ae1074 100644 --- a/pkgs/kde/plasma/plasma-keyboard/default.nix +++ b/pkgs/kde/plasma/plasma-keyboard/default.nix @@ -2,6 +2,7 @@ mkKdeDerivation, pkg-config, qtvirtualkeyboard, + libplasma, wayland-protocols, }: mkKdeDerivation { @@ -13,6 +14,9 @@ mkKdeDerivation { extraBuildInputs = [ qtvirtualkeyboard + + libplasma + wayland-protocols ]; diff --git a/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch b/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch deleted file mode 100644 index 708a9f6c11ce..000000000000 --- a/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/common/ConfigReader.cpp b/src/common/ConfigReader.cpp -index bb44514..abbdf57 100644 ---- a/src/common/ConfigReader.cpp -+++ b/src/common/ConfigReader.cpp -@@ -184,9 +184,6 @@ void ConfigBase::load() - - files << m_path; - -- if (latestModificationTime <= m_fileModificationTime) { -- return; -- } - m_fileModificationTime = latestModificationTime; - - for (const QString &filepath : std::as_const(files)) { diff --git a/pkgs/kde/plasma/plasma-login-manager/default.nix b/pkgs/kde/plasma/plasma-login-manager/default.nix index 964c988368fd..47ebbef47cd7 100644 --- a/pkgs/kde/plasma/plasma-login-manager/default.nix +++ b/pkgs/kde/plasma/plasma-login-manager/default.nix @@ -11,7 +11,6 @@ mkKdeDerivation { pname = "plasma-login-manager"; patches = [ - ./config-mtime.patch ./config-path.patch (replaceVars ./kwin-path.patch { diff --git a/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch index bf2eb6047118..360884d1e30b 100644 --- a/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch +++ b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch @@ -1,10 +1,11 @@ --- a/src/frontend/startkde/plasma-login-kwin_wayland.service.in +++ b/src/frontend/startkde/plasma-login-kwin_wayland.service.in -@@ -3,6 +3,6 @@ Description=KDE Window Manager (Login Manager Version) +@@ -3,7 +3,7 @@ Description=KDE Window Manager (Login Manager Version) PartOf=graphical-session.target [Service] -ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/kwin_wayland --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1 -+ExecStart=@kwin_wayland@ --no-lockscreen --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1 ++ExecStart=@kwin_wayland@ --no-lockscreen --no-global-shortcuts --no-kactivities --inputmethod plasma-keyboard --locale1 + SuccessExitStatus=15 BusName=org.kde.KWin Slice=session.slice diff --git a/pkgs/kde/plasma/plasma-nm/default.nix b/pkgs/kde/plasma/plasma-nm/default.nix index edba027fc4b0..f260e12d8087 100644 --- a/pkgs/kde/plasma/plasma-nm/default.nix +++ b/pkgs/kde/plasma/plasma-nm/default.nix @@ -3,6 +3,7 @@ mkKdeDerivation, replaceVars, pkg-config, + qtkeychain, qtwebengine, kirigami-addons, mobile-broadband-provider-info, @@ -22,6 +23,7 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ + qtkeychain qtwebengine mobile-broadband-provider-info openconnect diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch index a39328027d6d..4c64b37503fc 100644 --- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch +++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch @@ -12,10 +12,10 @@ index f425eb3..5b8cd43 100644 } // namespace PlasmaVault diff --git a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp -index b992f6f..eb828dd 100644 +index 8636e4e..4f4ba0d 100644 --- a/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp +++ b/kded/engine/backends/gocryptfs/gocryptfsbackend.cpp -@@ -202,7 +202,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const +@@ -204,7 +204,7 @@ QProcess *GocryptfsBackend::gocryptfs(const QStringList &arguments) const auto config = KSharedConfig::openConfig(PLASMAVAULT_CONFIG_FILE); KConfigGroup backendConfig(config, "GocryptfsBackend"); @@ -25,19 +25,19 @@ index b992f6f..eb828dd 100644 QString GocryptfsBackend::getConfigFilePath(const Device &device) const diff --git a/kded/engine/vault.cpp b/kded/engine/vault.cpp -index c101079..67c8a83 100644 +index f488d00..6b76565 100644 --- a/kded/engine/vault.cpp +++ b/kded/engine/vault.cpp -@@ -485,7 +485,7 @@ FutureResult<> Vault::close() +@@ -480,7 +480,7 @@ FutureResult<> Vault::close() } else { // We want to check whether there is an application // that is accessing the vault -- AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this] { -+ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this] { - d->updateMessage(i18n("Unable to lock the vault because an application is using it")); - }) | onSuccess([this](const QString &result) { - // based on ksolidnotify.cpp -@@ -538,7 +538,7 @@ FutureResult<> Vault::forceClose() +- AsynQt::Process::getOutput(QStringLiteral("lsof"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this, result] { ++ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), {QStringLiteral("-t"), mountPoint().data()}) | cast() | onError([this, result] { + // no application seems to be accessing the vault, bubble + // through the original unmount error + d->updateMessage(result.error().message()); +@@ -534,7 +534,7 @@ FutureResult<> Vault::forceClose() using namespace AsynQt::operators; AsynQt::await( diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 0a02c8e424cd..d7a60c785318 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -2,6 +2,7 @@ lib, mkKdeDerivation, replaceVars, + flatpak, fontconfig, libxtst, libxft, @@ -82,6 +83,7 @@ mkKdeDerivation { libxtst libxft + flatpak gpsd ]; diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index df8c5981dcfb..30c4d995220f 100644 --- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch +++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch @@ -1,8 +1,8 @@ -diff --git a/applets/devicenotifier/devicemessagemonitor_p.cpp b/applets/devicenotifier/devicemessagemonitor_p.cpp -index 173fec78c1..0519424f71 100644 ---- a/applets/devicenotifier/devicemessagemonitor_p.cpp -+++ b/applets/devicenotifier/devicemessagemonitor_p.cpp -@@ -118,7 +118,7 @@ void DeviceMessageMonitor::queryBlockingApps(const QString &devicePath) +diff --git a/applets/devicenotifier/messageinfo.cpp b/applets/devicenotifier/messageinfo.cpp +index e5c987879b..d26287a906 100644 +--- a/applets/devicenotifier/messageinfo.cpp ++++ b/applets/devicenotifier/messageinfo.cpp +@@ -64,7 +64,7 @@ void MessageInfo::queryBlockingApps(const QString &devicePath) Q_EMIT blockingAppsReady(blockApps); p->deleteLater(); }); @@ -25,10 +25,10 @@ index e27e21a7bd..abbf7f32e1 100644 p.write(input); p.closeWriteChannel(); diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index da28f13837..4af78b7850 100644 +index a150527de6..4798518162 100644 --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp -@@ -137,7 +137,7 @@ void KFonts::save() +@@ -151,7 +151,7 @@ void KFonts::save() if (fontsAASettings()->forceFontDPI() == 0 && forceFontDPIChanged && KWindowSystem::isPlatformX11()) { QProcess proc; proc.setProcessChannelMode(QProcess::ForwardedChannels); @@ -38,10 +38,10 @@ index da28f13837..4af78b7850 100644 proc.write("Xft.dpi\n"); proc.closeWriteChannel(); diff --git a/kcms/kfontinst/kcmfontinst/FcQuery.cpp b/kcms/kfontinst/kcmfontinst/FcQuery.cpp -index e4d1ad4311..d45bdfad98 100644 +index 32ba97a4d6..c26f45f2e0 100644 --- a/kcms/kfontinst/kcmfontinst/FcQuery.cpp +++ b/kcms/kfontinst/kcmfontinst/FcQuery.cpp -@@ -46,7 +46,7 @@ void CFcQuery::run(const QString &query) +@@ -44,7 +44,7 @@ void CFcQuery::run(const QString &query) connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)), SLOT(procExited())); connect(m_proc, &QProcess::readyReadStandardOutput, this, &CFcQuery::data); @@ -51,7 +51,7 @@ index e4d1ad4311..d45bdfad98 100644 void CFcQuery::procExited() diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index 53f77d0a18..680e81b6e4 100644 +index 0a3fb44698..d44b63350b 100644 --- a/kcms/krdb/krdb.cpp +++ b/kcms/krdb/krdb.cpp @@ -425,7 +425,7 @@ void runRdb(unsigned int flags) @@ -107,7 +107,7 @@ index 7218628ce9..9126475ea4 100644 +ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1 Slice=session.slice diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index b8474dd34f..7d0616e116 100644 +index f9104619bf..af9fc09a67 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber) @@ -119,7 +119,7 @@ index b8474dd34f..7d0616e116 100644 } QStringList allServices(const QLatin1String &prefix) -@@ -508,7 +508,7 @@ QProcess *setupKSplash() +@@ -552,7 +552,7 @@ QProcess *setupKSplash() if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; p->setProcessChannelMode(QProcess::ForwardedChannels); diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index 2c12c45cddfd..ae2b56a004f2 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -7,10 +7,6 @@ mkKdeDerivation { pname = "powerdevil"; - patches = [ - # https://invent.kde.org/plasma/powerdevil/-/merge_requests/601 - ./rb-batterymonitor.patch - ]; extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ ddcutil diff --git a/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch b/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch deleted file mode 100644 index b5808138734f..000000000000 --- a/pkgs/kde/plasma/powerdevil/rb-batterymonitor.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/applets/batterymonitor/CMakeLists.txt b/applets/batterymonitor/CMakeLists.txt -index 28e52d26..3f2bf985 100644 ---- a/applets/batterymonitor/CMakeLists.txt -+++ b/applets/batterymonitor/CMakeLists.txt -@@ -19,3 +19,5 @@ plasma_add_applet(org.kde.plasma.battery - main.xml - GENERATE_APPLET_CLASS - ) -+ -+add_dependencies(org.kde.plasma.battery batterymonitorplugin) diff --git a/pkgs/kde/plasma/print-manager/default.nix b/pkgs/kde/plasma/print-manager/default.nix index dd06f5217637..35409087d6b1 100644 --- a/pkgs/kde/plasma/print-manager/default.nix +++ b/pkgs/kde/plasma/print-manager/default.nix @@ -1,10 +1,14 @@ { mkKdeDerivation, + kdeclarative, cups, }: mkKdeDerivation { pname = "print-manager"; # FIXME: cups-smb? - extraBuildInputs = [ cups ]; + extraBuildInputs = [ + kdeclarative + cups + ]; } diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix index 098bc2394cca..dde9c0d5433a 100644 --- a/pkgs/kde/plasma/spectacle/default.nix +++ b/pkgs/kde/plasma/spectacle/default.nix @@ -1,5 +1,4 @@ { - fetchpatch, mkKdeDerivation, pkg-config, qtwayland, @@ -11,15 +10,6 @@ mkKdeDerivation { pname = "spectacle"; - # Backport the upstream switch from runtime QLibrary loading to direct - # linking so Spectacle OCR can find Tesseract reliably on NixOS. - patches = [ - (fetchpatch { - url = "https://invent.kde.org/graphics/spectacle/-/commit/13b0be099e7abe9bbb17b90e62c2e83afb248db7.patch"; - hash = "sha256-HEgHsuajaF+WVMiRp0YKRmi+/NsIy5s8frwMJRIdDY8="; - }) - ]; - extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ diff --git a/pkgs/kde/plasma/union/default.nix b/pkgs/kde/plasma/union/default.nix new file mode 100644 index 000000000000..b9d29eb91afe --- /dev/null +++ b/pkgs/kde/plasma/union/default.nix @@ -0,0 +1,11 @@ +{ + mkKdeDerivation, + kcoreaddons, +}: +mkKdeDerivation { + pname = "union"; + + extraBuildInputs = [ + kcoreaddons + ]; +}