diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index cbb0d5fff6cf..a453b9cf8cd8 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -85,7 +85,6 @@ let oxygen-icons = self.callPackage ./misc/oxygen-icons { }; phonon = self.callPackage ./misc/phonon { }; phonon-vlc = self.callPackage ./misc/phonon-vlc { }; - plasma-keyboard = self.callPackage ./misc/plasma-keyboard { }; plasma-wayland-protocols = self.callPackage ./misc/plasma-wayland-protocols { }; polkit-qt-1 = self.callPackage ./misc/polkit-qt-1 { }; pulseaudio-qt = self.callPackage ./misc/pulseaudio-qt { }; diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json index d8590511163a..e35f8b5d71f7 100644 --- a/pkgs/kde/generated/sources/plasma.json +++ b/pkgs/kde/generated/sources/plasma.json @@ -1,352 +1,367 @@ { "aurorae": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/aurorae-6.5.5.tar.xz", - "hash": "sha256-qNAe3T8EbtQbMtTxDSP3vi0F5puDb1s1jplLJAXHMJI=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/aurorae-6.6.0.tar.xz", + "hash": "sha256-or62Kn3J75xCbC+1RgN6O91qjyT7vhExNcW+23l9bXo=" }, "bluedevil": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/bluedevil-6.5.5.tar.xz", - "hash": "sha256-0rNLzQRC70xof9Uc0Gy2RPr9zTfcXkYk1lhMzb5ZzbY=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/bluedevil-6.6.0.tar.xz", + "hash": "sha256-2ZKMkFjivcHB/+HOkUd5j21VLnjBUTBWldM+O06tDuY=" }, "breeze": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/breeze-6.5.5.tar.xz", - "hash": "sha256-CbP3vSOGxLkcQYRi8CsgNRDyrohIk5jvBeC23eo6pZA=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/breeze-6.6.0.tar.xz", + "hash": "sha256-FiWUy3TS5sAz0ItF/FKQS0iPIyCXx6oCXYN78ef6OOg=" }, "breeze-grub": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/breeze-grub-6.5.5.tar.xz", - "hash": "sha256-GlRlY8ibuziyicPMdXW0prs2PQZ5XRK2zjlGm8dxwp4=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/breeze-grub-6.6.0.tar.xz", + "hash": "sha256-iGdl7Gr525Fnm813nAPCeInosorHBDwTD7uIurLCFYI=" }, "breeze-gtk": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/breeze-gtk-6.5.5.tar.xz", - "hash": "sha256-NdpOC4+7FowU5hGFJ9YZCJt6zD8SjiCowK2ECWtU0oE=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/breeze-gtk-6.6.0.tar.xz", + "hash": "sha256-3mTRrebetEAiAQbTlG/pn9RAS8WYsLtGazU6ZorZvbg=" }, "breeze-plymouth": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/breeze-plymouth-6.5.5.tar.xz", - "hash": "sha256-e7c4A55yRick+SUC6A7kQE+fD8POUbOmj+/7HcesOy0=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/breeze-plymouth-6.6.0.tar.xz", + "hash": "sha256-G8BnbhsqKlQxI3iBX1MAXiRKtOogFU8H46XwG7KUDR4=" }, "discover": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/discover-6.5.5.tar.xz", - "hash": "sha256-QgLdLYVLcWwVsvN0ll9cGvaZFdN5wlvL1ND7z3NpljQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/discover-6.6.0.tar.xz", + "hash": "sha256-0b36RrUQTebawt3acu+sfB1SYdwxjR5KfozaxunY5kU=" }, "drkonqi": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/drkonqi-6.5.5.tar.xz", - "hash": "sha256-eanuDxAR/HgTykGdjICYzjvp/3QTbTvYDvcw+3VH948=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/drkonqi-6.6.0.tar.xz", + "hash": "sha256-ujpzb+YC/7Eswkb0prZie2sFIuIgQAS108PsLk8ehXA=" }, "flatpak-kcm": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/flatpak-kcm-6.5.5.tar.xz", - "hash": "sha256-8iyDv0Su1oI41ZvSll1Bf0vnLbW5apslwvYEnZlR0gY=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/flatpak-kcm-6.6.0.tar.xz", + "hash": "sha256-0VeDeWQPYwWOu1pCQRlYIjwqobJrvxS48asc1cTgZnE=" }, "kactivitymanagerd": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kactivitymanagerd-6.5.5.tar.xz", - "hash": "sha256-h6D4hl8YD8adyrL+ddmoQPs5yZOTwdN8EaPTowFx+/g=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kactivitymanagerd-6.6.0.tar.xz", + "hash": "sha256-mAISeDGo/vbC1EadqrslqFNjCbh7O61rsZMxSJ1mhWw=" }, "kde-cli-tools": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kde-cli-tools-6.5.5.tar.xz", - "hash": "sha256-CDtdPI5jFVVFR+H8U4x9nwZx4I98UvK8Clo0UCehInk=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kde-cli-tools-6.6.0.tar.xz", + "hash": "sha256-tFGzuAyH5+ZWLPmpxmn0LzdvgiZmYpLpIdr6/TRRHa0=" }, "kde-gtk-config": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kde-gtk-config-6.5.5.tar.xz", - "hash": "sha256-ZmtKXtH8uWnJjBArVHfDUdBzQi1PqA64SkGwB9nZiFo=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kde-gtk-config-6.6.0.tar.xz", + "hash": "sha256-9+ZYUmXpbaQlueVLU2BQqHVfSOgqOKJKg3/3Yrkjcjw=" }, "kdecoration": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kdecoration-6.5.5.tar.xz", - "hash": "sha256-3CF7xjdPB6QntteN5nexh46a9HNSxq3euJQmIRtTaBo=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kdecoration-6.6.0.tar.xz", + "hash": "sha256-aoan47qz3C4/ZIZojoUCpcGs7BN5uwhfhTsOgprmSjs=" }, "kdeplasma-addons": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kdeplasma-addons-6.5.5.tar.xz", - "hash": "sha256-MrabmHJYmYuVAXzwirodhbmGMDvVnhu8YA7RLiGE9cs=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kdeplasma-addons-6.6.0.tar.xz", + "hash": "sha256-31hRkDj4+gLzmcPr0G1oYIgGQfK9aFZrIgchL5ujQjU=" }, "kgamma": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kgamma-6.5.5.tar.xz", - "hash": "sha256-LDdaJW02wrC8NAeikPuFYY+tTFo9QTELbHFalDi/PjY=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kgamma-6.6.0.tar.xz", + "hash": "sha256-bwsj4bvvhBsNb8W3Cq/RyokVKdbbb2EtFaACpHTpYi8=" }, "kglobalacceld": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kglobalacceld-6.5.5.tar.xz", - "hash": "sha256-aj5S2VftEB4U2Z4taDD1QzUBfuv6/93sjU/Ldl3cAXY=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kglobalacceld-6.6.0.tar.xz", + "hash": "sha256-XdX1gmMMg4sbu/FjiUsbSFpGHz6EO4T/qmUhZkVp22w=" }, "kinfocenter": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kinfocenter-6.5.5.tar.xz", - "hash": "sha256-VnuPn0yAZBTPQX/Vms6qN0hWlr1rZVrqAf/9bivVuBw=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kinfocenter-6.6.0.tar.xz", + "hash": "sha256-a9uLarSrwZl+qE18iuThfBe1NhGAK7hOx00JUHKk10U=" }, "kmenuedit": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kmenuedit-6.5.5.tar.xz", - "hash": "sha256-RQXYIF4tyNAJ4LuDCACI1JkIXBZ1++21U7Ib0v0fAp8=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kmenuedit-6.6.0.tar.xz", + "hash": "sha256-Nsnk59PHnxyO/ly6P6eUlzqxpVW8yl0JxpVQdv3Um+E=" }, "knighttime": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/knighttime-6.5.5.tar.xz", - "hash": "sha256-oSQwu3BZ+Ga7Ky9DUZZb61S1TRUC1IKsnztDqV+nNqM=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/knighttime-6.6.0.tar.xz", + "hash": "sha256-bzKOHo1ubiJijzZL8EmlNYlfCMtWX7FVG3XX3mF46Lc=" }, "kpipewire": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kpipewire-6.5.5.tar.xz", - "hash": "sha256-SqzbRAywnfQYIoqvzhLSVlqJSzqLmPNPBapabx6841Q=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kpipewire-6.6.0.tar.xz", + "hash": "sha256-g3PJQkGzgzHxWmkROQERSiXnJyyFUhrSMwseYPBtGiY=" }, "krdp": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/krdp-6.5.5.tar.xz", - "hash": "sha256-gats9wFiATrYcq9h/NEfLNapSP2BUXn9KAy9cRsXOb0=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/krdp-6.6.0.tar.xz", + "hash": "sha256-XDwXxXUg8fLpdGKeqp3XtFfU7VBebwbLtpPbF0Ui3tk=" }, "kscreen": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kscreen-6.5.5.tar.xz", - "hash": "sha256-B8miMoJeFicynndVaQjfqP7BkWbD+w4eQi/BzQ6DxT8=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kscreen-6.6.0.tar.xz", + "hash": "sha256-pWq+tUfkM0c1cRV/4xPILyfxFAleFErkNHUSdGWD2SQ=" }, "kscreenlocker": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kscreenlocker-6.5.5.tar.xz", - "hash": "sha256-FQ1knpJaK9On4QR7fiv16VQWMqMSUv0jrkSPt7QT8z4=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kscreenlocker-6.6.0.tar.xz", + "hash": "sha256-9dYP7+WA4dgy9a8bdMolNX0OBOZtrtdTMAa31WL8vVg=" }, "ksshaskpass": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/ksshaskpass-6.5.5.tar.xz", - "hash": "sha256-GR5yn2RCuRa1PcNagwsBiPdOog72UlsyaYOuWBXsa8s=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/ksshaskpass-6.6.0.tar.xz", + "hash": "sha256-KKd1pSvi+2fEQEr9+BkTIVIYNUHL3b4LFXU+ewxjQfY=" }, "ksystemstats": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/ksystemstats-6.5.5.tar.xz", - "hash": "sha256-xRCXQD0ITyL82FNM5vQ5BQtYoqxglTrOLccBJBKtzp0=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/ksystemstats-6.6.0.tar.xz", + "hash": "sha256-W9t+gmYIvhSacJ0QhalpIMeQqtbgaVw/jbDOvEyDvuE=" }, "kwallet-pam": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kwallet-pam-6.5.5.tar.xz", - "hash": "sha256-FPoB/nEyeu/jb+X8eUEzuvfIrUcAq4onMpBN3IPrF7Y=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kwallet-pam-6.6.0.tar.xz", + "hash": "sha256-WrYCaXV4XiFhBf1YNisoMqsHW2jB0kK3MqVWF5zEygU=" }, "kwayland": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kwayland-6.5.5.tar.xz", - "hash": "sha256-XbAQXt7Ox/i0KZQL4dJt/+LZ37sNln6eFr3bCiLP05c=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kwayland-6.6.0.tar.xz", + "hash": "sha256-bhgKQjU5CirnKW5qdgoOeleXHgB5Cu0NmNcQNPEnSAE=" }, "kwayland-integration": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kwayland-integration-6.5.5.tar.xz", - "hash": "sha256-W0cKgtHfyJ4ZPg/TNQCJXW0kQOeACpJhrQtsEt5ikBI=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kwayland-integration-6.6.0.tar.xz", + "hash": "sha256-kyhCUrjPFTXLRoS5CvWrPVXUUU1jJvZBtN6ZqzRcJE0=" }, "kwin": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kwin-6.5.5.tar.xz", - "hash": "sha256-+62EUEQjEXTKeq1FVy0XE9G29lKJ2UysJHdqED8FHkY=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kwin-6.6.0.tar.xz", + "hash": "sha256-NRNPz7ZNAZBM3NJa6o6Qxow3lzoIiXHk1nis/cUCCRQ=" }, "kwin-x11": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kwin-x11-6.5.5.tar.xz", - "hash": "sha256-ibnUEjT2+b/of7Ry13rv0aj5pEfENXFp3PgQrUTpsdQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kwin-x11-6.6.0.tar.xz", + "hash": "sha256-k8OqWBwvFtm/5oR9FXIffKZrg8fhAd/0UGluEchlyGY=" }, "kwrited": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/kwrited-6.5.5.tar.xz", - "hash": "sha256-0Kzkb9DtiNo+pBv6bicOoWuBRJhbWMX6Aa65q/DZqIw=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/kwrited-6.6.0.tar.xz", + "hash": "sha256-sBG1SJdLPVtm5qjRfggVPvH/ySKeDsJtIoT3ZWHne98=" }, "layer-shell-qt": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/layer-shell-qt-6.5.5.tar.xz", - "hash": "sha256-aET+5VuLfLwyDNgwi1FZXvgw1ambTTVbD9WfiP6rLBE=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/layer-shell-qt-6.6.0.tar.xz", + "hash": "sha256-RVFSanRqGfjkexQZ5kXuWVuuciumuO7ciMBrkX/t6so=" }, "libkscreen": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/libkscreen-6.5.5.tar.xz", - "hash": "sha256-WVvwbNiwyQaACjTv19k+Ra3Zny9+kkjA6CA6g47IYfk=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/libkscreen-6.6.0.tar.xz", + "hash": "sha256-A5b+OzGtZjYv0aM2JkYYf0008RFJDNsQWUqJwIjFNGc=" }, "libksysguard": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/libksysguard-6.5.5.tar.xz", - "hash": "sha256-IrjkgSsd+mrvGPJ9K6ZtbXcCs+TbJQyuSKuUYZbac00=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/libksysguard-6.6.0.tar.xz", + "hash": "sha256-1FvhUbGLRp27thkUNePwqeZ10Hvx218I8cfcSlenHWI=" }, "libplasma": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/libplasma-6.5.5.tar.xz", - "hash": "sha256-fYj5vQ+QuQ9NIpDNj6DzfnrzgQoO1Yx9ImoCg4q4pxo=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/libplasma-6.6.0.tar.xz", + "hash": "sha256-hmAQmBa7uQo2d8e6hZBzQi0muxGADYzir6MIcZQ8Feg=" }, "milou": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/milou-6.5.5.tar.xz", - "hash": "sha256-6B0JmgLZ+0gA2Zczj8hCjYjIshBw4kqNNtwdChI9id0=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/milou-6.6.0.tar.xz", + "hash": "sha256-9IyixnNMKt8lB4Y3nc05HZQX7dTWYgIJRBbppH3HcQ4=" }, "ocean-sound-theme": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/ocean-sound-theme-6.5.5.tar.xz", - "hash": "sha256-zmKcyZkKPcOB071Fw3g4phj1ECF2GjdnHnS5pFYkoSw=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/ocean-sound-theme-6.6.0.tar.xz", + "hash": "sha256-k0H1TNZW+KttwhZH00fixbnwmybMjGk1lJBBz7EIBHM=" }, "oxygen": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/oxygen-6.5.5.tar.xz", - "hash": "sha256-oYEUGEqA9gYJ8UwSnud1V458fyp0eksVyCd+EPXKxv4=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/oxygen-6.6.0.tar.xz", + "hash": "sha256-e797nKufLTJTgrd30b2BoVNAfHTfFhCiPpG0qgyvFaM=" }, "oxygen-sounds": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/oxygen-sounds-6.5.5.tar.xz", - "hash": "sha256-U7ittiPZdp3zoP9HxeXtTLHA9cB5TvJURpwNqTAbJM8=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/oxygen-sounds-6.6.0.tar.xz", + "hash": "sha256-dn3tj7QXv6tQjweOhoSsMwTQCDQIx+AVRFIooOg0Bi4=" }, "plasma-activities": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-activities-6.5.5.tar.xz", - "hash": "sha256-T+WYDrzHRwIW2M6TcAPA+TuUFrC2FaP4oEiM0m7lpRE=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-activities-6.6.0.tar.xz", + "hash": "sha256-MISO/5WVi9DaCTpNAAan3UVQ6h9wg48JqV65vV54T6E=" }, "plasma-activities-stats": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-activities-stats-6.5.5.tar.xz", - "hash": "sha256-fygbaEDTP5NKQlL9dIRpEzISFEcv5DHlQyuJH40hKhA=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-activities-stats-6.6.0.tar.xz", + "hash": "sha256-A/572n2y3TDLJsu4fSgpllUyQ5qNZTK+CJ4xdinqm1o=" }, "plasma-browser-integration": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-browser-integration-6.5.5.tar.xz", - "hash": "sha256-iOmizL7vorsvu/+GsZ2KxFF2EAqJFTYoreFz7Wwb2e4=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-browser-integration-6.6.0.tar.xz", + "hash": "sha256-8Jwufc3KU9AoTa2dFyte9bnyNoz6u+ZENIyncFeE59w=" }, "plasma-desktop": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-desktop-6.5.5.tar.xz", - "hash": "sha256-I2fxJTFXWy5EXNKw+gt1bxUfEOqic1iwlmc1/0ABRsc=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-desktop-6.6.0.tar.xz", + "hash": "sha256-2R5N0nbqGtdD4xrOhZo27E37QxSVyB6xqOsypJxz80I=" }, "plasma-dialer": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-dialer-6.5.5.tar.xz", - "hash": "sha256-mxcKj4vt4Gbcpq/faJFN6GUrDTSA9CqRfCdfHUCVG0g=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-dialer-6.6.0.tar.xz", + "hash": "sha256-ie+Y0g52CZtvEX9f5JywamRt++EARNIIP5WcXOtIcFo=" }, "plasma-disks": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-disks-6.5.5.tar.xz", - "hash": "sha256-3zhj67/R/ckl4BsfyV6QYBakUtd4VKIPyyKXaB3Ea3c=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-disks-6.6.0.tar.xz", + "hash": "sha256-Sk4QOOjw/0NHUYaNUDc/seI6DywF/BiqwT+NJ0KwuCM=" }, "plasma-firewall": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-firewall-6.5.5.tar.xz", - "hash": "sha256-5Uy2ESvaaC2D7g/cmzY9k+sz5swKDnR65p3lRvL1oFw=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-firewall-6.6.0.tar.xz", + "hash": "sha256-b2Q3QOdlfKPx1jWdx9lpSisCX9AeW4350xwy3T+9pG8=" }, "plasma-integration": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-integration-6.5.5.tar.xz", - "hash": "sha256-rVr4WtwHcqH5vNzKUbHL3aLvKJG1HCsbCjiKKFId48U=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-integration-6.6.0.tar.xz", + "hash": "sha256-WmnQEtosv8bU2Rd1MfGmjGDLAj+94RTV1elWN7YYnfs=" + }, + "plasma-keyboard": { + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-keyboard-6.6.0.tar.xz", + "hash": "sha256-zC7pFU5V4aSck0qostQUanIJhZ3lgFfZbSl1YWUrdtw=" + }, + "plasma-login-manager": { + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-login-manager-6.6.0.tar.xz", + "hash": "sha256-dJjelWswi3H9QmdgKCCSNeK3+/eT7uAp5lSEl54u8NQ=" }, "plasma-mobile": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-mobile-6.5.5.tar.xz", - "hash": "sha256-hH16ZwE0w20Pe4yjPEGsdyyEoGbHkMdQAnFzm3b/VIA=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-mobile-6.6.0.tar.xz", + "hash": "sha256-RUL/2sxtjuodaQz1PAxa19xaVh622oHHccYyzkZ2RhM=" }, "plasma-nano": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-nano-6.5.5.tar.xz", - "hash": "sha256-VMfyoDqsAdtzX72kcpRzx5miE12oaPGHWdMLubYe794=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-nano-6.6.0.tar.xz", + "hash": "sha256-PoiBgnhpB9kXJanPGM8VuFC409C48T/HAW5HpcITv7Y=" }, "plasma-nm": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-nm-6.5.5.tar.xz", - "hash": "sha256-+wlvG8hfXrHuiugN8ERHmGCYfIvOzUq3Eg/tJTaYwqA=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-nm-6.6.0.tar.xz", + "hash": "sha256-AeVD1cbxAfsuAc7v19Qzi34u0LLWdUbXIn7TqnjdXVA=" }, "plasma-pa": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-pa-6.5.5.tar.xz", - "hash": "sha256-Yn6QwWBmmEDSnw/6g/Ul4exp4wbf89w1wdsoJSexpYc=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-pa-6.6.0.tar.xz", + "hash": "sha256-zQOK72PaXjew8XDmP+GCuTwqNitnVt0mwtUEFgUnBfo=" }, "plasma-sdk": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-sdk-6.5.5.tar.xz", - "hash": "sha256-ttxIUgzNpEFbCqamZQLbcYC80+HYl1pfIEBRnvcJOcQ=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-sdk-6.6.0.tar.xz", + "hash": "sha256-yFInW8YkL8RnklgW1IvvpzICUNrACX1jNxwn6vfBeAw=" + }, + "plasma-setup": { + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-setup-6.6.0.tar.xz", + "hash": "sha256-+DfQyLymYRn4x+2TXj3MA91uxysydtbBbplyi7nMEE4=" }, "plasma-systemmonitor": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-systemmonitor-6.5.5.tar.xz", - "hash": "sha256-i+k/qV1RDytTrIqG9+ZqoQ5UgK82MuQZaJvbWtM+8f4=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-systemmonitor-6.6.0.tar.xz", + "hash": "sha256-wQXtaGrQeZqJv5aCE6tKcZgg2OsmCb12Az1laAeu+Vg=" }, "plasma-thunderbolt": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-thunderbolt-6.5.5.tar.xz", - "hash": "sha256-73uAJxPRw5mIbMJDfD8+pL/Zret0puFbmobvP3s3hik=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-thunderbolt-6.6.0.tar.xz", + "hash": "sha256-JBCG63aweff6iG92ARmqNjG6jHZoAx868O/pojzYYT4=" }, "plasma-vault": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-vault-6.5.5.tar.xz", - "hash": "sha256-PR3P9GO8bLfDKGJPep6eMlkagtKDvImxnrngdpzK+nA=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-vault-6.6.0.tar.xz", + "hash": "sha256-VP++tYAzqLnup1zU2SgtOxSmOJDFk+QEkClUESWi7zA=" }, "plasma-welcome": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-welcome-6.5.5.tar.xz", - "hash": "sha256-MuKcqjUHBH94aFeg3RCDCDWDegtbsdZ9S39OVUDgCSA=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-welcome-6.6.0.tar.xz", + "hash": "sha256-ILm7Pw3osmLH5aDdqJ0jV12TLxXjFiMzN1DEq8XM9ac=" }, "plasma-workspace": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-workspace-6.5.5.tar.xz", - "hash": "sha256-KbB2O7vdnidBbc4f2TkkLSWI/u82xMuulBwxlk1TH9Q=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-workspace-6.6.0.tar.xz", + "hash": "sha256-CY4f3bMGAIVSSL6jbgEsD1/xLRujOBoc5CAF5NIwTW4=" }, "plasma-workspace-wallpapers": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma-workspace-wallpapers-6.5.5.tar.xz", - "hash": "sha256-W1n3pDf+K12ML7pGCuikcjeOTEvUL6clqQc1vPXzoLE=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma-workspace-wallpapers-6.6.0.tar.xz", + "hash": "sha256-Z7HUhWkU19iMCnfCtS6DqnP65ju2TSup4zmTfAh8GRw=" }, "plasma5support": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plasma5support-6.5.5.tar.xz", - "hash": "sha256-Gi8+fruF4qHFTDqjK3EujyhSiXWLosgjbsDcZt2MXP0=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plasma5support-6.6.0.tar.xz", + "hash": "sha256-5ucVeVDBKrMwmVZ88oudlWnS4mVXFboSOGTRj2BxJis=" }, "plymouth-kcm": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/plymouth-kcm-6.5.5.tar.xz", - "hash": "sha256-/bBtR3PSbhnK+wDPckGh1AJsmoVLyXTQjck6qsy9Eec=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/plymouth-kcm-6.6.0.tar.xz", + "hash": "sha256-2dKax0X8Y6rzlSbMtPYCuGk+uCqMmjlMqc9+01kIVOc=" }, "polkit-kde-agent-1": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/polkit-kde-agent-1-6.5.5.tar.xz", - "hash": "sha256-512CfltUwOoF56Aa6Qs9PYOd/1/L4JA6vwUn3K4ZPUo=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/polkit-kde-agent-1-6.6.0.tar.xz", + "hash": "sha256-qdzvAS9uG7VOoa7jlxCNaDzMt3oPLHYgENdUdoS0aSs=" }, "powerdevil": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/powerdevil-6.5.5.tar.xz", - "hash": "sha256-H2fBTQXfnN+GVx3YbDOtkehV5Vlcq6t/Qiib9+Nev+Q=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/powerdevil-6.6.0.tar.xz", + "hash": "sha256-UpDbhrpUbZ/HrEaNTX5odZpHa8e5vod1zg3eovTC204=" }, "print-manager": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/print-manager-6.5.5.tar.xz", - "hash": "sha256-OgSG1T56MXrMR8ManNPMKpvbAxlu5famvvq6jWH4uiU=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/print-manager-6.6.0.tar.xz", + "hash": "sha256-m0UGnY5hv6XSz5WP1WLRj+Dcy2dwCNmazutVmbgIte0=" }, "qqc2-breeze-style": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/qqc2-breeze-style-6.5.5.tar.xz", - "hash": "sha256-HOe2QVcPcRHXUbVEAOgIMuDDEi08tqTCoBsWwu1xta8=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/qqc2-breeze-style-6.6.0.tar.xz", + "hash": "sha256-cMQHYnFE1ZxYXC9DDpg0oBSANnjxbKUU5fv3pcuDr+w=" }, "sddm-kcm": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/sddm-kcm-6.5.5.tar.xz", - "hash": "sha256-7Xt1fRcnYcH/wbLxdm3Q8cpAGBgGSVb48cLUxaoLPU8=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/sddm-kcm-6.6.0.tar.xz", + "hash": "sha256-FepTheJ5dzmLlwAWg4ugwF2y/4CtOdtfrOys8B78+Vc=" }, "spacebar": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/spacebar-6.5.5.tar.xz", - "hash": "sha256-bnc21uA1YWUgieQA/E/OoSWfCo8c1mLuJODzF+y3uz0=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/spacebar-6.6.0.tar.xz", + "hash": "sha256-faBiuQOyFf8gyh7sHwS33EsrY+81iNRs1xwtSefyRoE=" }, "spectacle": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/spectacle-6.5.5.tar.xz", - "hash": "sha256-HZQquMgRUDNmdve7NX3+25r6kDvnHJCV43DZTIF1kro=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/spectacle-6.6.0.tar.xz", + "hash": "sha256-qhSn/aoMRDEfDEHzUCrzk3TGUFfFFbd5aC1dvZT8v+M=" }, "systemsettings": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/systemsettings-6.5.5.tar.xz", - "hash": "sha256-hnf+B+ZrrXh+fvQ+k1KWwgGXOk7JUFugDW86/kscwsY=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/systemsettings-6.6.0.tar.xz", + "hash": "sha256-0Mi/monOpfHXRjsRUFTABg36jvueJyC3J8qAz2v/Ykk=" }, "wacomtablet": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/wacomtablet-6.5.5.tar.xz", - "hash": "sha256-vgyVThmE6Iw/W43NaWVIG9UOua/lElYsEzH0YMG0Z9I=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/wacomtablet-6.6.0.tar.xz", + "hash": "sha256-u4Zb35LGmcQkXu7ENQVcfEUz8q01qCMi8lxMJ+yg6RY=" }, "xdg-desktop-portal-kde": { - "version": "6.5.5", - "url": "mirror://kde/stable/plasma/6.5.5/xdg-desktop-portal-kde-6.5.5.tar.xz", - "hash": "sha256-oofxhnoFs5oiYoXwEPsiV0LnZYMcuBy8HqiCA1n4zSk=" + "version": "6.6.0", + "url": "mirror://kde/stable/plasma/6.6.0/xdg-desktop-portal-kde-6.6.0.tar.xz", + "hash": "sha256-htpZ7238nfEyyzMixlEKtWRW9T4/F3I1fUU9o+oe/kI=" } } \ No newline at end of file diff --git a/pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch b/pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch index 39c47d235f59..0832ea4f6ff8 100644 --- a/pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch +++ b/pkgs/kde/plasma/aurorae/0001-follow-symlinks.patch @@ -1,5 +1,5 @@ ---- a/src/aurorae.cpp -+++ b/src/aurorae.cpp +--- a/v1/aurorae.cpp ++++ b/v1/aurorae.cpp @@ -201,7 +201,7 @@ void Helper::init() // so let's try to locate our plugin: QString pluginPath; diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix index b51adab7631f..18a9a67a9162 100644 --- a/pkgs/kde/plasma/default.nix +++ b/pkgs/kde/plasma/default.nix @@ -47,11 +47,14 @@ plasma-disks = callPackage ./plasma-disks { }; plasma-firewall = callPackage ./plasma-firewall { }; plasma-integration = callPackage ./plasma-integration { }; + plasma-keyboard = callPackage ./plasma-keyboard { }; + plasma-login-manager = callPackage ./plasma-login-manager { }; plasma-mobile = callPackage ./plasma-mobile { }; plasma-nano = callPackage ./plasma-nano { }; plasma-nm = callPackage ./plasma-nm { }; plasma-pa = callPackage ./plasma-pa { }; plasma-sdk = callPackage ./plasma-sdk { }; + plasma-setup = callPackage ./plasma-setup { }; plasma-systemmonitor = callPackage ./plasma-systemmonitor { }; plasma-thunderbolt = callPackage ./plasma-thunderbolt { }; plasma-vault = callPackage ./plasma-vault { }; diff --git a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch index 818b3489aaeb..fcf367a9ffdd 100644 --- a/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch +++ b/pkgs/kde/plasma/kinfocenter/0001-tool-paths.patch @@ -1,5 +1,5 @@ diff --git a/kcms/audio_information/kcm_audio_information.json b/kcms/audio_information/kcm_audio_information.json -index 7ece92ee..a4fb6664 100644 +index 5648bb73..28db7ffb 100644 --- a/kcms/audio_information/kcm_audio_information.json +++ b/kcms/audio_information/kcm_audio_information.json @@ -82,7 +82,7 @@ @@ -25,7 +25,7 @@ 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 f73cf5a5..b18ecbfb 100644 +index 5d864d49..8ea55707 100644 --- a/kcms/block_devices/kcm_block_devices.json +++ b/kcms/block_devices/kcm_block_devices.json @@ -82,7 +82,7 @@ @@ -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 e8fb086e..c87b98f8 100644 +index 7541b258..3ba7f289 100644 --- a/kcms/cpu/kcm_cpu.json +++ b/kcms/cpu/kcm_cpu.json -@@ -104,7 +104,7 @@ +@@ -102,7 +102,7 @@ "Name[zh_CN]": "CPU", "Name[zh_TW]": "CPU" }, @@ -64,15 +64,15 @@ index e8fb086e..c87b98f8 100644 "X-KDE-Keywords": "cpu,amd,intel,arm,instructions,cores,architecture,byte order", "X-KDE-Keywords[ar]": "cpu,amd,intel,arm,instructions,cores,architecture,byte order,تعليمات,أنوية,معمارية", diff --git a/kcms/cpu/main.cpp b/kcms/cpu/main.cpp -index 608381eb..8fd7914f 100644 +index 96481ffb..198fef96 100644 --- a/kcms/cpu/main.cpp +++ b/kcms/cpu/main.cpp @@ -16,7 +16,7 @@ public: explicit KCMCPU(QObject *parent, const KPluginMetaData &data) : KQuickConfigModule(parent, data) { -- m_outputContext = new CommandOutputContext(QStringLiteral("lscpu"), {}, parent); -+ m_outputContext = new CommandOutputContext(QStringLiteral("@lscpu@"), {}, parent); +- m_outputContext = new CommandOutputContext(QStringLiteral("lscpu"), {QStringLiteral("--hierarchic=always")}, parent); ++ m_outputContext = new CommandOutputContext(QStringLiteral("@lscpu@"), {QStringLiteral("--hierarchic=always")}, parent); } CommandOutputContext *outputContext() const { @@ -90,18 +90,18 @@ 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 e180df8d..3d5bbd0b 100644 +index 4639da41..1afb5522 100644 --- a/kcms/edid/kcm_edid.json +++ b/kcms/edid/kcm_edid.json -@@ -72,7 +72,7 @@ +@@ -74,7 +74,7 @@ "Name[zh_CN]": "EDID", "Name[zh_TW]": "EDID" }, - "TryExec": "di-edid-decode", + "TryExec": "@di_edid_decode@", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "EDID,Graphics", - "X-KDE-Keywords[ar]": "EDID,Graphics,الرسوميات,بيانات تعريف العرض الممتدة", + "X-KDE-Keywords": "EDID,Graphics,dxdiag", + "X-KDE-Keywords[ar]": "EDID,Graphics,الرسوميات,بيانات تعريف العرض الممتدة,dxdiag", diff --git a/kcms/edid/main.cpp b/kcms/edid/main.cpp index 9f04e7fd..8ef37d2c 100644 --- a/kcms/edid/main.cpp @@ -116,18 +116,18 @@ index 9f04e7fd..8ef37d2c 100644 [[nodiscard]] CommandOutputContext *outputContext() const { diff --git a/kcms/egl/kcm_egl.json b/kcms/egl/kcm_egl.json -index 02a90071..64bfb609 100644 +index a5a21cd6..cddef596 100644 --- a/kcms/egl/kcm_egl.json +++ b/kcms/egl/kcm_egl.json -@@ -104,7 +104,7 @@ +@@ -102,7 +102,7 @@ "Name[zh_CN]": "OpenGL (EGL)", "Name[zh_TW]": "OpenGL (EGL)" }, - "TryExec": "eglinfo", + "TryExec": "@eglinfo@", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL", - "X-KDE-Keywords[ar]": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL,بطاقة الرسوميات,تسريع العتاد,رسوميات", + "X-KDE-Keywords": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL,dxdiag", + "X-KDE-Keywords[ar]": "OpenGL,DRI,3D,VideoCard,Hardware Acceleration,Graphics,EGL,بطاقة الرسوميات,تسريع العتاد,رسوميات,dxdiag", diff --git a/kcms/egl/main.cpp b/kcms/egl/main.cpp index 1a509dac..886a62d8 100644 --- a/kcms/egl/main.cpp @@ -155,18 +155,18 @@ index eab20e0f..5a0d2499 100644 {executable}, Qt::TextFormat::RichText, diff --git a/kcms/glx/kcm_glx.json b/kcms/glx/kcm_glx.json -index 8a56690a..e2caaec7 100644 +index 900d8d6a..c1bef34f 100644 --- a/kcms/glx/kcm_glx.json +++ b/kcms/glx/kcm_glx.json -@@ -103,7 +103,7 @@ +@@ -101,7 +101,7 @@ "Name[zh_CN]": "OpenGL (GLX)", "Name[zh_TW]": "OpenGL (GLX)" }, - "TryExec": "glxinfo", + "TryExec": "@glxinfo@", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display", - "X-KDE-Keywords[ar]": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,بطاقة الرسوميات,تسريع العتاد,الرسوميات", + "X-KDE-Keywords": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,dxdiag", + "X-KDE-Keywords[ar]": "OpenGL,DRI,GLX,3D,VideoCard,Hardware Acceleration,Graphics,X,X11,Xserver,X-Server,XFree86,Display,بطاقة,dxdiag الرسوميات,تسريع العتاد,الرسوميات", diff --git a/kcms/glx/main.cpp b/kcms/glx/main.cpp index a7317411..a6c5621d 100644 --- a/kcms/glx/main.cpp @@ -181,7 +181,7 @@ index a7317411..a6c5621d 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/helpers/dmidecode-helper/helper.cpp b/kcms/helpers/dmidecode-helper/helper.cpp -index 11921934..1160c5f0 100644 +index 2c009acd..f6c1c8e5 100644 --- a/kcms/helpers/dmidecode-helper/helper.cpp +++ b/kcms/helpers/dmidecode-helper/helper.cpp @@ -20,10 +20,7 @@ auto make_array(Input &&...args) -> std::array // NB: w @@ -197,17 +197,18 @@ index 11921934..1160c5f0 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 9e502d52..f9f26cbd 100644 +index d173229d..71815467 100644 --- a/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in +++ b/kcms/kwinsupportinfo/kcm_kwinsupportinfo.json.in -@@ -95,6 +95,6 @@ +@@ -95,7 +95,7 @@ "Name[zh_CN]": "窗口管理器", "Name[zh_TW]": "視窗管理員" }, - "TryExec": "@QtBinariesDir@/qdbus", + "TryExec": "@qdbus@", - "X-KDE-KInfoCenter-Category": "graphical_information" - } + "X-KDE-KInfoCenter-Category": "graphical_information", + "X-KDE-Keywords": "dxdiag", + "X-KDE-Keywords[ar]": "dxdiag", diff --git a/kcms/kwinsupportinfo/main.cpp b/kcms/kwinsupportinfo/main.cpp index ddb55b5c..8dc6b668 100644 --- a/kcms/kwinsupportinfo/main.cpp @@ -222,7 +223,7 @@ index ddb55b5c..8dc6b668 100644 parent); } diff --git a/kcms/memory/kcm_memory.json b/kcms/memory/kcm_memory.json -index 20df9662..6a64c762 100644 +index 87ad4a4c..e3f07e81 100644 --- a/kcms/memory/kcm_memory.json +++ b/kcms/memory/kcm_memory.json @@ -134,7 +134,7 @@ @@ -235,10 +236,10 @@ index 20df9662..6a64c762 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 5fc677a5..59ec49da 100644 +index 4ab2e0f1..559baf6f 100644 --- a/kcms/network/kcm_network.json +++ b/kcms/network/kcm_network.json -@@ -148,7 +148,7 @@ +@@ -146,7 +146,7 @@ "Name[zh_CN]": "网络接口", "Name[zh_TW]": "網路介面" }, @@ -248,20 +249,20 @@ index 5fc677a5..59ec49da 100644 "X-KDE-Keywords": "network,nic,ip,ip address,mac,inet,eth,wlan,wifi", "X-KDE-Keywords[ar]": "network,nic,ip,ip address,mac,inet,eth,wlan,wifi,الشبكة,شبكة الاتصال,عنوان IP,عنوان IP,جهاز Mac,شبكة الإنترنت,شبكة ETH,شبكة WLAN,شبكة Wi-Fi", diff --git a/kcms/network/main.cpp b/kcms/network/main.cpp -index f02577a3..479e18df 100644 +index a49284d3..77818fe2 100644 --- a/kcms/network/main.cpp +++ b/kcms/network/main.cpp -@@ -18,7 +18,7 @@ public: - explicit KCMNetwork(QObject *parent, const KPluginMetaData &data) - : KQuickConfigModule(parent, data) +@@ -24,7 +24,7 @@ public: { -- m_outputContext = new CommandOutputContext(u"ip"_s, {u"address"_s}, parent); -+ m_outputContext = new CommandOutputContext(u"@ip@"_s, {u"address"_s}, parent); + const QString executable = QStandardPaths::locate(QStandardPaths::GenericDataLocation, u"kinfocenter/network/ip.sh"_s, QStandardPaths::LocateFile); + const QString darkness = QGuiApplication::styleHints()->colorScheme() == Qt::ColorScheme::Dark ? u"1"_s : u"0"_s; +- m_outputContext = new CommandOutputContext({u"ip"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent); ++ m_outputContext = new CommandOutputContext({u"@ip@"_s, u"aha"_s}, u"/bin/sh"_s, {executable, darkness}, Qt::TextFormat::RichText, parent); } CommandOutputContext *outputContext() const { diff --git a/kcms/opencl/kcm_opencl.json b/kcms/opencl/kcm_opencl.json -index 61706cb9..b7fb9c59 100644 +index e63b60a9..93f1f484 100644 --- a/kcms/opencl/kcm_opencl.json +++ b/kcms/opencl/kcm_opencl.json @@ -92,7 +92,7 @@ @@ -271,8 +272,8 @@ index 61706cb9..b7fb9c59 100644 - "TryExec": "clinfo", + "TryExec": "@clinfo@", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "OpenCL,VideoCard,Hardware Acceleration,Graphics", - "X-KDE-Keywords[ar]": "OpenCL,VideoCard,Hardware Acceleration,Graphics,بطاقة الفيديو,تسريع العتاد,الرسوميات", + "X-KDE-Keywords": "OpenCL,VideoCard,Hardware Acceleration,Graphics,dxdiag", + "X-KDE-Keywords[ar]": "OpenCL,VideoCard,Hardware Acceleration,Graphics,بطاقة الفيديو,تسريع العتاد,الرسوميات,dxdiag", diff --git a/kcms/opencl/main.cpp b/kcms/opencl/main.cpp index d58728ab..88733d46 100644 --- a/kcms/opencl/main.cpp @@ -300,10 +301,10 @@ index 36d82ef8..16ce2703 100644 endif() diff --git a/kcms/sensors/kcm_sensors.json b/kcms/sensors/kcm_sensors.json -index e1994f2c..e1c27245 100644 +index 4f9959dc..1cba9e5f 100644 --- a/kcms/sensors/kcm_sensors.json +++ b/kcms/sensors/kcm_sensors.json -@@ -58,7 +58,7 @@ +@@ -66,7 +66,7 @@ "Name[zh_CN]": "传感器", "Name[zh_TW]": "感測器" }, @@ -326,18 +327,18 @@ index 8dae9f8f..ee70f381 100644 } CommandOutputContext *outputContext() const diff --git a/kcms/vulkan/kcm_vulkan.json b/kcms/vulkan/kcm_vulkan.json -index 9a297a07..2c30b20a 100644 +index ca4cf9e0..4f6af805 100644 --- a/kcms/vulkan/kcm_vulkan.json +++ b/kcms/vulkan/kcm_vulkan.json -@@ -102,7 +102,7 @@ +@@ -100,7 +100,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", - "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات", + "X-KDE-Keywords": "Vulkan,VideoCard,Hardware Acceleration,Graphics,dxdiag", + "X-KDE-Keywords[ar]": "Vulkan,VideoCard,Hardware Acceleration,Graphics,فولكان,بطاقة الفيديو,تسريع الأجهزة,الرسومات,dxdiag", diff --git a/kcms/vulkan/main.cpp b/kcms/vulkan/main.cpp index 5665d9d2..008f1bf0 100644 --- a/kcms/vulkan/main.cpp @@ -352,18 +353,18 @@ index 5665d9d2..008f1bf0 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/wayland/kcm_wayland.json b/kcms/wayland/kcm_wayland.json -index 66022b79..1756eb0e 100644 +index 7ca1dcb7..e814570b 100644 --- a/kcms/wayland/kcm_wayland.json +++ b/kcms/wayland/kcm_wayland.json -@@ -108,7 +108,7 @@ +@@ -106,7 +106,7 @@ "Name[zh_CN]": "Wayland", "Name[zh_TW]": "Wayland" }, - "TryExec": "wayland-info", + "TryExec": "@waylandinfo@", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "Wayland,Compositor,Display,System Information", - "X-KDE-Keywords[ar]": "ويلاند,مراكب,عرض,معلومات النّظام", + "X-KDE-Keywords": "Wayland,Compositor,Display,System Information,dxdiag", + "X-KDE-Keywords[ar]": "ويلاند,مراكب,عرض,معلومات النّظام,dxdiag", diff --git a/kcms/wayland/main.cpp b/kcms/wayland/main.cpp index 3a4825c7..4633927b 100644 --- a/kcms/wayland/main.cpp @@ -378,10 +379,10 @@ index 3a4825c7..4633927b 100644 CommandOutputContext *outputContext() const { diff --git a/kcms/xserver/kcm_xserver.json b/kcms/xserver/kcm_xserver.json -index a5e64d94..81190779 100644 +index 5b12997a..9debc887 100644 --- a/kcms/xserver/kcm_xserver.json +++ b/kcms/xserver/kcm_xserver.json -@@ -148,7 +148,7 @@ +@@ -146,7 +146,7 @@ "Name[zh_CN]": "X 服务器", "Name[zh_TW]": "X 伺服器" }, @@ -389,7 +390,7 @@ index a5e64d94..81190779 100644 + "TryExec": "@xdpyinfo@", "X-DocPath": "kinfocenter/graphical.html#xserver", "X-KDE-KInfoCenter-Category": "graphical_information", - "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information", + "X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information,dxdiag", diff --git a/kcms/xserver/main.cpp b/kcms/xserver/main.cpp index df9af24a..e5983e22 100644 --- a/kcms/xserver/main.cpp diff --git a/pkgs/kde/plasma/ksshaskpass/default.nix b/pkgs/kde/plasma/ksshaskpass/default.nix index 4a148489a129..b41f6d2d62bc 100644 --- a/pkgs/kde/plasma/ksshaskpass/default.nix +++ b/pkgs/kde/plasma/ksshaskpass/default.nix @@ -1,5 +1,11 @@ -{ mkKdeDerivation }: +{ + mkKdeDerivation, + qtkeychain, +}: mkKdeDerivation { pname = "ksshaskpass"; + + extraBuildInputs = [ qtkeychain ]; + meta.mainProgram = "ksshaskpass"; } diff --git a/pkgs/kde/plasma/kwin/default.nix b/pkgs/kde/plasma/kwin/default.nix index eec3047201da..7cee0fc0fcaf 100644 --- a/pkgs/kde/plasma/kwin/default.nix +++ b/pkgs/kde/plasma/kwin/default.nix @@ -12,12 +12,12 @@ libcanberra, libdisplay-info, libei, + libevdev, libgbm, lcms2, pipewire, krunner, python3, - fetchpatch, }: mkKdeDerivation { pname = "kwin"; @@ -56,6 +56,7 @@ mkKdeDerivation { libcanberra libdisplay-info libei + libevdev libinput pipewire diff --git a/pkgs/kde/plasma/plasma-desktop/no-discover-shortcut.patch b/pkgs/kde/plasma/plasma-desktop/no-discover-shortcut.patch index f186671c9cc5..d56b8e4c1fa7 100644 --- a/pkgs/kde/plasma/plasma-desktop/no-discover-shortcut.patch +++ b/pkgs/kde/plasma/plasma-desktop/no-discover-shortcut.patch @@ -1,7 +1,5 @@ -diff --git a/applets/taskmanager/package/contents/config/main.xml b/applets/taskmanager/package/contents/config/main.xml -index 6bb27695d..25e621810 100644 ---- a/applets/taskmanager/package/contents/config/main.xml -+++ b/applets/taskmanager/package/contents/config/main.xml +--- a/applets/taskmanager/main.xml ++++ b/applets/taskmanager/main.xml @@ -85,7 +85,7 @@ diff --git a/pkgs/kde/misc/plasma-keyboard/default.nix b/pkgs/kde/plasma/plasma-keyboard/default.nix similarity index 60% rename from pkgs/kde/misc/plasma-keyboard/default.nix rename to pkgs/kde/plasma/plasma-keyboard/default.nix index 8579e1312c8d..e26f2999eee6 100644 --- a/pkgs/kde/misc/plasma-keyboard/default.nix +++ b/pkgs/kde/plasma/plasma-keyboard/default.nix @@ -1,21 +1,11 @@ { mkKdeDerivation, - fetchFromGitLab, - qtvirtualkeyboard, pkg-config, + qtvirtualkeyboard, wayland-protocols, }: -mkKdeDerivation rec { +mkKdeDerivation { pname = "plasma-keyboard"; - version = "0.1.0"; - - src = fetchFromGitLab { - domain = "invent.kde.org"; - owner = "plasma"; - repo = "plasma-keyboard"; - tag = "v${version}"; - hash = "sha256-Bka/tmSZIaQ6ZgWx5lCXKM8tlBUgKUy2Amv2TepdO7s="; - }; extraNativeBuildInputs = [ pkg-config diff --git a/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch b/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch new file mode 100644 index 000000000000..708a9f6c11ce --- /dev/null +++ b/pkgs/kde/plasma/plasma-login-manager/config-mtime.patch @@ -0,0 +1,14 @@ +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/config-path.patch b/pkgs/kde/plasma/plasma-login-manager/config-path.patch new file mode 100644 index 000000000000..4a6a1032f00b --- /dev/null +++ b/pkgs/kde/plasma/plasma-login-manager/config-path.patch @@ -0,0 +1,15 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1a1d9a3..fb2c9af 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -82,8 +82,8 @@ set(RUNTIME_DIR "${RUNTIME_DIR_DEFAULT}" + set(SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/Xsession" CACHE PATH "Script to execute when starting the X11 desktop session") + set(WAYLAND_SESSION_COMMAND "${DATA_INSTALL_DIR}/scripts/wayland-session" CACHE PATH "Script to execute when starting the Wayland desktop session") + +-set(CONFIG_FILE "${CMAKE_INSTALL_FULL_SYSCONFDIR}/plasmalogin.conf" CACHE PATH "Path of the plasmalogin config file") +-set(CONFIG_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/plasmalogin.conf.d" CACHE PATH "Path of the plasmalogin config directory") ++set(CONFIG_FILE "/etc/plasmalogin.conf" CACHE PATH "Path of the plasmalogin config file") ++set(CONFIG_DIR "/etc/plasmalogin.conf.d" CACHE PATH "Path of the plasmalogin config directory") + set(SYSTEM_CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/lib/plasmalogin/plasmalogin.conf.d" CACHE PATH "Path of the system plasmalogin config directory") + set(LOG_FILE "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/log/plasmalogin.log" CACHE PATH "Path of the plasmalogin log file") + set(DBUS_CONFIG_FILENAME "org.freedesktop.DisplayManager.conf" CACHE STRING "Name of the plasmalogin config file") diff --git a/pkgs/kde/plasma/plasma-login-manager/default.nix b/pkgs/kde/plasma/plasma-login-manager/default.nix new file mode 100644 index 000000000000..13799afaf4b4 --- /dev/null +++ b/pkgs/kde/plasma/plasma-login-manager/default.nix @@ -0,0 +1,35 @@ +{ + lib, + mkKdeDerivation, + replaceVars, + kwin, + pkg-config, + qttools, + pam, +}: +mkKdeDerivation { + pname = "plasma-login-manager"; + + patches = [ + ./config-mtime.patch + ./config-path.patch + + (replaceVars ./kwin-path.patch { + kwin_wayland = lib.getExe' kwin "kwin_wayland"; + CMAKE_INSTALL_FULL_BINDIR = null; + }) + ]; + + extraNativeBuildInputs = [ + pkg-config + qttools + ]; + + extraBuildInputs = [ pam ]; + + extraCmakeFlags = [ + "-DUID_MIN=1000" + "-DUID_MAX=29999" + "-DINSTALL_PAM_CONFIGURATION=OFF" + ]; +} diff --git a/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch new file mode 100644 index 000000000000..bf2eb6047118 --- /dev/null +++ b/pkgs/kde/plasma/plasma-login-manager/kwin-path.patch @@ -0,0 +1,10 @@ +--- 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) + 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 + BusName=org.kde.KWin + Slice=session.slice diff --git a/pkgs/kde/plasma/plasma-setup/default.nix b/pkgs/kde/plasma/plasma-setup/default.nix new file mode 100644 index 000000000000..0fcf89369f2d --- /dev/null +++ b/pkgs/kde/plasma/plasma-setup/default.nix @@ -0,0 +1,17 @@ +{ + mkKdeDerivation, + pkg-config, + qtlocation, + plasma-nm, +}: +mkKdeDerivation { + pname = "plasma-setup"; + + patches = [ ./optional-dependencies.patch ]; + + extraNativeBuildInputs = [ pkg-config ]; + extraBuildInputs = [ + qtlocation + plasma-nm + ]; +} diff --git a/pkgs/kde/plasma/plasma-setup/optional-dependencies.patch b/pkgs/kde/plasma/plasma-setup/optional-dependencies.patch new file mode 100644 index 000000000000..923072ceae8c --- /dev/null +++ b/pkgs/kde/plasma/plasma-setup/optional-dependencies.patch @@ -0,0 +1,13 @@ +diff --git a/modules/keyboard/CMakeLists.txt b/modules/keyboard/CMakeLists.txt +index ddd52df8bc1cc1c6c3bc6b90d9b7f913092995a2..4a108baf60dcf0a87ad9e512f63884dba4442c10 100644 +--- a/modules/keyboard/CMakeLists.txt ++++ b/modules/keyboard/CMakeLists.txt +@@ -9,7 +9,7 @@ ecm_qt_declare_logging_category(logging_SRCS + EXPORT PLASMASETUP + ) + +-ecm_find_qmlmodule(org.kde.plasma.private.kcm_keyboard REQUIRED) ++ecm_find_qmlmodule(org.kde.plasma.private.kcm_keyboard) + + ecm_add_qml_module(plasmasetup_keyboard + URI "org.kde.plasmasetup.keyboard" diff --git a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch index 090df77eb15b..d8a5f4a025de 100644 --- a/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch +++ b/pkgs/kde/plasma/plasma-vault/hardcode-paths.patch @@ -1,5 +1,5 @@ diff --git a/kded/engine/backends/cryfs/cryfsbackend.cpp b/kded/engine/backends/cryfs/cryfsbackend.cpp -index 64138b6..5d249aa 100644 +index f425eb3..5b8cd43 100644 --- a/kded/engine/backends/cryfs/cryfsbackend.cpp +++ b/kded/engine/backends/cryfs/cryfsbackend.cpp @@ -207,7 +207,7 @@ QProcess *CryFsBackend::cryfs(const QStringList &arguments) const @@ -44,7 +44,7 @@ index b992f6f..eb828dd 100644 QString GocryptfsBackend::getConfigFilePath(const Device &device) const diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp -index 714b660..61d8bf5 100644 +index 8763304..e6860d2 100644 --- a/kded/engine/fusebackend_p.cpp +++ b/kded/engine/fusebackend_p.cpp @@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg @@ -57,19 +57,19 @@ index 714b660..61d8bf5 100644 FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload) diff --git a/kded/engine/vault.cpp b/kded/engine/vault.cpp -index a7a4741..773b671 100644 +index c101079..67c8a83 100644 --- a/kded/engine/vault.cpp +++ b/kded/engine/vault.cpp -@@ -490,7 +490,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() }) -+ AsynQt::Process::getOutput(QStringLiteral("@lsof@"), { QStringLiteral("-t"), mountPoint().data() }) - | cast() - | onError([this] { - d->updateMessage(i18n("Unable to close the vault because an application is using it")); -@@ -546,7 +546,7 @@ FutureResult<> Vault::forceClose() +@@ -485,7 +485,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() 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 71c8699e1484..94b877c242f6 100644 --- a/pkgs/kde/plasma/plasma-workspace/default.nix +++ b/pkgs/kde/plasma/plasma-workspace/default.nix @@ -43,6 +43,11 @@ mkKdeDerivation { chmod -x $out/libexec/plasma-sourceenv.sh ''; + extraCmakeFlags = [ + "-DGLIBC_LOCALE_GEN=OFF" + "-DGLIBC_LOCALE_PREGENERATED=ON" + ]; + extraNativeBuildInputs = [ pkg-config spirv-tools diff --git a/pkgs/kde/plasma/powerdevil/default.nix b/pkgs/kde/plasma/powerdevil/default.nix index 87d964fbb346..2c12c45cddfd 100644 --- a/pkgs/kde/plasma/powerdevil/default.nix +++ b/pkgs/kde/plasma/powerdevil/default.nix @@ -8,9 +8,7 @@ mkKdeDerivation { pname = "powerdevil"; patches = [ - # https://invent.kde.org/plasma/powerdevil/-/merge_requests/595 - ./rb-brightness.patch - # https://invent.kde.org/plasma/powerdevil/-/merge_requests/595 + # https://invent.kde.org/plasma/powerdevil/-/merge_requests/601 ./rb-batterymonitor.patch ]; extraNativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/kde/plasma/powerdevil/rb-brightness.patch b/pkgs/kde/plasma/powerdevil/rb-brightness.patch deleted file mode 100644 index a73692a2cb9b..000000000000 --- a/pkgs/kde/plasma/powerdevil/rb-brightness.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit a34d894278d2c7938427d3c4d0fc07d96c26e55f -Author: Arnout Engelen -Date: Sun Dec 14 11:33:08 2025 +0100 - - reproducible builds: make build deterministic by adding explicit deps - - Similar to https://qt-project.atlassian.net/browse/QTBUG-137440 - - To fix https://bugs.kde.org/show_bug.cgi?id=512867 - - I'll admit I don't quite know what I'm doing here, I'm mostly guessing and mimicking, but it does seem to remove the nondeterminism :) - - Inspired in part by https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/6075/diffs - -diff --git a/applets/brightness/CMakeLists.txt b/applets/brightness/CMakeLists.txt -index 3d1fce43..99331f85 100644 ---- a/applets/brightness/CMakeLists.txt -+++ b/applets/brightness/CMakeLists.txt -@@ -16,3 +16,5 @@ plasma_add_applet(org.kde.plasma.brightness - PopupDialog.qml - GENERATE_APPLET_CLASS - ) -+ -+add_dependencies(org.kde.plasma.brightness brightnesscontrolplugin) diff --git a/pkgs/kde/plasma/spectacle/default.nix b/pkgs/kde/plasma/spectacle/default.nix index c5c71a1beaa2..3ecbb17b42f0 100644 --- a/pkgs/kde/plasma/spectacle/default.nix +++ b/pkgs/kde/plasma/spectacle/default.nix @@ -1,9 +1,15 @@ { + lib, mkKdeDerivation, qtwayland, qtmultimedia, opencv, + tesseractLanguages ? [ ], + tesseract5, }: +let + tesseract = (tesseract5.override { enableLanguages = tesseractLanguages; }); +in mkKdeDerivation { pname = "spectacle"; @@ -19,5 +25,11 @@ mkKdeDerivation { runAccuracyTests = false; # tests will fail because of missing plugins but that's okay }) ]; + + # no point adding the dependency when we have no language packs + preFixup = lib.optionalString (tesseractLanguages != [ ]) '' + patchelf --add-needed libtesseract.so.5 --add-rpath ${tesseract}/lib $out/bin/spectacle + ''; + meta.mainProgram = "spectacle"; }