From 15729ec4e1b90abbcec33b75c68d35dd5b968453 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 27 Sep 2025 13:17:48 +0300 Subject: [PATCH] kdePackages: Plasma 6.4.5 -> 6.5.0 --- .../services/desktop-managers/plasma6.nix | 2 + pkgs/kde/generated/sources/plasma.json | 419 +++++++++--------- pkgs/kde/plasma/default.nix | 1 + pkgs/kde/plasma/knighttime/default.nix | 9 + pkgs/kde/plasma/krdp/default.nix | 3 + .../plasma/krdp/hardcode-openssl-path.patch | 14 +- .../plasma-vault/0003-fusermount-path.patch | 18 +- pkgs/kde/plasma/plasma-vault/default.nix | 2 +- pkgs/kde/plasma/plasma-workspace/default.nix | 2 - .../plasma-workspace/dependency-paths.patch | 29 +- .../kde/plasma/polkit-kde-agent-1/default.nix | 2 - pkgs/kde/plasma/systemsettings/default.nix | 8 +- .../applet-window-buttons6/default.nix | 3 + 13 files changed, 257 insertions(+), 255 deletions(-) create mode 100644 pkgs/kde/plasma/knighttime/default.nix diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index c9da11d2ec63..4dcfecd7746d 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -91,6 +91,7 @@ in kio-admin # managing files as admin kio-extras # stuff for MTP, AFC, etc kio-fuse # fuse interface for KIO + knighttime # night mode switching daemon kpackage # provides kpackagetool tool kservice # provides kbuildsycoca6 tool kunifiedpush # provides a background service and a KCM @@ -266,6 +267,7 @@ in services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; services.libinput.enable = mkDefault true; + services.geoclue2.enable = mkDefault true; # Extra UDEV rules used by Solid services.udev.packages = [ diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index 876d9609b9bc..c070b4587fa8 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,347 +1,352 @@ { "aurorae": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/aurorae-6.4.5.tar.xz", - "hash": "sha256-MYPuvEdtZ2N0FUnGvQB8ZQZJkT1kjMr6MDZpCC2L83g=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/aurorae-6.5.0.tar.xz", + "hash": "sha256-jlHm8t9NPAclO06UtVo+FY3B72OARKaNrKaB7oKw+1s=" }, "bluedevil": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/bluedevil-6.4.5.tar.xz", - "hash": "sha256-+zoHx56pgM1V+SrQO4zrJZX9ehjXD2/SxNnjU4qE1x4=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/bluedevil-6.5.0.tar.xz", + "hash": "sha256-N2W9EvEPVChFR750P8mcECLLvzjg7lbYYxY7iWm7jZg=" }, "breeze": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/breeze-6.4.5.tar.xz", - "hash": "sha256-3LhDPTmVEVRpWPTIwaj65e0i8qaY8FOWjUEO51vW2LQ=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/breeze-6.5.0.tar.xz", + "hash": "sha256-Sa9bwnEicCjfcLIhSf5vz7FbbUuObz6zKd7N465N82k=" }, "breeze-grub": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/breeze-grub-6.4.5.tar.xz", - "hash": "sha256-ToJe6Vg3k/11W0E6R8QTpfnNFBKBL3tGrO7t5TgwZGs=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/breeze-grub-6.5.0.tar.xz", + "hash": "sha256-UumPPwodqDVRAfGeTzxz7tzst0imxyKVkk5sp2+cAJg=" }, "breeze-gtk": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/breeze-gtk-6.4.5.tar.xz", - "hash": "sha256-dx6IyhlCGkcvX0I1+ye6JYi36iZ+jyZH5eIxw1HwOpg=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/breeze-gtk-6.5.0.tar.xz", + "hash": "sha256-ul8FewjjgtngeQq1HXqhzFAXyVLrxGdlQAgVUn3IFHA=" }, "breeze-plymouth": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/breeze-plymouth-6.4.5.tar.xz", - "hash": "sha256-DhuDkj8JOCHd72/VsRtW2wVxtBCfTyYCFIAfscbfcAQ=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/breeze-plymouth-6.5.0.tar.xz", + "hash": "sha256-nK75hcMHirIp3u7DBFmw+Ms2mY8c63OuKpeMPipGGd8=" }, "discover": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/discover-6.4.5.tar.xz", - "hash": "sha256-kgjU43rSrkzR2nzTsB7eYQcaE4mOxMFO3/6YO5cvhXY=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/discover-6.5.0.tar.xz", + "hash": "sha256-k+Q7823cRxPLTsxtDwCkT9rmQmp9pScPcmRX5joPKD0=" }, "drkonqi": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/drkonqi-6.4.5.tar.xz", - "hash": "sha256-63ydNHXvQpiiotmKivIysvtw7kqnHE9R3RYVMXC7E7I=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/drkonqi-6.5.0.tar.xz", + "hash": "sha256-MQaismj2cY82kH02+sol8RlFg5oW/2uLdKE81wjvjLE=" }, "flatpak-kcm": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/flatpak-kcm-6.4.5.tar.xz", - "hash": "sha256-PxhYcHEkMFvCMYbzNLuvY8WivC2Jder/EnTUAuYRuLE=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/flatpak-kcm-6.5.0.tar.xz", + "hash": "sha256-0zqrUc9bpv37EvY4vH6LhSW55nMNFO7hRISN4XalGEU=" }, "kactivitymanagerd": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kactivitymanagerd-6.4.5.tar.xz", - "hash": "sha256-3lJRi5Ab7rWKYycxb82jRbNVIwVVbIWhxLETP5q3pCQ=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kactivitymanagerd-6.5.0.tar.xz", + "hash": "sha256-owsjDL3o7SGwtJQjVRXrv+7JFvf+TxW7uSdUaEZ4Ppg=" }, "kde-cli-tools": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kde-cli-tools-6.4.5.tar.xz", - "hash": "sha256-PMMnRw79Y85nmPMQACNGdNaUmHLIVxwHLcsjlWoneyY=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kde-cli-tools-6.5.0.tar.xz", + "hash": "sha256-3qIPn6Ni5ZBog7X4yZnuplGQYPEka9LyFJLYX17+QS0=" }, "kde-gtk-config": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kde-gtk-config-6.4.5.tar.xz", - "hash": "sha256-96gcHv1Tm2CMxkCpmf2xhLu4PPyWANQH0aTzMsOIDsI=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kde-gtk-config-6.5.0.tar.xz", + "hash": "sha256-7fdYusB3N9/l394LeXuGRqhmnINp8PnUoroaAv5GLg4=" }, "kdecoration": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kdecoration-6.4.5.tar.xz", - "hash": "sha256-+dPsQlbPcSWjsLwIx3N69xUjXVwitpuil5e7BsXvSkw=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kdecoration-6.5.0.tar.xz", + "hash": "sha256-+a4ZT+UfpkbSyGU++tU2KgrZJT48KLcOjkKpwDKLnBs=" }, "kdeplasma-addons": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kdeplasma-addons-6.4.5.tar.xz", - "hash": "sha256-S9vcKJK79iEcO+bAIXf3/9zhCrFUbYEaS1kCQZK3e84=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kdeplasma-addons-6.5.0.tar.xz", + "hash": "sha256-zApdSDB9URDAE8CLLsOCqrqfZsNwyOSrRuxxq2aTuQs=" }, "kgamma": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kgamma-6.4.5.tar.xz", - "hash": "sha256-mW69YL9QgkjtwpPZ7J2kybg4s/sbzNgqTbMFnvJ6uxY=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kgamma-6.5.0.tar.xz", + "hash": "sha256-woA1Ln611Ot95e3uNtv6I1plpbtetNk9rxblD1TaC/M=" }, "kglobalacceld": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kglobalacceld-6.4.5.tar.xz", - "hash": "sha256-pxLR96hpYCkv62l5/iyS8ufVz7zRB/Tv45eeGkwyzXM=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kglobalacceld-6.5.0.tar.xz", + "hash": "sha256-XcstQngVKSCOy/TS6yMfmuwp79EsLSTsn4ppBKxvddU=" }, "kinfocenter": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kinfocenter-6.4.5.tar.xz", - "hash": "sha256-bCeofeJPbF6dvYDNemGLVMHSiRRmWBz8CZoCP9BxZgs=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kinfocenter-6.5.0.tar.xz", + "hash": "sha256-3Dy9o60aZax+vbAvaTer1UZ9M9STjWDDO1tIeP442Ds=" }, "kmenuedit": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kmenuedit-6.4.5.tar.xz", - "hash": "sha256-YQ8HzTomwWGOKnwxzpARsos68N9dpl6wEAp+jwjIlC8=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kmenuedit-6.5.0.tar.xz", + "hash": "sha256-WmGVESlpgfw3f/ASnIZYtMS5BDc+/XpjUahqPUxgXjg=" + }, + "knighttime": { + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/knighttime-6.5.0.tar.xz", + "hash": "sha256-rHrxaKAcoZv8cchJ11hyPdgcHxz+THs8ijYCGtXRuq8=" }, "kpipewire": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kpipewire-6.4.5.tar.xz", - "hash": "sha256-0KcEpqAw7bW09da5nDK8TkbhpqtSff3pCJ4RCUtrGpI=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kpipewire-6.5.0.tar.xz", + "hash": "sha256-BlG46jhi/+PqTwiiRDGrRnJXQCIfBSxDKAMzYr4iC6c=" }, "krdp": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/krdp-6.4.5.tar.xz", - "hash": "sha256-OBwsAl22ti0tcWVVgsTJJyrgTUIlrqX4oDB2Gb+ZCkU=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/krdp-6.5.0.tar.xz", + "hash": "sha256-cQZct0KurdNq4k4pxb8eiDzQhNMPsjlCFcWJJ0AStYs=" }, "kscreen": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kscreen-6.4.5.tar.xz", - "hash": "sha256-uSvegjix5/PWUhzEsbqLumAEemT/8SmyAR3/X/NDEDc=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kscreen-6.5.0.tar.xz", + "hash": "sha256-kesy8PcBFlWqOXK2wjXQaOI6/GugivBKMerJkt5zHZ4=" }, "kscreenlocker": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kscreenlocker-6.4.5.tar.xz", - "hash": "sha256-+sT51T1jy5sG6Q/rgsKPRxlx0V3v1KBoux59KIa3CQ0=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kscreenlocker-6.5.0.tar.xz", + "hash": "sha256-DsR9SjPkfIbgnpsIrnaRXfZa+oDSjIm1Tiv7l60uwys=" }, "ksshaskpass": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/ksshaskpass-6.4.5.tar.xz", - "hash": "sha256-Wy2hGTcHnGGRl1XD1V/5v8W/l+0dvwgLQ8DCr1DjVNo=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/ksshaskpass-6.5.0.tar.xz", + "hash": "sha256-MWm4rL+HHSvGYWVAWNjjzhLRJRP9Id3Y8IrD9gT+2kk=" }, "ksystemstats": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/ksystemstats-6.4.5.tar.xz", - "hash": "sha256-cVsojzmr/ZDKgltPo8OHRenuHLvH9JW6FH1+++BKSdI=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/ksystemstats-6.5.0.tar.xz", + "hash": "sha256-wNbYkC8aRQfclV0owhvQhHJQwb+kofAwre5gskljYOo=" }, "kwallet-pam": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kwallet-pam-6.4.5.tar.xz", - "hash": "sha256-j/vxzELemqMq/JncxdwEgvGWcUVBbwVEmx5ye1WxNz4=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kwallet-pam-6.5.0.tar.xz", + "hash": "sha256-M2OXxp7XwhtK0plDQyTHGrBP+J5kagdeeTmal62/3sw=" }, "kwayland": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kwayland-6.4.5.tar.xz", - "hash": "sha256-C4ddnnzFusTZfTRD/0MRUz4Nja1AGvEkTUdYpfpUKPM=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kwayland-6.5.0.tar.xz", + "hash": "sha256-YLfslWNtnsTRbYC8IWEcLD1SVRStCiPwM6IGpTxLJ8E=" }, "kwayland-integration": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kwayland-integration-6.4.5.tar.xz", - "hash": "sha256-/SvWMFN2O703DJ5XggWDMK1zoUJBt6bj4bjSQwPe1QM=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kwayland-integration-6.5.0.tar.xz", + "hash": "sha256-wq2mdIbNFNW2Mr8g/j9vC5q/aRk+bQIOlZXdtvQwNbo=" }, "kwin": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kwin-6.4.5.tar.xz", - "hash": "sha256-3s8ct5EnwoXH7ado5/9Pl8cvMUc1yCaFdY8LlWrBUfc=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kwin-6.5.0.tar.xz", + "hash": "sha256-4OqmeYAmb+J/4y0VyfGPggZ3aRn4HU4aiJ00xfZc+YI=" }, "kwin-x11": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kwin-x11-6.4.5.tar.xz", - "hash": "sha256-zqkYeUZ6/fosrw7G3XJW6ueN76lwzcmpR/79hdQXrLE=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kwin-x11-6.5.0.tar.xz", + "hash": "sha256-p52Pe0YQtI8dj1EylCKyiC7U2q3zjlyQQtJbFZQXZRM=" }, "kwrited": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/kwrited-6.4.5.tar.xz", - "hash": "sha256-Q0uDsRWkgPVCyX1RnCfy613U0zPPvdoo7ZlIE4kqANE=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/kwrited-6.5.0.tar.xz", + "hash": "sha256-IPMgzjtDD2RSppFqQpKQs8xFHZoroGrgh8PP0ZPWMes=" }, "layer-shell-qt": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/layer-shell-qt-6.4.5.tar.xz", - "hash": "sha256-72uq4iEU8DiviQKfPwB17inDuR/UkQCCjEw6MuFJbpU=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/layer-shell-qt-6.5.0.tar.xz", + "hash": "sha256-cg8ZPxGaR+44mktSs23cr+yk6SV/O33LVq4GI52xovc=" }, "libkscreen": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/libkscreen-6.4.5.tar.xz", - "hash": "sha256-aNJuJ2VrRQ8Vp49EeExQoiA05XwU+WpAIBnVK8Wz4rQ=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/libkscreen-6.5.0.tar.xz", + "hash": "sha256-nEJXf6qbuqSBl4KEcJr93DEPUqzJe2YTujxs7pFhzCw=" }, "libksysguard": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/libksysguard-6.4.5.tar.xz", - "hash": "sha256-x8+M0vCh5RkgHcYoifETWWeoUPkywlL9Juo9iMZWSg8=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/libksysguard-6.5.0.tar.xz", + "hash": "sha256-LxyTJGzbBXhlG3CNAP4rbAxkEfSh8shGTlrqyBaXHIU=" }, "libplasma": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/libplasma-6.4.5.tar.xz", - "hash": "sha256-lFtsVM/sVggPa1WGToKncCCW1oK+zx/Ul513pACcQSQ=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/libplasma-6.5.0.tar.xz", + "hash": "sha256-vJ+BSURzEpfhfZPQjxOQUGxdmtVfWoR+CuUHloN7bOg=" }, "milou": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/milou-6.4.5.tar.xz", - "hash": "sha256-Dq7sigWvw6lvag7vyaBF9JrOi+IBvI9X4e2BM82qEA0=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/milou-6.5.0.tar.xz", + "hash": "sha256-zuWqoW96kV0YdrL5GvDNchGmGNJwjle2frTfrs6ngR8=" }, "ocean-sound-theme": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/ocean-sound-theme-6.4.5.tar.xz", - "hash": "sha256-X140kY7Gn0TBAh2lJg4aXWVkNkYMn+AaXUiEkTAW+iU=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/ocean-sound-theme-6.5.0.tar.xz", + "hash": "sha256-yRLlOTCCZELphComNnnxkguaPcO2PZsCIJ/Pt2nXWg4=" }, "oxygen": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/oxygen-6.4.5.tar.xz", - "hash": "sha256-nBijOiJWC9xQS9HN1t054JGDjGC1R6zsAMUb2KEz62M=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/oxygen-6.5.0.tar.xz", + "hash": "sha256-rQGEkahM32n7uiCXUiYRBql+G6oCqp21HXaysSC2GKM=" }, "oxygen-sounds": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/oxygen-sounds-6.4.5.tar.xz", - "hash": "sha256-HQ+p+HIgXsjSvv5bwCnIsaDQ5UyLOhkHZTItiXeFIis=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/oxygen-sounds-6.5.0.tar.xz", + "hash": "sha256-XBJk1xNXsu0OJthXDnly9ZZcEjkROTqn5LTnDvgowm8=" }, "plasma-activities": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-6.4.5.tar.xz", - "hash": "sha256-MK0jhG6Xvzwu1tOvJd4K4dmB6ocWCEkvzBYVXv0MgWk=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-6.5.0.tar.xz", + "hash": "sha256-DbhyvFaqhNIv5lsZxbNkzBT0SkBAHqqvv42iegS4iD8=" }, "plasma-activities-stats": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-stats-6.4.5.tar.xz", - "hash": "sha256-NcZPckwFUPmWd/YTSEnez3a+R5cSEMqUGFguo4tIDDA=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-stats-6.5.0.tar.xz", + "hash": "sha256-YdcjGKwdTN7WFS8Jfuj0SzsyYXkaaELcrYZo59Bj9RU=" }, "plasma-browser-integration": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-browser-integration-6.4.5.tar.xz", - "hash": "sha256-rZL07B4x2f3Fe1F73C5awQfGLAIJCtN1Ke7N7myvnYs=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-browser-integration-6.5.0.tar.xz", + "hash": "sha256-HwFDyglLrMMPtphYVOnI+9ktFJU7O7MSGTIrozFwnf8=" }, "plasma-desktop": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-desktop-6.4.5.tar.xz", - "hash": "sha256-dVLkx8fMv1t3VnJruaqr00RjCXeq8T9fMFtEd8qhe7c=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-desktop-6.5.0.tar.xz", + "hash": "sha256-wn3CwSeVSDp3ohvMcAKbmDRHTtQj3NuT3A6IV9Te3kI=" }, "plasma-dialer": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-dialer-6.4.5.tar.xz", - "hash": "sha256-o5sUqDi+BNZeVOuD31hAPhj8EVBjeTXTdGZX4nyY/qg=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-dialer-6.5.0.tar.xz", + "hash": "sha256-dTUxwFguIe6cJURMOn1gahNZ7MKKn2Ds/jCPS26d6Mg=" }, "plasma-disks": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-disks-6.4.5.tar.xz", - "hash": "sha256-gBfHSfvIUKE9EdWzU0P4UZStQnagHMBTEd1pgo9R/vM=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-disks-6.5.0.tar.xz", + "hash": "sha256-6KThaCHyXGzC74JYcVQHfdfZi3Upiqh/6KxpXmo8+Po=" }, "plasma-firewall": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-firewall-6.4.5.tar.xz", - "hash": "sha256-hcjyic4DkNVgyZ/Z9KXFC8n6tvfQQ/WqMQuFIpsdg0w=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-firewall-6.5.0.tar.xz", + "hash": "sha256-7fZeXA4jfFkyiZMxYx3XK6LZtp6cl/906P/AUEuQ9cs=" }, "plasma-integration": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-integration-6.4.5.tar.xz", - "hash": "sha256-w+Jx3h+ibIgzRAtpzKxejAlKheR0K/Jvl7y3yqjBeyw=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-integration-6.5.0.tar.xz", + "hash": "sha256-AqfgvOVrqpPG9xNrljC5ulEJ19Kcb2wRDMcWEL3SDg4=" }, "plasma-mobile": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-mobile-6.4.5.tar.xz", - "hash": "sha256-pzz42tiaKEPfQS85X6HcaU4AHM4tZxrsJufoIXT7i+U=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-mobile-6.5.0.tar.xz", + "hash": "sha256-Ib9k7bv5RGJuBX3CLpIugWxbVVIuh57rnLYQ/UhYNQU=" }, "plasma-nano": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-nano-6.4.5.tar.xz", - "hash": "sha256-xPMVP0/ao++XwXX+qW6RRyjqNr8ron5ojZkMCA+2wmE=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-nano-6.5.0.tar.xz", + "hash": "sha256-GhFhF6XAaAwycZU6UMmKsN4y9qfwM9i1Zov+WtMr0RY=" }, "plasma-nm": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-nm-6.4.5.tar.xz", - "hash": "sha256-Sn0ilmiOlZfu3kRN5v5lSBMe1pE2puHEqt76D0oBXRY=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-nm-6.5.0.tar.xz", + "hash": "sha256-ZIpHqoghXPIbtsbHnwwgvcqsn5/8VAKiPDQbpAApQZU=" }, "plasma-pa": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-pa-6.4.5.tar.xz", - "hash": "sha256-FMK6z/DwHAtSjXtxtQYsaLKXK7QVtcJzh901zuREGxo=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-pa-6.5.0.tar.xz", + "hash": "sha256-JNdY8tVUhoSluNT+igowS7z23gLkijfLGji6eaQoJYw=" }, "plasma-sdk": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-sdk-6.4.5.tar.xz", - "hash": "sha256-VjLavtw/dRBtFdPW+lBmpb6drPh6IkxH+v6CrBHP278=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-sdk-6.5.0.tar.xz", + "hash": "sha256-vCRMPWMXNepo7uQlrcfWCwnxcSi6ZT986jAxNGBr24E=" }, "plasma-systemmonitor": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-systemmonitor-6.4.5.tar.xz", - "hash": "sha256-MXtlI0eq6PmNSWF4GSv93FEn3mariLUa1yyK8flqTD0=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-systemmonitor-6.5.0.tar.xz", + "hash": "sha256-AFXX6Cs+4VcYf7DHl/KGfD2mLVZJDJ02/VdvAmuTRbQ=" }, "plasma-thunderbolt": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-thunderbolt-6.4.5.tar.xz", - "hash": "sha256-fB0EOVuEo2h8Q9lASlfaidZNahNmcQe7wkOmHZ8GXzU=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-thunderbolt-6.5.0.tar.xz", + "hash": "sha256-1kXh2Tri9kHO1u5fds/6vgTHqj6i3xjbiFyoyTTHIyI=" }, "plasma-vault": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-vault-6.4.5.tar.xz", - "hash": "sha256-OlEFvplfCSMUUDiGfqb8/kWoLpU37vWoVkPbJP/vcPU=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-vault-6.5.0.tar.xz", + "hash": "sha256-umka8KaosOmZYH2UJOu6TVDKQwSgcTA3ypwhf9OrSJQ=" }, "plasma-welcome": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-welcome-6.4.5.tar.xz", - "hash": "sha256-V867V7XVKCY6nZBtsljjaNzNhCUa6SRKwHviC1n+1gk=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-welcome-6.5.0.tar.xz", + "hash": "sha256-TcElW4McRGt+izc1RR/M+j34DCsoJdhQa7NWkM/LhbY=" }, "plasma-workspace": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-6.4.5.tar.xz", - "hash": "sha256-GZmevzV09TkUW6cHQBm4jVHyypUtEhOU2vavLmMpEPs=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-6.5.0.tar.xz", + "hash": "sha256-ZJHq+/q8UzXFx6e21ohKEfkQdVh7SRJAHP/oMJZvLyA=" }, "plasma-workspace-wallpapers": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-wallpapers-6.4.5.tar.xz", - "hash": "sha256-tDs9MXcS0MTruegAFiRON4LlsHlXV21qAwSQegfAj78=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-wallpapers-6.5.0.tar.xz", + "hash": "sha256-MsHBoBVYlfTbU0M/pJKBH0VFth0jfHez0FzYP7b0yX0=" }, "plasma5support": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plasma5support-6.4.5.tar.xz", - "hash": "sha256-rP37yC+OOve9NdUUsePLtdq6jae6eQzsto+SWg9N+UI=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plasma5support-6.5.0.tar.xz", + "hash": "sha256-lyp3VujiH0mkJHnU4PW+tkT4/64V2lI3dk0k28UJ49o=" }, "plymouth-kcm": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/plymouth-kcm-6.4.5.tar.xz", - "hash": "sha256-K1fR9OJddp7ycA4427pV/np4xuyhP+6SWHWxoo4R5Hs=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/plymouth-kcm-6.5.0.tar.xz", + "hash": "sha256-Q2bI4WelqoBhc1wNK+VoNgLxJTMQEBvtc0bLPdMTyUk=" }, "polkit-kde-agent-1": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/polkit-kde-agent-1-6.4.5.tar.xz", - "hash": "sha256-W113FmD1IJKVplr9yz4RfBzJzXwYk9DJtorQxTEwgwE=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/polkit-kde-agent-1-6.5.0.tar.xz", + "hash": "sha256-pLJ7seqVF1jRG3jAhTyB73EigBqkGkSIQk2qWiCM5rE=" }, "powerdevil": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/powerdevil-6.4.5.tar.xz", - "hash": "sha256-qo6cbzO4rtTtrpycQ4MJZu1O7C+0N88hAjFQvfvYLkg=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/powerdevil-6.5.0.tar.xz", + "hash": "sha256-9+fb6mSvwVxd4YEA4zkr3eXM3HNfb1FpcyCBWZMfwYc=" }, "print-manager": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/print-manager-6.4.5.tar.xz", - "hash": "sha256-4jj9ApLRCsi1xRS9LOC5GNXVsZZsZpUyhb62bhOiQso=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/print-manager-6.5.0.tar.xz", + "hash": "sha256-D3R2h6DRWewhVkXY96g0RlDxojwmbEuysN7zH9G8O88=" }, "qqc2-breeze-style": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/qqc2-breeze-style-6.4.5.tar.xz", - "hash": "sha256-3zV16UPdGEbAeOSnDkV7CHeCDlqpn/XyeEMw8MlwN/8=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/qqc2-breeze-style-6.5.0.tar.xz", + "hash": "sha256-Zx3ipLD8F8qCIvkRuK3mxM7X/nb9n2BcIUyx5X72Jtk=" }, "sddm-kcm": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/sddm-kcm-6.4.5.tar.xz", - "hash": "sha256-BFI/OCv86SWcRzxX2kRyvk+vkvmLbtQKskq2Y6M3ya0=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/sddm-kcm-6.5.0.tar.xz", + "hash": "sha256-cfMwxsiQp7LAcYiqnHd8arZvTLHbq4lP0hKkiR6fRSg=" }, "spacebar": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/spacebar-6.4.5.tar.xz", - "hash": "sha256-y9Kj7g9wXxP4tC3HcA+5K++4jQT37jZ57qJNwWxPieA=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/spacebar-6.5.0.tar.xz", + "hash": "sha256-nUU0uHx+lrDB/VSmg21fnKsexoGbmwriysrutBQpdNg=" }, "spectacle": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/spectacle-6.4.5.tar.xz", - "hash": "sha256-QqVvBZPAxce2YQiO9ubjKg6iSDVPu/20og86IbpVQOc=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/spectacle-6.5.0.tar.xz", + "hash": "sha256-4UZXxvHyU4o3lvkVv9K4IV9GfLNqQrwtrYhsqevw3PE=" }, "systemsettings": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/systemsettings-6.4.5.tar.xz", - "hash": "sha256-kNfwl/GnekAAdiJM26RblMcdD+xD79Ltc3BH8v8quo8=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/systemsettings-6.5.0.tar.xz", + "hash": "sha256-u2XQzDPoqguIupyTAKHnGwDi4LoCiMQcFAG0q+g9JZw=" }, "wacomtablet": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/wacomtablet-6.4.5.tar.xz", - "hash": "sha256-4MdcwKW9KTQfcFzFA/eP3Ul2yxWolBvrt3RIs2iCZyg=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/wacomtablet-6.5.0.tar.xz", + "hash": "sha256-jqzMQN1kSaWJCOkJsq7cuJ1vuiVC7F+kbttrJpGYJBc=" }, "xdg-desktop-portal-kde": { - "version": "6.4.5", - "url": "mirror://kde/stable/plasma/6.4.5/xdg-desktop-portal-kde-6.4.5.tar.xz", - "hash": "sha256-n+BPBIK78yYIg2nANde29APbDAaupZNEQqd4h5ntzuI=" + "version": "6.5.0", + "url": "mirror://kde/stable/plasma/6.5.0/xdg-desktop-portal-kde-6.5.0.tar.xz", + "hash": "sha256-9aRIU7Lm0IWKhigDiu6L/22EsewlsE7nqWHXPpYmGbc=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index 865d667f33af..b51adab7631f 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -18,6 +18,7 @@ kglobalacceld = callPackage ./kglobalacceld { }; kinfocenter = callPackage ./kinfocenter { }; kmenuedit = callPackage ./kmenuedit { }; + knighttime = callPackage ./knighttime { }; kpipewire = callPackage ./kpipewire { }; krdp = callPackage ./krdp { }; kscreen = callPackage ./kscreen { }; diff --git a/pkgs/kde/plasma/knighttime/default.nix b/pkgs/kde/plasma/knighttime/default.nix new file mode 100644 index 000000000000..e2604cae53c2 --- /dev/null +++ b/pkgs/kde/plasma/knighttime/default.nix @@ -0,0 +1,9 @@ +{ + mkKdeDerivation, + qtpositioning, +}: +mkKdeDerivation { + pname = "knighttime"; + + extraBuildInputs = [ qtpositioning ]; +} diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix index 7f1d1bd89a69..197f01162a8c 100644 --- a/pkgs/kde/plasma/krdp/default.nix +++ b/pkgs/kde/plasma/krdp/default.nix @@ -3,6 +3,7 @@ mkKdeDerivation, replaceVars, openssl, + pam, pkg-config, qtwayland, freerdp, @@ -19,6 +20,8 @@ mkKdeDerivation { extraNativeBuildInputs = [ pkg-config ]; extraBuildInputs = [ qtwayland + freerdp + pam ]; } diff --git a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch index 8ef18364b72c..21d9db7c0c82 100644 --- a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch +++ b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch @@ -1,13 +1,13 @@ diff --git a/src/kcm/kcmkrdpserver.cpp b/src/kcm/kcmkrdpserver.cpp -index 3af527c..3433a84 100644 +index 2d2c5e8..289c6f1 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")); +@@ -293,7 +293,7 @@ void KRDPServerConfig::generateCertificate() + QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + u"/krdpserver/krdp.key"_s); qDebug(KRDPKCM) << "Generating certificate files to: " << certificatePath << " and " << certificateKeyPath; QProcess sslProcess; -- sslProcess.start(u"openssl"_qs, -+ sslProcess.start(u"@openssl@"_qs, +- sslProcess.start(u"openssl"_s, ++ sslProcess.start(u"@openssl@"_s, { - u"req"_qs, - u"-nodes"_qs, + u"req"_s, + u"-nodes"_s, diff --git a/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch index 0d4481c70541..365ac8e3e160 100644 --- a/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch +++ b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch @@ -1,25 +1,13 @@ -From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 2 Nov 2021 06:00:32 -0500 -Subject: [PATCH 3/3] fusermount path - ---- - kded/engine/fusebackend_p.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp -index 91f3523..1c19d88 100644 +index 714b660..cb384fc 100644 --- a/kded/engine/fusebackend_p.cpp +++ b/kded/engine/fusebackend_p.cpp -@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg +@@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg QProcess *FuseBackend::fusermount(const QStringList &arguments) const { -- return process("fusermount", arguments, {}); +- return process(fusermountExecutable, arguments, {}); + return process(NIXPKGS_FUSERMOUNT, arguments, {}); } FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload) --- -2.33.1 - diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix index f933687143a8..c66377c87069 100644 --- a/pkgs/kde/plasma/plasma-vault/default.nix +++ b/pkgs/kde/plasma/plasma-vault/default.nix @@ -21,7 +21,7 @@ mkKdeDerivation { ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"'' ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"'' ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"'' - ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"'' + ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount3\"'' ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"'' ]; diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix index 90b76badce64..ebfa90da040d 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -2,7 +2,6 @@ lib, mkKdeDerivation, replaceVars, - dbus, fontconfig, xorg, lsof, @@ -24,7 +23,6 @@ mkKdeDerivation { patches = [ (replaceVars ./dependency-paths.patch { - dbusSend = lib.getExe' dbus "dbus-send"; fcMatch = lib.getExe' fontconfig "fc-match"; lsof = lib.getExe lsof; qdbus = lib.getExe' qttools "qdbus"; diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch index b4d46cd869bb..df8c5981dcfb 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/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp -index ba214a555d..421d940738 100644 ---- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp -+++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp -@@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath) +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) Q_EMIT blockingAppsReady(blockApps); p->deleteLater(); }); @@ -25,7 +25,7 @@ index e27e21a7bd..abbf7f32e1 100644 p.write(input); p.closeWriteChannel(); diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp -index 96417c440a..8c9bc2e9ab 100644 +index da28f13837..4af78b7850 100644 --- a/kcms/fonts/fonts.cpp +++ b/kcms/fonts/fonts.cpp @@ -137,7 +137,7 @@ void KFonts::save() @@ -51,7 +51,7 @@ index e4d1ad4311..d45bdfad98 100644 void CFcQuery::procExited() diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp -index f3c9956921..09c818739d 100644 +index 53f77d0a18..680e81b6e4 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 4d31c6f408..17418b1ff7 100644 +index b8474dd34f..7d0616e116 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber) @@ -119,7 +119,7 @@ index 4d31c6f408..17418b1ff7 100644 } QStringList allServices(const QLatin1String &prefix) -@@ -512,7 +512,7 @@ QProcess *setupKSplash() +@@ -508,7 +508,7 @@ QProcess *setupKSplash() if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; p->setProcessChannelMode(QProcess::ForwardedChannels); @@ -128,14 +128,3 @@ index 4d31c6f408..17418b1ff7 100644 } } return p; -diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in -index 1e903130a9..0861c3d136 100644 ---- a/startkde/systemd/plasma-ksplash-ready.service.in -+++ b/startkde/systemd/plasma-ksplash-ready.service.in -@@ -6,5 +6,5 @@ PartOf=graphical-session.target - - [Service] - Type=oneshot --ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready -+ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready - Slice=session.slice diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix index 26e9f16d477c..f87d21cd21b8 100644 --- a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix +++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix @@ -2,7 +2,6 @@ mkKdeDerivation, qtdeclarative, kirigami, - knotifications, }: mkKdeDerivation { pname = "polkit-kde-agent-1"; @@ -10,6 +9,5 @@ mkKdeDerivation { extraBuildInputs = [ qtdeclarative kirigami - knotifications ]; } diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix index 7902e83710ff..0773a7f7d428 100644 --- a/pkgs/kde/plasma/systemsettings/default.nix +++ b/pkgs/kde/plasma/systemsettings/default.nix @@ -1,5 +1,11 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + kauth, +}: mkKdeDerivation { pname = "systemsettings"; + + extraBuildInputs = [ kauth ]; + meta.mainProgram = "systemsettings"; } diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix index 50ebbea0d664..da2401736690 100644 --- a/pkgs/kde/third-party/applet-window-buttons6/default.nix +++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation rec { dontWrapQtApps = true; + # kdecoration headers include C++20 spaceship operator + env.NIX_CFLAGS_COMPILE = "-std=c++20"; + nativeBuildInputs = [ cmake extra-cmake-modules