JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #314371 from K900/plasma-6.1

Browse Source 
Plasma 6.1
This commit is contained in:
K900 2024-06-18 15:36:15 +03:00 committed by GitHub
commit 6d396a4b83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 390 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
maintainers/scripts/kde/collect-metadata.py
View File

@ -27,8 +27,13 @@ import utils
),
default=pathlib.Path(__file__).parent.parent.parent.parent
)
def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path):
metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata)
@click.option(
"--unstable",
default=False,
is_flag=True
)
def main(repo_metadata: pathlib.Path, nixpkgs: pathlib.Path, unstable: bool):
metadata = utils.KDERepoMetadata.from_repo_metadata_checkout(repo_metadata, unstable)
out_dir = nixpkgs / "pkgs/kde/generated"
metadata.write_json(out_dir)

39
maintainers/scripts/kde/utils.py
View File

@ -104,7 +104,7 @@ class KDERepoMetadata:
return project
@classmethod
def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path):
def from_repo_metadata_checkout(cls, repo_metadata: pathlib.Path, unstable=False):
projects = [
Project.from_yaml(metadata_file)
for metadata_file in repo_metadata.glob("projects-invent/**/metadata.yaml")
@ -122,29 +122,32 @@ class KDERepoMetadata:
dep_graph={},
)
dep_specs = ["dependency-data-stable-kf6-qt6"]
dep_graph = collections.defaultdict(set)
for spec in dep_specs:
spec_path = repo_metadata / "dependencies" / spec
for line in spec_path.open():
line = line.strip()
if line.startswith("#"):
continue
if not line:
continue
if unstable:
spec_name = "dependency-data-kf6-qt6"
else:
spec_name = "dependency-data-stable-kf6-qt6"
dependent, dependency = line.split(": ")
spec_path = repo_metadata / "dependencies" / spec_name
for line in spec_path.open():
line = line.strip()
if line.startswith("#"):
continue
if not line:
continue
dependent = self.try_lookup_package(dependent)
if dependent is None:
continue
dependent, dependency = line.split(": ")
dependency = self.try_lookup_package(dependency)
if dependency is None:
continue
dependent = self.try_lookup_package(dependent)
if dependent is None:
continue
dep_graph[dependent].add(dependency)
dependency = self.try_lookup_package(dependency)
if dependency is None:
continue
dep_graph[dependent].add(dependency)
self.dep_graph = dep_graph

1
nixos/modules/services/desktop-managers/plasma6.nix
View File

@ -146,6 +146,7 @@ in {
dolphin-plugins
spectacle
ffmpegthumbs
krdp
];
in
requiredPackages

87
pkgs/kde/generated/dependencies.json
View File

@ -492,7 +492,6 @@
"extra-cmake-modules",
"karchive",
"kcmutils",
"kcodecs",
"kcompletion",
"kconfig",
"kconfigwidgets",
@ -514,7 +513,6 @@
"kwidgetsaddons",
"kwindowsystem",
"kxmlgui",
"plasma-activities",
"sonnet",
"threadweaver"
],
@ -700,6 +698,7 @@
"packagekit-qt",
"phonon",
"plasma-activities",
"selenium-webdriver-at-spi",
"solid"
],
"dolphin-plugins": [
@ -879,6 +878,15 @@
"kxmlgui",
"sonnet"
],
"glaxnimate": [
"extra-cmake-modules",
"karchive",
"kcompletion",
"kconfigwidgets",
"kcoreaddons",
"kcrash",
"kxmlgui"
],
"granatier": [
"extra-cmake-modules",
"kconfig",
@ -1035,8 +1043,11 @@
"kwindowsystem",
"libquotient",
"networkmanager-qt",
"plasma-integration",
"prison",
"qqc2-desktop-style"
"qqc2-breeze-style",
"qqc2-desktop-style",
"selenium-webdriver-at-spi"
],
"juk": [
"kcompletion",
@ -1858,6 +1869,7 @@
"kwidgetsaddons",
"kxmlgui",
"libplasma",
"plasma-desktop",
"plasma-nano",
"plasma-workspace",
"plasma5support",
@ -2056,7 +2068,6 @@
"kdoctools",
"ki18n",
"kio",
"kparts",
"kwidgetsaddons",
"kxmlgui"
],
@ -2975,6 +2986,21 @@
"ktextwidgets",
"kwidgetsaddons"
],
"kmuddy": [
"extra-cmake-modules",
"karchive",
"kcmutils",
"kconfig",
"kcoreaddons",
"ki18n",
"kiconthemes",
"kio",
"knotifications",
"kservice",
"ktextwidgets",
"kwidgetsaddons",
"kxmlgui"
],
"kmymoney": [
"akonadi",
"alkimia",
@ -3182,6 +3208,19 @@
"kxmlgui",
"syntax-highlighting"
],
"kompare": [
"extra-cmake-modules",
"kcodecs",
"kconfig",
"kcoreaddons",
"kdoctools",
"kiconthemes",
"kjobwidgets",
"kparts",
"ktexteditor",
"kwidgetsaddons",
"libkomparediff2"
],
"kongress": [
"extra-cmake-modules",
"kcalendarcore",
@ -3511,6 +3550,14 @@
"kxmlgui",
"plasma-activities"
],
"krdp": [
"extra-cmake-modules",
"kcmutils",
"kconfig",
"kdbusaddons",
"kpipewire",
"kstatusnotifieritem"
],
"krecorder": [
"extra-cmake-modules",
"kconfig",
@ -3671,6 +3718,7 @@
"kconfigwidgets",
"kcoreaddons",
"kcrash",
"kdeclarative",
"kglobalaccel",
"ki18n",
"kidletime",
@ -4349,6 +4397,14 @@
"ki18n",
"kwidgetsaddons"
],
"libkomparediff2": [
"extra-cmake-modules",
"kconfig",
"kcoreaddons",
"ki18n",
"kio",
"kxmlgui"
],
"libksane": [
"extra-cmake-modules",
"ki18n",
@ -4433,6 +4489,7 @@
"kdbusaddons",
"ki18n",
"kirigami",
"kirigami-addons",
"kitemmodels"
],
"lokalize": [
@ -4500,6 +4557,7 @@
"kcolorscheme",
"kconfig",
"kcoreaddons",
"kcrash",
"ki18n",
"kirigami",
"kirigami-addons",
@ -5186,6 +5244,7 @@
"ksvg",
"libplasma",
"plasma-workspace",
"pulseaudio-qt",
"selenium-webdriver-at-spi"
],
"plasma-pass": [
@ -5274,6 +5333,7 @@
"kconfig",
"kcoreaddons",
"kdbusaddons",
"kdeclarative",
"kglobalaccel",
"ki18n",
"kiconthemes",
@ -5405,6 +5465,7 @@
"plasma5support",
"polkit-qt-1",
"prison",
"qcoro",
"qqc2-desktop-style",
"selenium-webdriver-at-spi",
"solid",
@ -5416,8 +5477,14 @@
"extra-cmake-modules",
"kconfig",
"kcoreaddons",
"kguiaddons",
"ki18n",
"libplasma"
"kio",
"knotifications",
"kservice",
"libksysguard",
"libplasma",
"solid"
],
"plasmatube": [
"extra-cmake-modules",
@ -5761,13 +5828,6 @@
"kxmlgui",
"plasma-activities"
],
"smaragd": [
"kconfig",
"kcoreaddons",
"kdecoration",
"ki18n",
"kwidgetsaddons"
],
"smb4k": [
"extra-cmake-modules",
"kauth",
@ -5979,6 +6039,7 @@
"kconfig",
"kcoreaddons",
"kdbusaddons",
"kdeclarative",
"ki18n",
"kio",
"kirigami",
@ -6146,5 +6207,5 @@
"kwindowsystem"
]
},
"version": "525ad8d3"
"version": "558e00a4"
}

19
pkgs/kde/generated/licenses.json
View File

@ -1755,6 +1755,15 @@
"CC0-1.0",
"GPL-2.0-or-later"
],
"krdp": [
"BSD-2-Clause",
"CC0-1.0",
"GPL-2.0-or-later",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-3.0-only",
"LicenseRef-KDE-Accepted-LGPL"
],
"krecorder": [
"BSD-3-Clause",
"CC-BY-4.0",
@ -2076,7 +2085,10 @@
"layer-shell-qt": [
"BSD-3-Clause",
"CC0-1.0",
"LGPL-2.1-only",
"LGPL-3.0-only",
"LGPL-3.0-or-later",
"LicenseRef-KDE-Accepted-LGPL",
"MIT"
],
"libgravatar": [
@ -2526,6 +2538,7 @@
"LicenseRef-Qt-Commercial"
],
"plasma-mobile": [
"Apache-2.0",
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-only",
@ -2635,9 +2648,11 @@
],
"plasma-workspace-wallpapers": [],
"plasma5support": [
"BSD-3-Clause",
"CC0-1.0",
"GPL-2.0-or-later",
"LGPL-2.0-or-later"
"LGPL-2.0-or-later",
"LGPL-2.1-or-later"
],
"plasmatube": [
"CC-BY-SA-4.0",
@ -2667,6 +2682,7 @@
"GPL-2.0-or-later",
"GPL-3.0-only",
"LGPL-2.0-only",
"LGPL-2.0-or-later",
"LGPL-2.1-only",
"LGPL-2.1-or-later",
"LGPL-3.0-only",
@ -2831,7 +2847,6 @@
"GPL-2.0-only",
"GPL-2.0-or-later",
"GPL-3.0-only",
"GPL-3.0-or-later",
"LGPL-2.0-only",
"LGPL-2.1-or-later",
"LicenseRef-KDE-Accepted-GPL"

6
pkgs/kde/generated/projects.json
View File

@ -1001,6 +1001,12 @@
"project_path": "unmaintained/flickr-runner",
"repo_path": "unmaintained/flickr-runner"
},
"foss-public-alert-server": {
"description": "Open source server that allows desktop applications to receive near real-time push notifications about emergency alerts worldwide.",
"name": "foss-public-alert-server",
"project_path": "playground/www/foss-public-alert-server",
"repo_path": "webapps/foss-public-alert-server"
},
"frameworkintegration": {
"description": "Framework providing components to allow applications to integrate with a KDE Workspace",
"name": "frameworkintegration",

383
pkgs/kde/generated/sources/plasma.json
View File

@ -1,317 +1,322 @@
{
"bluedevil": {
"version": "6.0.5.1",
"url": "mirror://kde/stable/plasma/6.0.5/bluedevil-6.0.5.1.tar.xz",
"hash": "sha256-Zvzi1J9qxxa1UeMDD47T9xvuwEKNofma9+lZvJD1POI="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/bluedevil-6.1.0.tar.xz",
"hash": "sha256-9ZWwZUgK+o/B57VXPaJGqOJ2h08KGeqwz8tUBKymBoQ="
},
"breeze": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-6.0.5.tar.xz",
"hash": "sha256-8kndRGT02mtoGvXE/Q6BF4EnKUstRBE087EOJwP1c3Q="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/breeze-6.1.0.tar.xz",
"hash": "sha256-9xuPTnZ35WhWdqxy+WEBWFPelZseCLpzU5FHzse9HQ4="
},
"breeze-grub": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-grub-6.0.5.tar.xz",
"hash": "sha256-w9+KYNSYv0WYvGwW1hmnVxdQRnPB9Q9YHN+aZ428f+I="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/breeze-grub-6.1.0.tar.xz",
"hash": "sha256-VglghrnChFxWsUMK+8Rsb6cLiLnxMpvm/XWEm8BmiQ8="
},
"breeze-gtk": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-gtk-6.0.5.tar.xz",
"hash": "sha256-Uez1bnWimp5P26cG9MKE2W+YsPGLCqnYZkIYw22UuRI="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/breeze-gtk-6.1.0.tar.xz",
"hash": "sha256-F3tosQ/23CLiryzXAq2T6aLksWbGofPfyx1jgl4mWns="
},
"breeze-plymouth": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/breeze-plymouth-6.0.5.tar.xz",
"hash": "sha256-/hcQ+oYSTOCvENFgXMN1cW0/LP6aT87X9PSg6lhYBr4="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/breeze-plymouth-6.1.0.tar.xz",
"hash": "sha256-Gd8toIZclKuMhfWM0tiVZfQ3nci8iFFmsgGto6mTRc8="
},
"discover": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/discover-6.0.5.tar.xz",
"hash": "sha256-lEygP+Ex4OkveVsy5Of8cUyaWfwYpLvan1BAjQxq85U="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/discover-6.1.0.tar.xz",
"hash": "sha256-vrkjioN4fcaAMKrB7rpSE4rwOcB8SrL/jez+noYgOwg="
},
"drkonqi": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/drkonqi-6.0.5.tar.xz",
"hash": "sha256-EBX5rXNMxOULEK0kNqYGYddLDex0hyW+kIIQMzMCmF0="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/drkonqi-6.1.0.tar.xz",
"hash": "sha256-5/KbSC0C6HFK0mh/OObtIR8qXpLIVGa5NDIRIBlLp9Q="
},
"flatpak-kcm": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/flatpak-kcm-6.0.5.tar.xz",
"hash": "sha256-dBuUbAfQ1OUJ+M8pabIx5fNxAg1y+idqb35hY80nDOM="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/flatpak-kcm-6.1.0.tar.xz",
"hash": "sha256-DykHMvPm7nxOTmnAal3eROvc1eq1GNeC1Av+EAALlic="
},
"kactivitymanagerd": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kactivitymanagerd-6.0.5.tar.xz",
"hash": "sha256-We+Wj6CZDteuxmgr28jFHfEiSil5NAhMRjBgvJFv4J4="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kactivitymanagerd-6.1.0.tar.xz",
"hash": "sha256-yy5tpju5hPZdRbvTB4QEzWVGNT7TwtyTx7QJeNqCdzY="
},
"kde-cli-tools": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kde-cli-tools-6.0.5.tar.xz",
"hash": "sha256-wAJ64E5pHGkuGowFZdZ3n7Nuyw16949mY7kjD0WBso8="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kde-cli-tools-6.1.0.tar.xz",
"hash": "sha256-vE4iYriz4Y3sAQ7BvqT23c1fNqEnX4TRK29uhjs2Xb4="
},
"kde-gtk-config": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kde-gtk-config-6.0.5.tar.xz",
"hash": "sha256-tCKWn3sid9g9eppm25m5mcA8sKtKUDHgCwzN77pX74M="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kde-gtk-config-6.1.0.tar.xz",
"hash": "sha256-kreRiz7qxjkJiX29odEsTDMlAoF8MIGVYcxTidoRuO8="
},
"kdecoration": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kdecoration-6.0.5.tar.xz",
"hash": "sha256-CjxRYcA+i6ED/BCWarveKY3pjiXJRaJK4IpTmnhnAiQ="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kdecoration-6.1.0.tar.xz",
"hash": "sha256-hi6xlzLtGEZDDE3g71YwKsD5rvWtJgcZ0kMbY9yKr6U="
},
"kdeplasma-addons": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kdeplasma-addons-6.0.5.tar.xz",
"hash": "sha256-kRr0dUhzwXwcp9SfBmnePjhoWLCa3ygng7nFUQV2upU="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kdeplasma-addons-6.1.0.tar.xz",
"hash": "sha256-y1f6QnsxiKG8emsS4Zb8ESUnQuCPY5fjrwD/rzRnYSc="
},
"kgamma": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kgamma-6.0.5.tar.xz",
"hash": "sha256-ZZ3rZG/aFwONRUhpjHrEsIwSZgYjt411Q3pgbWp7rTY="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kgamma-6.1.0.tar.xz",
"hash": "sha256-/HuqscZYq7KfqTgpS3aXpyq8cvDDTo6itM4i281dTfk="
},
"kglobalacceld": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kglobalacceld-6.0.5.tar.xz",
"hash": "sha256-LJs5HA4/kbuLMgApx7l/yBZmWIghBtHfmtRBYAiU/K4="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kglobalacceld-6.1.0.tar.xz",
"hash": "sha256-89sf4gN5iaz/HvDAPqB3eaysr7YD/q7v7vj4SZtoAxA="
},
"kinfocenter": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kinfocenter-6.0.5.tar.xz",
"hash": "sha256-v08sYnJC2CeGcwbE6IR5bH1finoqKURKSUwqytXIiXM="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kinfocenter-6.1.0.tar.xz",
"hash": "sha256-KDyleEkIe8YSldSQX+a/aP98iwGDC4dHn6uavHLbVN4="
},
"kmenuedit": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kmenuedit-6.0.5.tar.xz",
"hash": "sha256-mqHTlyTLoee49t7YxJCs3+EVmO02jCjpqoZXJpjjWfg="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kmenuedit-6.1.0.tar.xz",
"hash": "sha256-KB9/dC0chX+dpjSrCB+9UYSxDWpr3dUpEr9k9DFkQb8="
},
"kpipewire": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kpipewire-6.0.5.tar.xz",
"hash": "sha256-QyfaJDUYbpBlPIcN5zCCp+X7YdE+BqUXywIfHVa30tY="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kpipewire-6.1.0.tar.xz",
"hash": "sha256-/MwoeEHuM8EoPL3Kg1DHji5zneulHyV0FpCaoCbNea0="
},
"krdp": {
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/krdp-6.1.0.tar.xz",
"hash": "sha256-MSfrtI0TD/GuuD4KZZj7Iv0LEmS76BqdbD3Sw4qAGJA="
},
"kscreen": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kscreen-6.0.5.tar.xz",
"hash": "sha256-7e2LVYFn2JopqDCnvTx9aSs2XaUpx7blnr2t65Fqk/A="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kscreen-6.1.0.tar.xz",
"hash": "sha256-FivRlneM93bKZGmq0FmAcx/di4JXD8BF+JYSqXq7RAE="
},
"kscreenlocker": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kscreenlocker-6.0.5.tar.xz",
"hash": "sha256-W7lKKg1pzOt+1O/L94a1M4hWfVEKQQ/Z0BvpE9KxY9A="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kscreenlocker-6.1.0.tar.xz",
"hash": "sha256-CjLFLnTRzE6QRKG+KXgHNqoM+uYZ3/Awl9VnfsnxBnE="
},
"ksshaskpass": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/ksshaskpass-6.0.5.tar.xz",
"hash": "sha256-bfDu70OgQesabXG6Uk/qxX/B9IrrRFQDZvEkBMxJhrw="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/ksshaskpass-6.1.0.tar.xz",
"hash": "sha256-CmWqVI3U7PSYl4WDg10QNxBICYpiPHTKlQx4/BbqJKk="
},
"ksystemstats": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/ksystemstats-6.0.5.tar.xz",
"hash": "sha256-vcb6lcC02tkhDHp3NOHCM7xAjwn8r0lhunCa/6H9QoQ="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/ksystemstats-6.1.0.tar.xz",
"hash": "sha256-zlm//t8V/P2g+R7kWZVff+j/0r2hNDV1fnCaRAbv6Tw="
},
"kwallet-pam": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwallet-pam-6.0.5.tar.xz",
"hash": "sha256-JcYRKOrvtWPlAFR/ZQvik+dRJu1fwvrFdO9AzMv9ANs="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kwallet-pam-6.1.0.tar.xz",
"hash": "sha256-sh7YYul1Hf6pOOVXGFrI6qJK4mDveV+5mtdNPEy5aho="
},
"kwayland": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwayland-6.0.5.tar.xz",
"hash": "sha256-qLiEEdKtlJfifW29ldZH3l6+YxRWHnqNk1/Xmy/nroQ="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kwayland-6.1.0.tar.xz",
"hash": "sha256-xzbPiMgdkHrxPkCo7qR1VHbcIkw19jvPeRUDl130UH0="
},
"kwayland-integration": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwayland-integration-6.0.5.tar.xz",
"hash": "sha256-sW30rZhRJCo5OHTC1TUgKXMkfduovhP9lZi+hhapoEU="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kwayland-integration-6.1.0.tar.xz",
"hash": "sha256-kblfkvmSZ5UquVTZ1t1+8HZTAHPy0g1A7qICdJfYNsg="
},
"kwin": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwin-6.0.5.tar.xz",
"hash": "sha256-JC59IQUp7GMbxf4/4KEXo9HU7bHdOmRKr9UIkxL4sNc="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kwin-6.1.0.tar.xz",
"hash": "sha256-UK/9bFwjzCxqjCPXQaZrBvZnnILH/Tyv6mamsGQ7Ty8="
},
"kwrited": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/kwrited-6.0.5.tar.xz",
"hash": "sha256-EKtotq1K/3451YlgdNusEGgNDfk/BKzy8tFaPYV/Q1k="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/kwrited-6.1.0.tar.xz",
"hash": "sha256-F9z4QZtdDXdevWhQmVPKe3M46/rU51dandc2TpEOIOE="
},
"layer-shell-qt": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/layer-shell-qt-6.0.5.tar.xz",
"hash": "sha256-vWv3PcebVh3TjB/HjDc7LvS532nWqCfjBdAREJ2RosI="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/layer-shell-qt-6.1.0.tar.xz",
"hash": "sha256-Vb2OgZonmwWf4p2/Rj+PFfgzcHN5xxkVPsdQt7UIIdg="
},
"libkscreen": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/libkscreen-6.0.5.tar.xz",
"hash": "sha256-Aad1afNy01TBcqI/LU4GYXAcAk5E2XKXGxRnNeFq4dk="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/libkscreen-6.1.0.tar.xz",
"hash": "sha256-wZPUO8wltih3CfGC5OYV9QtKleErutyitxQyBiSvq3Q="
},
"libksysguard": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/libksysguard-6.0.5.tar.xz",
"hash": "sha256-ypVPW7V3AL0UuuMjOoIJTqadMiccw+3W0yvPONsj4Xc="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/libksysguard-6.1.0.tar.xz",
"hash": "sha256-bR6a964QsSSrYqynDi89oVt0KnL3wGRvjCGff0tl42o="
},
"libplasma": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/libplasma-6.0.5.tar.xz",
"hash": "sha256-01dlwDmQHnObAU/5JkDGzUpNhSTCb+TQC9E00WqwzNI="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/libplasma-6.1.0.tar.xz",
"hash": "sha256-7SXwTKaKBAlkt7zbBDy3C+69+HgMYwJqWyyxPGu+dTs="
},
"milou": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/milou-6.0.5.tar.xz",
"hash": "sha256-cI4YtbQkmFoWdQfptZNN6TxlrK8vUkRmMS0JUV64Qs8="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/milou-6.1.0.tar.xz",
"hash": "sha256-e2gqTq2FrW28MoI7jU3JQbSVHlBwn9TTPNml3DSJvkY="
},
"ocean-sound-theme": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/ocean-sound-theme-6.0.5.tar.xz",
"hash": "sha256-YBXzkxp0E0/dfu9cfHWS74t0D8wITXcm+N+ZPcUon2s="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/ocean-sound-theme-6.1.0.tar.xz",
"hash": "sha256-nsZVxPPxT55qBEUP2yyomn97Ve228X7TbZr1ZuvgBfA="
},
"oxygen": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/oxygen-6.0.5.tar.xz",
"hash": "sha256-flQ3LW/ca3Nz2UjZSJ8+lLRXpvIqjwD26t4zzYPOgCI="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/oxygen-6.1.0.tar.xz",
"hash": "sha256-paAuWqy8qCjJhd+Nqbyq0LabVfymjBLwyvhS5woPW20="
},
"oxygen-sounds": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/oxygen-sounds-6.0.5.tar.xz",
"hash": "sha256-azR0er1oOQF9DqzB1SyFtSbbtnggH8TMNxknhnElOVI="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/oxygen-sounds-6.1.0.tar.xz",
"hash": "sha256-7sCIyky+3zmafrYlAT0b8bOTPgGAb8eeFZeS2X9jQ9E="
},
"plasma-activities": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-6.0.5.tar.xz",
"hash": "sha256-iBGHa8aQJ47NczsjOsRepPuwa8GmLZ4XuSaKpNBeplg="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-6.1.0.tar.xz",
"hash": "sha256-z3rQIIRAVqYvW9jXkrW8/cJV6gU97FHA+RBAJj9P+fg="
},
"plasma-activities-stats": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-activities-stats-6.0.5.tar.xz",
"hash": "sha256-16qv+XsfDDyUGxNKM/d9la8JXLsaZO/nQdev0VyYe18="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-activities-stats-6.1.0.tar.xz",
"hash": "sha256-0R3Rla1kK7BXW/13fBMjvq6opk2VkW0iH8b8ZytV7RU="
},
"plasma-browser-integration": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-browser-integration-6.0.5.tar.xz",
"hash": "sha256-MNzpVeJ6p2VsgnWCQK3umPJ3NglrwPgyodEDTM8+5Bg="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-browser-integration-6.1.0.tar.xz",
"hash": "sha256-8dpzTyPiLMUBPtpriuL/4nQ/lNN/EzQKxXXCFne5A5Y="
},
"plasma-desktop": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-desktop-6.0.5.tar.xz",
"hash": "sha256-XZABuuoy41BVM3Zn8gTijyBuvMqgoXLg8QlCa6gELs8="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-desktop-6.1.0.tar.xz",
"hash": "sha256-ATHGaI2bAhBn5G0cFLiiWJXwbQ9Pdx/15J3kFgRJJM4="
},
"plasma-disks": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-disks-6.0.5.tar.xz",
"hash": "sha256-Mh7C8xdwQiOZcnjvS/O5zwEuL/rsWo1X5X/qxoFOOtg="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-disks-6.1.0.tar.xz",
"hash": "sha256-VKxFan5XP+6c6LkXUL+9q+CfG0+fQt1+qRU9dyfgthE="
},
"plasma-firewall": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-firewall-6.0.5.tar.xz",
"hash": "sha256-C1LnQTzHRdl7sWo4rEBhL/t9x+QyPhVvoX2SNCXEsw4="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-firewall-6.1.0.tar.xz",
"hash": "sha256-sct/qtoHGU6D/PH93wXF/pK2zvSi7LQUgbPMkCQXBwo="
},
"plasma-integration": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-integration-6.0.5.tar.xz",
"hash": "sha256-f4FoP/j4puI9XJjps/O8PWOKvU3K1OQNJ0RsACkAT/A="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-integration-6.1.0.tar.xz",
"hash": "sha256-8P/6n80DVp9sgI6NwecQfAjzC61o/m6PzD3ancB/v6c="
},
"plasma-mobile": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-mobile-6.0.5.tar.xz",
"hash": "sha256-hx0BuUCuMPHjzxt0jWaoluRa473G1rHodfKMlWTwVpQ="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-mobile-6.1.0.tar.xz",
"hash": "sha256-hvATS/pn8QwgdExI3JGIfb7pba4k8BeaU0m3XmoJwvg="
},
"plasma-nano": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-nano-6.0.5.tar.xz",
"hash": "sha256-F4dSBUjZukxoajwhuvM7pxdmGeYOcOjOvuymQcPFlgE="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-nano-6.1.0.tar.xz",
"hash": "sha256-01m8dwqVD7ear4OpyWQg+K2M/zJO1Q54T4SpPatxATU="
},
"plasma-nm": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-nm-6.0.5.tar.xz",
"hash": "sha256-LFK3WpYe/Quf2e86bOtPS8U53p763DoMAIeZ12+U+Oc="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-nm-6.1.0.tar.xz",
"hash": "sha256-U1Kv+bZzUYYJRQANCXID1TvhJMDxB8h7MkKBiYD1RpA="
},
"plasma-pa": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-pa-6.0.5.tar.xz",
"hash": "sha256-7L87tAcggJSByraFfnwbNDaKE50RYrAM1GssxjzZqsQ="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-pa-6.1.0.tar.xz",
"hash": "sha256-4squGRC7896AJHvUZUWNPXmI5s5gNOtj2pdj7xqtJjk="
},
"plasma-sdk": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-sdk-6.0.5.tar.xz",
"hash": "sha256-EeVgkilQMQvf9UmfibMWE9Tr4HBW7FeDuCYCsPm+jvs="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-sdk-6.1.0.tar.xz",
"hash": "sha256-oDKFPYakiYW9MTlCD67m6q7nV5YsG4zveNQ0BGCtS08="
},
"plasma-systemmonitor": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-systemmonitor-6.0.5.tar.xz",
"hash": "sha256-ZiUY5tx2PRnL2HjBRaN2GmouJ2X9I3J4/90KKlJTCAs="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-systemmonitor-6.1.0.tar.xz",
"hash": "sha256-tJqhz3tvhOp99xFyml0/b9AAREviorkP9l4Nu63JEiQ="
},
"plasma-thunderbolt": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-thunderbolt-6.0.5.tar.xz",
"hash": "sha256-WZfeM874a3tsRK3Oai4dO7U2x9eqQ+HjUN0Ov3fLZlg="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-thunderbolt-6.1.0.tar.xz",
"hash": "sha256-OG/68iQGUBzoWE6MjIY0TS6RGa+BFYgoJT5TDDVFwI0="
},
"plasma-vault": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-vault-6.0.5.tar.xz",
"hash": "sha256-L+PMc/e+9NTGR26gz9MuMl1bhx/fz/XBFB8gPd4L6U0="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-vault-6.1.0.tar.xz",
"hash": "sha256-tItJkyeQS4fto8v4+BSQRFDZO37vr5U8Y9HzfdnW0j0="
},
"plasma-welcome": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-welcome-6.0.5.tar.xz",
"hash": "sha256-XChjJlDcoDD9mpNl28Vv4ImObUhjwkYlrW5QPBzCPsY="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-welcome-6.1.0.tar.xz",
"hash": "sha256-GDF8qwiZixUExd2JFAN6QMqV7bRA9FxhN6Zq/fii9wA="
},
"plasma-workspace": {
"version": "6.0.5.1",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-6.0.5.1.tar.xz",
"hash": "sha256-iQf5/e1fxuXZU1X4NGMo3hjXyIUNq9kQnXVFjVru2BM="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-6.1.0.tar.xz",
"hash": "sha256-9PVC5vIB9GCA7m+5Ztn4lYEajc19TxikxsSM4MNaEnw="
},
"plasma-workspace-wallpapers": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma-workspace-wallpapers-6.0.5.tar.xz",
"hash": "sha256-fqtNNHNe3/oSIrK1X9JEjX9iNeReAKG/mpRQ1za1O/A="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma-workspace-wallpapers-6.1.0.tar.xz",
"hash": "sha256-DLke5HhfzK04Pivi3RWwRFD4vAWUw5hvdYYP3tykZ1E="
},
"plasma5support": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plasma5support-6.0.5.tar.xz",
"hash": "sha256-ioEefbocMK4mKJNMTakdLfpC3JMihul9rIlwZGKHuHo="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plasma5support-6.1.0.tar.xz",
"hash": "sha256-4YMrMhq+krNzamEDdB7C1BZFMR2CKVXznsyJOOStVyo="
},
"plymouth-kcm": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/plymouth-kcm-6.0.5.tar.xz",
"hash": "sha256-veWy0OMBjv2oB44yrqN0dTtOJRdxTJkUnl+Y0EbxJu8="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/plymouth-kcm-6.1.0.tar.xz",
"hash": "sha256-fS3hRSIl3UUmx0YZMAWTxY2s8PY7OApE2RyO6vLBvKs="
},
"polkit-kde-agent-1": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/polkit-kde-agent-1-6.0.5.tar.xz",
"hash": "sha256-cs+jZ/3UayyRduR80TB/LqccAgfy49zPBtKS3OTUSKk="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/polkit-kde-agent-1-6.1.0.tar.xz",
"hash": "sha256-QQaWh6qBGJvYMwyp0IHiFXnkbYFek4SdWHQeq+Fn7sI="
},
"powerdevil": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/powerdevil-6.0.5.tar.xz",
"hash": "sha256-J/mVvObyfjW3jgwjL43uj7pQ+5HXs6/RF1g723mhL9Q="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/powerdevil-6.1.0.tar.xz",
"hash": "sha256-RFsqU2a8HWSwRUfv5ucTt1otMwn+Ryfp7fYVe+bdRYA="
},
"print-manager": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/print-manager-6.0.5.tar.xz",
"hash": "sha256-V6wh/zTaLIxm9Hh43iwE0uoFOV8pd/yWxR3usEczozc="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/print-manager-6.1.0.tar.xz",
"hash": "sha256-xjx0BUhkCHdQQJAp7kiBvBFlq5POYBZp7cvzjMLyAhU="
},
"qqc2-breeze-style": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/qqc2-breeze-style-6.0.5.tar.xz",
"hash": "sha256-1PzFlkagZv05Kp7YZXGJ7sZ35yJJyKTnJH7YmrxHRJY="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/qqc2-breeze-style-6.1.0.tar.xz",
"hash": "sha256-raTAxWIsGluCXpsQQuC+cTUq3aRGQJS7beIclxAu4m8="
},
"sddm-kcm": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/sddm-kcm-6.0.5.tar.xz",
"hash": "sha256-huWdNrSD+i70jYUDHG8Y8oaHvQ7otCOEsK4mwBSywCg="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/sddm-kcm-6.1.0.tar.xz",
"hash": "sha256-GzCrvNGEp/RgoZY2qlDvfaNOa25BLubL+XrpW0146tw="
},
"systemsettings": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/systemsettings-6.0.5.tar.xz",
"hash": "sha256-tyK6Ifq9jNJ+I3GoPjOppOFAMlfUVLPwHG+kbCh0z5M="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/systemsettings-6.1.0.tar.xz",
"hash": "sha256-vZSxNCBkeUoULLKF7RAqbbaVm/JoLU5mHVYNc0poylw="
},
"wacomtablet": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/wacomtablet-6.0.5.tar.xz",
"hash": "sha256-N8+dNHdReMoiPm2bM+iqwRmRO6ETFvS8Imkk4lOXDK8="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/wacomtablet-6.1.0.tar.xz",
"hash": "sha256-0evmQyKNRwrVzClMWs0BD0ArpzqnfCpFKljTrIPIPIU="
},
"xdg-desktop-portal-kde": {
"version": "6.0.5",
"url": "mirror://kde/stable/plasma/6.0.5/xdg-desktop-portal-kde-6.0.5.tar.xz",
"hash": "sha256-AL30QtN7MICr/SlYQl3XJKOlAZ1Q39fLMZ5RYLJ6awU="
"version": "6.1.0",
"url": "mirror://kde/stable/plasma/6.1.0/xdg-desktop-portal-kde-6.1.0.tar.xz",
"hash": "sha256-BUzmYjI07AvobqAA1/sTz5V+T8QqJIVBKS+jgx2ATbM="
}
}

2
pkgs/kde/misc/marknote/default.nix
View File

@ -2,7 +2,6 @@
lib,
mkKdeDerivation,
fetchurl,
kcrash,
qtdeclarative,
qtsvg,
qtwayland,
@ -18,7 +17,6 @@ mkKdeDerivation rec {
};
extraBuildInputs = [
kcrash
qtdeclarative
qtsvg
qtwayland

1
pkgs/kde/plasma/default.nix
View File

@ -17,6 +17,7 @@
kinfocenter = callPackage ./kinfocenter {};
kmenuedit = callPackage ./kmenuedit {};
kpipewire = callPackage ./kpipewire {};
krdp = callPackage ./krdp {};
kscreen = callPackage ./kscreen {};
kscreenlocker = callPackage ./kscreenlocker {};
ksshaskpass = callPackage ./ksshaskpass {};

26
pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch
View File

@ -1,7 +1,7 @@
diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
diff --git a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in
index 0de6973e..30035768 100644
--- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
+++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
--- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in
+++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in
@@ -85,6 +85,6 @@
"Name[zh_CN]": "窗口管理器",
"Name[zh_TW]": "視窗管理員"
@ -10,23 +10,23 @@ index 0de6973e..30035768 100644
+ "TryExec": "@qdbus@",
"X-KDE-KInfoCenter-Category": "graphical_information"
}
diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp
diff --git a/kcms/kwinsupportinfo/main.cpp b/kcms/kwinsupportinfo/main.cpp
index 6ae168b5..89d0a2ff 100644
--- a/Modules/kwinsupportinfo/main.cpp
+++ b/Modules/kwinsupportinfo/main.cpp
--- a/kcms/kwinsupportinfo/main.cpp
+++ b/kcms/kwinsupportinfo/main.cpp
@@ -18,7 +18,7 @@ public:
explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data)
: KQuickConfigModule(parent, data)
{
- m_outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"),
- m_outputContext = new CommandOutputContext(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"),
+ m_outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"),
{QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")},
parent);
}
diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json
diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json
index b3f1ce24..dc610932 100644
--- a/Modules/xserver/kcm_xserver.json
+++ b/Modules/xserver/kcm_xserver.json
--- a/kcms/xserver/kcm_xserver.json
+++ b/kcms/xserver/kcm_xserver.json
@@ -141,7 +141,7 @@
"Name[zh_CN]": "X 服务器",
"Name[zh_TW]": "X 伺服器"
@ -36,10 +36,10 @@ index b3f1ce24..dc610932 100644
"X-DocPath": "kinfocenter/graphical.html#xserver",
"X-KDE-KInfoCenter-Category": "graphical_information",
"X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information",
diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp
diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp
index 6d4d1e25..d39fe19e 100644
--- a/Modules/xserver/main.cpp
+++ b/Modules/xserver/main.cpp
--- a/kcms/xserver/main.cpp
+++ b/kcms/xserver/main.cpp
@@ -16,7 +16,7 @@ public:
explicit KCMXServer(QObject *parent, const KPluginMetaData &data)
: KQuickConfigModule(parent, data)

31
pkgs/kde/plasma/krdp/default.nix Normal file
View File

@ -0,0 +1,31 @@
{
lib,
mkKdeDerivation,
substituteAll,
openssl,
pkg-config,
qtkeychain,
qtwayland,
freerdp,
wayland,
wayland-protocols,
}:
mkKdeDerivation {
pname = "krdp";
patches = [
(substituteAll {
src = ./hardcode-openssl-path.patch;
openssl = lib.getExe openssl;
})
];
extraNativeBuildInputs = [pkg-config];
extraBuildInputs = [
qtkeychain
qtwayland
freerdp
wayland
wayland-protocols
];
}

13
pkgs/kde/plasma/krdp/hardcode-openssl-path.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/kcm/kcmkrdpserver.cpp b/src/kcm/kcmkrdpserver.cpp
index 3af527c..3433a84 100644
--- a/src/kcm/kcmkrdpserver.cpp
+++ b/src/kcm/kcmkrdpserver.cpp
@@ -218,7 +218,7 @@ void KRDPServerConfig::generateCertificate()
QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdpserver/krdp.key"));
qDebug(KRDPKCM) << "Generating certificate files to: " << certificatePath << " and " << certificateKeyPath;
QProcess sslProcess;
- sslProcess.start(u"openssl"_qs,
+ sslProcess.start(u"@openssl@"_qs,
{
u"req"_qs,
u"-nodes"_qs,

5
pkgs/kde/plasma/kwin/default.nix
View File

@ -8,7 +8,9 @@
qtwayland,
libinput,
xorg,
xwayland,
libdisplay-info,
libei,
mesa,
lcms2,
libcap,
@ -53,9 +55,12 @@ mkKdeDerivation {
lcms2
libcap
libdisplay-info
libei
libinput
pipewire
xorg.libxcvt
# we need to provide this so it knows our xwayland supports new features
xwayland
];
}

5
pkgs/kde/plasma/plasma-desktop/default.nix
View File

@ -10,6 +10,7 @@
pkg-config,
qtsvg,
qtwayland,
breeze,
kaccounts-integration,
SDL2,
xkeyboard_config,
@ -39,6 +40,10 @@ in
})
./tzdir.patch
./no-discover-shortcut.patch
(substituteAll {
src = ./wallpaper-paths.patch;
wallpapers = "${lib.getBin breeze}/share/wallpapers";
})
];
extraNativeBuildInputs = [pkg-config];

4
pkgs/kde/plasma/plasma-workspace/wallpaper-paths.patch → pkgs/kde/plasma/plasma-desktop/wallpaper-paths.patch
View File

@ -1,5 +1,5 @@
--- a/lookandfeel/sddm-theme/theme.conf.cmake
+++ b/lookandfeel/sddm-theme/theme.conf.cmake
--- a/sddm-theme/theme.conf.cmake
+++ b/sddm-theme/theme.conf.cmake
@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg
type=image
color=#1d99f3

5
pkgs/kde/plasma/plasma-workspace/default.nix
View File

@ -10,7 +10,6 @@
libcanberra,
libqalculate,
pipewire,
breeze,
qttools,
qqc2-breeze-style,
gpsd,
@ -25,10 +24,6 @@ mkKdeDerivation {
xsetroot = "${lib.getBin xorg.xsetroot}/bin/xsetroot";
qdbus = "${lib.getBin qttools}/bin/qdbus";
})
(substituteAll {
src = ./wallpaper-paths.patch;
wallpapers = "${lib.getBin breeze}/share/wallpapers";
})
];
postInstall = ''