From 72404d713a0ecad5f61dd291f5a6ce563ad00c73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Tue, 21 Jun 2022 12:22:12 -0300
Subject: [PATCH 1/7] kde/plasma: 5.25.0 -> 5.25.1

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 432 ++++++++++++++++----------------
 2 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 57d42b3016e8..f58b02da6fb9 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.0/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.25.1/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 0b570c9dda81..73298c78399e 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -4,427 +4,427 @@
 
 {
   bluedevil = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/bluedevil-5.25.0.tar.xz";
-      sha256 = "18iaxyfjgs7zk972aajxww372sj6azqx5flnxbs7m9zmrg687d2v";
-      name = "bluedevil-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/bluedevil-5.25.1.tar.xz";
+      sha256 = "1fdbxz2lk43svp6f0srjhpfhipfimf0nqjnvv62bqzpasv74p13g";
+      name = "bluedevil-5.25.1.tar.xz";
     };
   };
   breeze = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/breeze-5.25.0.tar.xz";
-      sha256 = "0kph45sasp0zvccp4sblglg9b851a8jxi8zsjbj2vpfrwrmyyv4l";
-      name = "breeze-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/breeze-5.25.1.tar.xz";
+      sha256 = "13qwxvbdmf3qx7nfarr33q22rn43xsby7l8bjjfn6862l7pqhash";
+      name = "breeze-5.25.1.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/breeze-grub-5.25.0.tar.xz";
-      sha256 = "1i5a32spn0kdrdnbd3za3fjchk006l46ybn41h2fbrzq908yh44w";
-      name = "breeze-grub-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/breeze-grub-5.25.1.tar.xz";
+      sha256 = "11ic3cjfvgs2jkwbkzr2xd568ym7x2l99w488qhdhw9fzkk56rrh";
+      name = "breeze-grub-5.25.1.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/breeze-gtk-5.25.0.tar.xz";
-      sha256 = "0hnyslgngqsywaqbfx845wfdpdvqymizvjyryi10sbki80fmdbmc";
-      name = "breeze-gtk-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/breeze-gtk-5.25.1.tar.xz";
+      sha256 = "0lzh7lrqiw537phfkz6bvqfbyqc4h4rb5bkxcb4s1ryynamy36yh";
+      name = "breeze-gtk-5.25.1.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/breeze-plymouth-5.25.0.tar.xz";
-      sha256 = "1b3qlw99d2rqpay47188bc0yqzp95s8g6skx7znxq8cxgg7ck24j";
-      name = "breeze-plymouth-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/breeze-plymouth-5.25.1.tar.xz";
+      sha256 = "0xprjl0bszs2dmn27pvklwxx5qbcsdmrr256jlvljvq5hs5vd9ly";
+      name = "breeze-plymouth-5.25.1.tar.xz";
     };
   };
   discover = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/discover-5.25.0.tar.xz";
-      sha256 = "0ws0hvxnbf3mwy5lsyv56b73vjdswhy8lh01sx33xmgpbnyykqni";
-      name = "discover-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/discover-5.25.1.tar.xz";
+      sha256 = "1cpmi4qfxlprvj5qamjkxj4lq8038fv1fyldsfhnyi9s4zw6ww9s";
+      name = "discover-5.25.1.tar.xz";
     };
   };
   drkonqi = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/drkonqi-5.25.0.tar.xz";
-      sha256 = "123snx7hfk9m7ds1vk047g3q5lkfmn00w5668xvpqr7yqw9w78fh";
-      name = "drkonqi-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/drkonqi-5.25.1.tar.xz";
+      sha256 = "147azxas0idb0ymcwg15davb5p84czysmsfxmcbrcqlxjkby3dy0";
+      name = "drkonqi-5.25.1.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kactivitymanagerd-5.25.0.tar.xz";
-      sha256 = "1iwrjf090s47mwl6rlk3fjk96bkrz56mvbk6d474b1f2n2ymqibm";
-      name = "kactivitymanagerd-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kactivitymanagerd-5.25.1.tar.xz";
+      sha256 = "1jjby09p8hak52syjzaf4wz9hyjz8rylz4jzranrkk3n85znqwk0";
+      name = "kactivitymanagerd-5.25.1.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kde-cli-tools-5.25.0.tar.xz";
-      sha256 = "0j3cib7yzmixsq2v2kymdz9sip8qxgq1x3ns86xlcwcl4fh77mqy";
-      name = "kde-cli-tools-5.25.0.tar.xz";
-    };
-  };
-  kdecoration = {
-    version = "5.25.0";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kdecoration-5.25.0.tar.xz";
-      sha256 = "1g7l8vbcbrh20nq4s4ac1a0bmf0kb4r0b4mzqcndn6yjwab4z7c8";
-      name = "kdecoration-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kde-cli-tools-5.25.1.tar.xz";
+      sha256 = "03v7ws48ywjkaqj87zcw7d0dfi36abpz9bnv9s9qp2y4mnk9x198";
+      name = "kde-cli-tools-5.25.1.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kde-gtk-config-5.25.0.tar.xz";
-      sha256 = "1dg45brjwh7v83d9pm21vhn27mx0lsnbp7ry9f1mkzy509v461fb";
-      name = "kde-gtk-config-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kde-gtk-config-5.25.1.tar.xz";
+      sha256 = "17sqznjz5sn3xih6l83sx62p0s2sk3p1svqg297x3jq67a9299yj";
+      name = "kde-gtk-config-5.25.1.tar.xz";
+    };
+  };
+  kdecoration = {
+    version = "5.25.1";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.25.1/kdecoration-5.25.1.tar.xz";
+      sha256 = "15gik2c0370f2rmd7jv3pbxbsjng25g6cwzamq3xaa3gqh6l2b33";
+      name = "kdecoration-5.25.1.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kdeplasma-addons-5.25.0.tar.xz";
-      sha256 = "0i5pxg95v7dr3in7mswnx53zkg5c05q3ijb1yqdlj4a3k6ln26nr";
-      name = "kdeplasma-addons-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kdeplasma-addons-5.25.1.tar.xz";
+      sha256 = "14p69kpyaszir8y4zxnyhxmall291rwcy770w4d0mlc04difki8d";
+      name = "kdeplasma-addons-5.25.1.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kgamma5-5.25.0.tar.xz";
-      sha256 = "0rzlf8dr6zj7bcbgdga0d6h9k7aw7d2ra7awzvyq7w2rx8i40ra0";
-      name = "kgamma5-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kgamma5-5.25.1.tar.xz";
+      sha256 = "1pc8abx3j91iqb93rsc13bq8sr610zxa91dhy8hr301fmvv9dbg2";
+      name = "kgamma5-5.25.1.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/khotkeys-5.25.0.tar.xz";
-      sha256 = "0m2fr3mfqqaprcqd0b31ilz4r0d2mlvc4jwn6ax1fww4inzfa261";
-      name = "khotkeys-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/khotkeys-5.25.1.tar.xz";
+      sha256 = "14i9bdqjf5myacybsplsais70x3rnjnfj9807xxgwnqy5dqbz8hg";
+      name = "khotkeys-5.25.1.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kinfocenter-5.25.0.tar.xz";
-      sha256 = "1wzl0qbpj4zkhv56l86fqf7agp29jf7ljxn0na6x1sd7wqqj2hp6";
-      name = "kinfocenter-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kinfocenter-5.25.1.tar.xz";
+      sha256 = "0pyirq0zz8y1pvznw5idjsxwslp0bchfjp72l855z5bwfwh7dmfq";
+      name = "kinfocenter-5.25.1.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kmenuedit-5.25.0.tar.xz";
-      sha256 = "080mffhym2yxpk2jdaynz7gzhr0s2ca0qhg8xhilzvf4r3qlmv1j";
-      name = "kmenuedit-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kmenuedit-5.25.1.tar.xz";
+      sha256 = "0v7k9dcawylgdbjklmjn4mv10z6cm6hhp3za9ni88wlgb2vh9mmk";
+      name = "kmenuedit-5.25.1.tar.xz";
     };
   };
   kscreen = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kscreen-5.25.0.tar.xz";
-      sha256 = "0cna20n9yizkm60wrr03bd048gd7q0wznn1h5sz5y3m4svvxm2qb";
-      name = "kscreen-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kscreen-5.25.1.tar.xz";
+      sha256 = "1dflaaba001wk5r9n523b1mxib7pd0x5b6dnhis62zn9v5apqhaa";
+      name = "kscreen-5.25.1.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kscreenlocker-5.25.0.tar.xz";
-      sha256 = "0hi077325694dqxikvsf3vrhabk6bja02n3fy9jxv5znaaf6a0hf";
-      name = "kscreenlocker-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kscreenlocker-5.25.1.tar.xz";
+      sha256 = "1bhl8a1jhzr2iycq6fzkj1sb4bybyqlnxs8rnfw0s4mmcs17lmm7";
+      name = "kscreenlocker-5.25.1.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/ksshaskpass-5.25.0.tar.xz";
-      sha256 = "0bkngywr50sd0vzw73zzbwlnzv2fwpni7w7c8m6xfl64vb8629bh";
-      name = "ksshaskpass-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/ksshaskpass-5.25.1.tar.xz";
+      sha256 = "1mxmjiprcckqn4sgqyj9nk32prvgymscmpv0kfkcsg60phqyz91m";
+      name = "ksshaskpass-5.25.1.tar.xz";
     };
   };
   ksystemstats = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/ksystemstats-5.25.0.tar.xz";
-      sha256 = "0dcx198iamdh6llqk9z5mzc76cgra93m4w669jwrzgwnib8is8ji";
-      name = "ksystemstats-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/ksystemstats-5.25.1.tar.xz";
+      sha256 = "0cp6hsy24g2yhijiyavx5av5djdrypvwrcpzswp8mr86p6b1ii8n";
+      name = "ksystemstats-5.25.1.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kwallet-pam-5.25.0.tar.xz";
-      sha256 = "19lxih5ywrvk76wir4xa4zp0adp7am412g02wya8zw21pabni2zi";
-      name = "kwallet-pam-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kwallet-pam-5.25.1.tar.xz";
+      sha256 = "1n9bnlsm4l051hp73hsp9wa14q77pplr855w3j620qz0az2zxwwx";
+      name = "kwallet-pam-5.25.1.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kwayland-integration-5.25.0.tar.xz";
-      sha256 = "0lgnlfm48jm5rbmdwipkmagy0r1x9v1y10vidpcd26ldaql2lixk";
-      name = "kwayland-integration-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kwayland-integration-5.25.1.tar.xz";
+      sha256 = "1r80rj7f8xskiwp7lfzxp92q39gm2y6xy3ip4hv0sgjr2014fb21";
+      name = "kwayland-integration-5.25.1.tar.xz";
     };
   };
   kwin = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kwin-5.25.0.tar.xz";
-      sha256 = "03r8zmwjc74hc506kzasx9a3cbygnacdw1mjmkk39wl4599w4xai";
-      name = "kwin-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kwin-5.25.1.tar.xz";
+      sha256 = "1srwdx1pw8kjcdmj531f43789fqsa0wj1kkhp0g42wbwj0y9af8x";
+      name = "kwin-5.25.1.tar.xz";
     };
   };
   kwrited = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/kwrited-5.25.0.tar.xz";
-      sha256 = "1cxfgf26kdbp84wk190s6j4hi62gp928nvyiclgxja1ha4f3yzsb";
-      name = "kwrited-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/kwrited-5.25.1.tar.xz";
+      sha256 = "0gpql9kzwvv0n2ccq6jwwf9agd1abxc8q45plj48sv09b31bxvhz";
+      name = "kwrited-5.25.1.tar.xz";
     };
   };
   layer-shell-qt = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/layer-shell-qt-5.25.0.tar.xz";
-      sha256 = "1wyijkk45mzrd2glsilv0748vi5vcdyhkbfm367v9rbyszwhsv9j";
-      name = "layer-shell-qt-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/layer-shell-qt-5.25.1.tar.xz";
+      sha256 = "0lh1dy1z08k6c40xdxcbmpdzzm18dq98gb14q6b6snh1jcrvg95c";
+      name = "layer-shell-qt-5.25.1.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/libkscreen-5.25.0.tar.xz";
-      sha256 = "0b6qsni1nls29apdkhavxy980mxk46wrp9fizarsvvsgkahl5m8v";
-      name = "libkscreen-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/libkscreen-5.25.1.tar.xz";
+      sha256 = "1zbdbacmbnczskk8cpr99ph9cn28izvr25x5v5l455dk077qf25g";
+      name = "libkscreen-5.25.1.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/libksysguard-5.25.0.tar.xz";
-      sha256 = "1z210jv0354midbqbcipdirilrhpcmhy5s5cy7jvgmmivarr0mrl";
-      name = "libksysguard-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/libksysguard-5.25.1.tar.xz";
+      sha256 = "1xn454ch9ggx67c69hjvhhykprrdys38ych1ap8l3b1j2731vyn6";
+      name = "libksysguard-5.25.1.tar.xz";
     };
   };
   milou = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/milou-5.25.0.tar.xz";
-      sha256 = "166m0w8yn6dz00g6h40zyjklr6zf0yrskg6q48593l8f35kmqzdl";
-      name = "milou-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/milou-5.25.1.tar.xz";
+      sha256 = "0al6d26b96j3kx37p34gmqamc1pz7l3shyqf7dxf7j71hh0mrk09";
+      name = "milou-5.25.1.tar.xz";
     };
   };
   oxygen = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/oxygen-5.25.0.tar.xz";
-      sha256 = "0kq8h3zi07h0j0y6n0q6nkbf3sa2pxvyvy7hyxbbvl4b8s4h3asf";
-      name = "oxygen-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/oxygen-5.25.1.tar.xz";
+      sha256 = "1ax0vw7mzlln09aajis5vc78snbi3508lg6qbx6vw9m59lpq140v";
+      name = "oxygen-5.25.1.tar.xz";
     };
   };
   oxygen-sounds = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/oxygen-sounds-5.25.0.tar.xz";
-      sha256 = "1qk4ff5knjpznj5zbpvzd3wjbpbzmijaxrwqsr7q663i0rjx82b4";
-      name = "oxygen-sounds-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/oxygen-sounds-5.25.1.tar.xz";
+      sha256 = "14z23yzqcvwjyy0qbm20xgijrndiw8pk1xf4wdbslny454k0l1q7";
+      name = "oxygen-sounds-5.25.1.tar.xz";
     };
   };
   plasma-browser-integration = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-browser-integration-5.25.0.tar.xz";
-      sha256 = "1qcaxchwlqsjs9fwksc185n3pr7c8wp74m0abbbv1g0qkwwkfww5";
-      name = "plasma-browser-integration-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-browser-integration-5.25.1.tar.xz";
+      sha256 = "140j74dbsx0jicz1407h4n1hqsnnvh3mk07w4y7slvf3392fqp6i";
+      name = "plasma-browser-integration-5.25.1.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-desktop-5.25.0.tar.xz";
-      sha256 = "1ib8j6pv720ky3v7pcyjzdn4cyi0201kcrpxj4adv2hsj3qc3lv3";
-      name = "plasma-desktop-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-desktop-5.25.1.tar.xz";
+      sha256 = "1j1d0j4sdnyfcpv9z4ch6z5z0d7ylkbqcwkhwx0qqs7if8p6f355";
+      name = "plasma-desktop-5.25.1.tar.xz";
     };
   };
   plasma-disks = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-disks-5.25.0.tar.xz";
-      sha256 = "10fz7biz0p7ipdxjllwjcja8d3mf7wf4af0gi0yh0pwr5yj8yn68";
-      name = "plasma-disks-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-disks-5.25.1.tar.xz";
+      sha256 = "1ji4gkm36zk4ybdnqzynni0q66nniryfa4p60wqmqr7x97h4376s";
+      name = "plasma-disks-5.25.1.tar.xz";
     };
   };
   plasma-firewall = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-firewall-5.25.0.tar.xz";
-      sha256 = "0m8lh6lfr7a9w33wcj4li01b82vfw7smv5l1sigri5zx0ahpkqdc";
-      name = "plasma-firewall-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-firewall-5.25.1.tar.xz";
+      sha256 = "0vip17v0860grmqh9sv7vjisnxgpxqs5hw8yw0fdign0dp3yjn33";
+      name = "plasma-firewall-5.25.1.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-integration-5.25.0.tar.xz";
-      sha256 = "1a069wcjfxw1rvb285lln19yg18f1k0003snmrmfbisbv5f7475q";
-      name = "plasma-integration-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-integration-5.25.1.tar.xz";
+      sha256 = "09xpbjp5k28bjvs8nszkzk9mw72zv0v171y495ffn8af6yq35cgj";
+      name = "plasma-integration-5.25.1.tar.xz";
     };
   };
   plasma-mobile = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-mobile-5.25.0.tar.xz";
-      sha256 = "00d63zb8n3iza8q2a1pgk0v63bzzq3yky71ij3bmm08a405w2ad8";
-      name = "plasma-mobile-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-mobile-5.25.1.tar.xz";
+      sha256 = "04dg6xyzj9zg9g80f6l1chg8f9pj0wz4c8szj3mx1cs98lp3bvcy";
+      name = "plasma-mobile-5.25.1.tar.xz";
     };
   };
   plasma-nano = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-nano-5.25.0.tar.xz";
-      sha256 = "0hcki7qz1xldnm70x5qwrp7knqzyq3kzwjasiqpbz9vc5l4rxxyz";
-      name = "plasma-nano-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-nano-5.25.1.tar.xz";
+      sha256 = "0acdz8qqkk4rwsfglk06am8s89zyz0jafhqq574bw83znq13xhfy";
+      name = "plasma-nano-5.25.1.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-nm-5.25.0.tar.xz";
-      sha256 = "10350qnsap1m1jcmga331pis8076lpk9kkg9141xrlsy8kbf36ad";
-      name = "plasma-nm-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-nm-5.25.1.tar.xz";
+      sha256 = "011i4d612ljvy2b9vv4lqr2ad5yq0qv18nqqjdy3wmj7w1nm4ww9";
+      name = "plasma-nm-5.25.1.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-pa-5.25.0.tar.xz";
-      sha256 = "0shp4y08ry8ql02akdmwzzn7yaiddbhsp3h2jqmh401q14n374m8";
-      name = "plasma-pa-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-pa-5.25.1.tar.xz";
+      sha256 = "1nrsw3f2dj1sd3ibyym7142shwxnsi72j4nkhx02206fcjm5p9d1";
+      name = "plasma-pa-5.25.1.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-sdk-5.25.0.tar.xz";
-      sha256 = "0z72gyxp5ddcn9ilyflp781a60vgpck3l91prxaphhgn3js0al9r";
-      name = "plasma-sdk-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-sdk-5.25.1.tar.xz";
+      sha256 = "1cy9c4h6yxqjnylnpy2ai7vsx3c1b9p6ga3771jdb1zgqw55lgg7";
+      name = "plasma-sdk-5.25.1.tar.xz";
     };
   };
   plasma-systemmonitor = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-systemmonitor-5.25.0.tar.xz";
-      sha256 = "131hzqhhc4a0531p2xjabcbjp9cgkzir2sxvx8mb7xa5i213qjfr";
-      name = "plasma-systemmonitor-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-systemmonitor-5.25.1.tar.xz";
+      sha256 = "1l6m5jnqk56r20mv24s567qj4fbv6ixnzsw75pssngn5zmccm6xy";
+      name = "plasma-systemmonitor-5.25.1.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-tests-5.25.0.tar.xz";
-      sha256 = "1cgkfg1psnl74h2v5napv4fzxa7d997d8zzkkpy5sg89isxidcjq";
-      name = "plasma-tests-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-tests-5.25.1.tar.xz";
+      sha256 = "1vdvyirk53xv77mdj9kd3n8sk9rfgrz7c31h93bs1hybpbkqbc4g";
+      name = "plasma-tests-5.25.1.tar.xz";
     };
   };
   plasma-thunderbolt = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-thunderbolt-5.25.0.tar.xz";
-      sha256 = "04h1rmc4ha62sgljs1gy4kafip611rd54sx6siagz5wicjq0fahi";
-      name = "plasma-thunderbolt-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-thunderbolt-5.25.1.tar.xz";
+      sha256 = "19wjs5sapq4v4wwmhd4fk1pdc4zkn0p0w91vc29mzw7vy51id5w0";
+      name = "plasma-thunderbolt-5.25.1.tar.xz";
     };
   };
   plasma-vault = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-vault-5.25.0.tar.xz";
-      sha256 = "1afqvnfbznazbyik8m1sj04a2qfihvhjn7pv1kbpzj83yca00zvq";
-      name = "plasma-vault-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-vault-5.25.1.tar.xz";
+      sha256 = "15pad4p9lf6z4nkm0zk82k1zn0x724l68hajvwrhw4qjrr8p2p68";
+      name = "plasma-vault-5.25.1.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-5.25.0.tar.xz";
-      sha256 = "1hbv0w6vkqdrr3dr3cndg8c049x9fpxg9siw2ggbxz30kvc64m2n";
-      name = "plasma-workspace-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-5.25.1.tar.xz";
+      sha256 = "1pin9x3sz0x39af0cvfna518sx383sr2564f85c7znvyw4qdys0k";
+      name = "plasma-workspace-5.25.1.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plasma-workspace-wallpapers-5.25.0.tar.xz";
-      sha256 = "0lvqf53a4cy3vzm2kmxwnjlrvhfdb7s9vqq1x3cmagaq9d6zkb70";
-      name = "plasma-workspace-wallpapers-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plasma-workspace-wallpapers-5.25.1.tar.xz";
+      sha256 = "0cpqgp45rbsaynasf1k974fvwwrfv93r68hn6bvka99nh6j4vpki";
+      name = "plasma-workspace-wallpapers-5.25.1.tar.xz";
     };
   };
   plymouth-kcm = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/plymouth-kcm-5.25.0.tar.xz";
-      sha256 = "0h6qrqz2mvb0b1x5z74a8knh7dr8g5lwz8dzwypbsa7ahfj877x5";
-      name = "plymouth-kcm-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/plymouth-kcm-5.25.1.tar.xz";
+      sha256 = "08sf692fsdffaj91kgw3mg4bgxyy080kx992zb6drnkjmxq6pi93";
+      name = "plymouth-kcm-5.25.1.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.25.0";
+    version = "1-5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/polkit-kde-agent-1-5.25.0.tar.xz";
-      sha256 = "0ph3i46xn2273anhbszxjn51rkngsmy588ayhjqx0a19wmfw7qk9";
-      name = "polkit-kde-agent-1-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/polkit-kde-agent-1-5.25.1.tar.xz";
+      sha256 = "0aawaq09l1ifn7wd9ggj50vv19vj30w8bmfdzwjhj9zgym2s8dc4";
+      name = "polkit-kde-agent-1-5.25.1.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/powerdevil-5.25.0.tar.xz";
-      sha256 = "1fqgnc5l2vxf310i41l4ggcjwjq1jp8c4wngfb8jl3nn6lqkmdki";
-      name = "powerdevil-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/powerdevil-5.25.1.tar.xz";
+      sha256 = "0m57mp577liv3cmd4afm834mif688akdir9i89xjmvwdg8cws7n4";
+      name = "powerdevil-5.25.1.tar.xz";
     };
   };
   qqc2-breeze-style = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/qqc2-breeze-style-5.25.0.tar.xz";
-      sha256 = "0jw2zk9rrfdb3g983c85c4q539277p0cl2y165zb63p2hrcy44cz";
-      name = "qqc2-breeze-style-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/qqc2-breeze-style-5.25.1.tar.xz";
+      sha256 = "00ij7ci9xh125g9n8f1qmlpjjy93hydqi3gf29bfz4vh2lnvfd4l";
+      name = "qqc2-breeze-style-5.25.1.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/sddm-kcm-5.25.0.tar.xz";
-      sha256 = "0mj101qsmp3405ir6qnkfc8gm6f3vzy0gdg6zv465mh8fs8yvcf4";
-      name = "sddm-kcm-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/sddm-kcm-5.25.1.tar.xz";
+      sha256 = "1m371dqj72f3lxyn8bjz0bgxycrz5ik1byzqqhrjkfy3an68vs36";
+      name = "sddm-kcm-5.25.1.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/systemsettings-5.25.0.tar.xz";
-      sha256 = "1a3x0gig7ixk52hqa7jr85l7xypj8rjaashk8xnq9zmvxlk6idng";
-      name = "systemsettings-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/systemsettings-5.25.1.tar.xz";
+      sha256 = "1kichbhmsnr3kmlzic4dp3ajbkwrn8q9idjwwffnr48rz1pnb3j3";
+      name = "systemsettings-5.25.1.tar.xz";
     };
   };
   xdg-desktop-portal-kde = {
-    version = "5.25.0";
+    version = "5.25.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.25.0/xdg-desktop-portal-kde-5.25.0.tar.xz";
-      sha256 = "1632pglnz8yv86sgrmmr8zv3h38mw8bk21cshw63bbcfvxmvl88m";
-      name = "xdg-desktop-portal-kde-5.25.0.tar.xz";
+      url = "${mirror}/stable/plasma/5.25.1/xdg-desktop-portal-kde-5.25.1.tar.xz";
+      sha256 = "15b9wradlqlcipn9q09czc698xsb4q7j6pwgnv8fbaq5na6xgh0s";
+      name = "xdg-desktop-portal-kde-5.25.1.tar.xz";
     };
   };
 }

From 868b2b1fbe6d0e6ca3ffe10ac9bf4afc620a1dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Tue, 21 Jun 2022 19:05:28 -0300
Subject: [PATCH 2/7] Revert "powerdevil: fix brightness wonkiness on some
 laptops"

This reverts commit a29f64c22f331e1a1c650d4289dd891303c3766e.
---
 pkgs/desktops/plasma-5/powerdevil.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index df575fcb987a..bb511c21ba67 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, fetchpatch,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   bluez-qt, kactivities, kauth, kconfig, kdbusaddons,
   kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen,
@@ -9,15 +9,6 @@
 mkDerivation {
   pname = "powerdevil";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  patches = [
-    # Backported fix for https://bugs.kde.org/show_bug.cgi?id=454161
-    # FIXME: remove for next release
-    (fetchpatch {
-      name = "brightness-overflow-fix";
-      url = "https://invent.kde.org/plasma/powerdevil/-/commit/2ebe655d220c9167b66893a823b2fff2e2b8a531.patch";
-      sha256 = "sha256-Sf2q0CImLYjy1fTp9AWbCeRG05liUkemhfEXL/0MIQI=";
-    })
-  ];
   buildInputs = [
     kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
     kglobalaccel ki18n kio kidletime kwayland libkscreen

From 83c44f79272fdf560581df6daa499e8d9a2c8152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Wed, 22 Jun 2022 09:06:43 -0300
Subject: [PATCH 3/7] kde-rounded-corners: bump to unstable, fix build with
 kwin 5.25

---
 .../themes/kwin-decorations/kde-rounded-corners/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
index b77c136e4067..3d0c298cadae 100644
--- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kde-rounded-corners";
-  version = "0.1.1";
+  version = "unstable-2022-06-17";
 
   src = fetchFromGitHub {
     owner = "matinlotfali";
     repo = "KDE-Rounded-Corners";
-    rev = "v${version}";
-    hash = "sha256-cXpJabeOHnat7OljtRzduUdOaA6Z3z6vV3aBKwiIrR0=";
+    rev = "015ef5cd65e9ec89e4a1ae057f2251eda03715e2";
+    hash = "sha256-NJ7icavofSUPPww1Ro7p0yY2EQ78S4KVCuj9yPuYwd8=";
   };
 
   postConfigure = ''

From 62a4d12769213ee86c0b6ead55d700e9cdf29276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Wed, 22 Jun 2022 20:40:55 -0300
Subject: [PATCH 4/7] kdevelop: move to kde/gear release 22.04.2

Also, use python 3.9 to build kdev-python plugin, broken on python 3.10.
---
 pkgs/applications/kde/default.nix              |  5 +++++
 .../kdevelop5 => kde/kdevelop}/kdev-php.nix    | 10 ++--------
 .../kdevelop5 => kde/kdevelop}/kdev-python.nix | 18 +++++++++---------
 .../kdevelop}/kdevelop-pg-qt.nix               |  8 ++------
 .../kdevelop5 => kde/kdevelop}/kdevelop.nix    | 16 +++++++---------
 .../kdevelop5 => kde/kdevelop}/wrapper.nix     |  0
 pkgs/top-level/aliases.nix                     |  3 ++-
 pkgs/top-level/all-packages.nix                | 13 -------------
 8 files changed, 27 insertions(+), 46 deletions(-)
 rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdev-php.nix (54%)
 rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdev-python.nix (58%)
 rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdevelop-pg-qt.nix (87%)
 rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/kdevelop.nix (87%)
 rename pkgs/applications/{editors/kdevelop5 => kde/kdevelop}/wrapper.nix (100%)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index c390e004c8cc..cb661d438cf6 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -122,6 +122,11 @@ let
       kdenlive = callPackage ./kdenlive {};
       kdepim-runtime = callPackage ./kdepim-runtime {};
       kdepim-addons = callPackage ./kdepim-addons.nix {};
+      kdevelop-pg-qt = callPackage ./kdevelop/kdevelop-pg-qt.nix {};
+      kdevelop-unwrapped = callPackage ./kdevelop/kdevelop.nix {};
+      kdev-php = callPackage ./kdevelop/kdev-php.nix {};
+      kdev-python = callPackage ./kdevelop/kdev-python.nix {};
+      kdevelop = callPackage ./kdevelop/wrapper.nix {};
       kdf = callPackage ./kdf.nix {};
       kdialog = callPackage ./kdialog.nix {};
       kdiamond = callPackage ./kdiamond.nix {};
diff --git a/pkgs/applications/editors/kdevelop5/kdev-php.nix b/pkgs/applications/kde/kdevelop/kdev-php.nix
similarity index 54%
rename from pkgs/applications/editors/kdevelop5/kdev-php.nix
rename to pkgs/applications/kde/kdevelop/kdev-php.nix
index 8308830efccc..46c4af8c1c07 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-php.nix
+++ b/pkgs/applications/kde/kdevelop/kdev-php.nix
@@ -1,13 +1,7 @@
-{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }:
+{ mkDerivation, lib, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, kdevelop-pg-qt }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   pname = "kdev-php";
-  version = "5.6.2";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz";
-    hash = "sha256-8Qg9rsK4x1LeGgRB0Pn3InSx4tKccjAF7Xjc+Lpxfgw=";
-  };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];
   buildInputs = [ kdevelop-pg-qt threadweaver ktexteditor kdevelop-unwrapped ];
diff --git a/pkgs/applications/editors/kdevelop5/kdev-python.nix b/pkgs/applications/kde/kdevelop/kdev-python.nix
similarity index 58%
rename from pkgs/applications/editors/kdevelop5/kdev-python.nix
rename to pkgs/applications/kde/kdevelop/kdev-python.nix
index 374b4224ca6b..66335429bdd1 100644
--- a/pkgs/applications/editors/kdevelop5/kdev-python.nix
+++ b/pkgs/applications/kde/kdevelop/kdev-python.nix
@@ -1,13 +1,13 @@
-{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, threadweaver, ktexteditor, kdevelop-unwrapped, python }:
-
-stdenv.mkDerivation rec {
+{ mkDerivation, lib, cmake, extra-cmake-modules
+, threadweaver, ktexteditor, kdevelop-unwrapped, python39
+}:
+let
+  # FIXME: stick with python 3.9 until MR supporting 3.10 is ready:
+  # https://invent.kde.org/kdevelop/kdev-python/-/merge_requests/16
+  python = python39;
+in
+mkDerivation rec {
   pname = "kdev-python";
-  version = "5.6.2";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/kdevelop/${version}/src/${pname}-${version}.tar.xz";
-    hash = "sha256-IPm3cblhJi3tmGpPMrjSWa2fe8SLsp6sCl1YU74dkX8=";
-  };
 
   cmakeFlags = [
     "-DPYTHON_EXECUTABLE=${python}/bin/python"
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
similarity index 87%
rename from pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
rename to pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
index e1478ef6a03c..f96e8cf6b677 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop-pg-qt.nix
+++ b/pkgs/applications/kde/kdevelop/kdevelop-pg-qt.nix
@@ -1,15 +1,11 @@
 { lib, stdenv, fetchurl, cmake, pkg-config, extra-cmake-modules, qtbase }:
 
-let
+stdenv.mkDerivation rec {
   pname = "kdevelop-pg-qt";
   version = "2.2.1";
 
-in
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
     sha256 = "0ay6m6j6zgrbcm48f14bass83bk4w5qnx76xihc05p69i9w32ff1";
   };
 
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/kde/kdevelop/kdevelop.nix
similarity index 87%
rename from pkgs/applications/editors/kdevelop5/kdevelop.nix
rename to pkgs/applications/kde/kdevelop/kdevelop.nix
index 37ede94fa193..4e7f576398e5 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/kde/kdevelop/kdevelop.nix
@@ -1,21 +1,18 @@
-
-{ mkDerivation, lib, fetchurl, cmake, gettext, pkg-config, extra-cmake-modules
+{ mkDerivation, lib, cmake, gettext, pkg-config, extra-cmake-modules
 , qtquickcontrols, qtwebkit, qttools, kde-cli-tools, qtbase
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
 , threadweaver, kxmlgui, kwindowsystem, grantlee, kcrash, karchive, kguiaddons
 , plasma-framework, krunner, kdevelop-pg-qt, shared-mime-info, libkomparediff2
-, libksysguard, konsole, llvmPackages, makeWrapper, kpurpose, boost
+, libksysguard, konsole, llvmPackages_13, makeWrapper, kpurpose, boost
+, qtwebengine, cppcheck
 }:
 
+let
+  llvmPackages = llvmPackages_13;
+in
 mkDerivation rec {
   pname = "kdevelop";
-  version = "5.6.2";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-D4a8P+U/dhwePj91RFd6DEFDO+i/8xDPLnKfdvQ2O/Y=";
-  };
 
   nativeBuildInputs = [
     cmake gettext pkg-config extra-cmake-modules makeWrapper
@@ -32,6 +29,7 @@ mkDerivation rec {
     kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
     threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
     shared-mime-info libksysguard konsole kcrash karchive kguiaddons kpurpose
+    cppcheck qtwebengine
   ];
 
   # https://cgit.kde.org/kdevelop.git/commit/?id=716372ae2e8dff9c51e94d33443536786e4bd85b
diff --git a/pkgs/applications/editors/kdevelop5/wrapper.nix b/pkgs/applications/kde/kdevelop/wrapper.nix
similarity index 100%
rename from pkgs/applications/editors/kdevelop5/wrapper.nix
rename to pkgs/applications/kde/kdevelop/wrapper.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index bd19a8d3059d..f1a7cce4e360 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1646,7 +1646,8 @@ mapAliases ({
     ffmpegthumbs filelight granatier gwenview k3b kactivitymanagerd kaddressbook
     kalendar kalzium kapman kapptemplate kate katomic kblackbox kblocks kbounce
     kcachegrind kcalc kcharselect kcolorchooser kde-cli-tools kde-gtk-config
-    kdenlive kdeplasma-addons kdf kdialog kdiamond keditbookmarks kfind kfloppy
+    kdenlive kdeplasma-addons kdevelop-pg-qt kdevelop-unwrapped kdev-php
+    kdev-python kdevelop kdf kdialog kdiamond keditbookmarks kfind kfloppy
     kgamma5 kget kgpg khelpcenter kig kigo killbots kinfocenter kitinerary
     kleopatra klettres klines kmag kmail kmenuedit kmines kmix kmplot
     knavalbattle knetwalk knights kollision kolourpaint kompare konsole kontact
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4694c54a65b9..accc422b8a6a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -27742,19 +27742,6 @@ with pkgs;
 
   kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };
 
-  kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { };
-
-  kdevelop-unwrapped = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop.nix {
-    llvmPackages = llvmPackages_10;
-  };
-
-  kdev-php = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-php.nix { };
-  kdev-python = libsForQt5.callPackage ../applications/editors/kdevelop5/kdev-python.nix {
-    python = python3;
-  };
-
-  kdevelop = libsForQt5.callPackage ../applications/editors/kdevelop5/wrapper.nix { };
-
   kepubify = callPackage ../tools/misc/kepubify { };
 
   kermit = callPackage ../tools/misc/kermit { };

From 2bf8d8c0162507d08f9fc48e36ce7225f4879bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Wed, 22 Jun 2022 20:44:59 -0300
Subject: [PATCH 5/7] plasma-mobile: add plasma-workspace to buildInputs

---
 pkgs/desktops/plasma-5/plasma-mobile/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/plasma-mobile/default.nix b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
index be628de65408..7ce5f827589a 100644
--- a/pkgs/desktops/plasma-5/plasma-mobile/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-mobile/default.nix
@@ -23,7 +23,7 @@ mkDerivation {
     appstream libdbusmenu pam wayland
     kdeclarative kdelibs4support kpeople kconfig krunner kinit kwayland kwin
     plasma-framework telepathy libphonenumber protobuf libqofono modemmanager-qt
-    networkmanager-qt maliit-framework maliit-keyboard
+    networkmanager-qt maliit-framework maliit-keyboard plasma-workspace
   ];
 
   postPatch = ''

From d6b20ea2cf2172eb72edb4f401929a2d7b7a7c14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Wed, 22 Jun 2022 20:51:48 -0300
Subject: [PATCH 6/7] kf5/plasma-framework: backport patch to fix thumbnails in
 task manager

---
 .../libraries/kde-frameworks/plasma-framework.nix      | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index cf118beaabce..83a7cc2546d3 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  mkDerivation, fetchpatch,
   extra-cmake-modules, kdoctools,
   kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
@@ -9,6 +9,14 @@
 
 mkDerivation {
   pname = "plasma-framework";
+  patches = [
+    # FIXME: remove on kf5.96
+    (fetchpatch {
+      name = "fix-thumbnails-task-manager.patch";
+      url = "https://invent.kde.org/frameworks/plasma-framework/-/commit/dff1b034c1162062aa2292099d3d01fc53dafdf6.patch";
+      sha256 = "sha256-0162bi3J5bl5BmmUSrhxxy8MpLtSXkdHGK8wMcS5BB8=";
+    })
+  ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons

From 42f1d29ec67a1c65ea3bb4175dd9042a88e8b2a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Vitor=20de=20Lima=20Matos?=
 <andre.vmatos@gmail.com>
Date: Fri, 24 Jun 2022 19:49:39 -0300
Subject: [PATCH 7/7] kio-extras: add optional dependencies

kactivities-stats enables "Recent Files"/"Recent
Locations"/"recentlyused:/" kioslaves, taglib enables audio metadata
reading, and libtirpc enables NFS kio.
---
 pkgs/applications/kde/kio-extras.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index 29a3bdc97bb8..d9e8cf889491 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -1,9 +1,9 @@
 {
   mkDerivation, lib, extra-cmake-modules, kdoctools, shared-mime-info,
-  exiv2, kactivities, karchive, kbookmarks, kconfig, kconfigwidgets,
+  exiv2, kactivities, kactivities-stats, karchive, kbookmarks, kconfig, kconfigwidgets,
   kcoreaddons, kdbusaddons, kdsoap, kguiaddons, kdnssd, kiconthemes, ki18n, kio,
-  khtml, kpty, syntax-highlighting, libmtp, libssh, openexr,
-  ilmbase, openslp, phonon, qtsvg, samba, solid, gperf
+  khtml, kpty, syntax-highlighting, libmtp, libssh, openexr, libtirpc,
+  ilmbase, openslp, phonon, qtsvg, samba, solid, gperf, taglib
 }:
 
 mkDerivation {
@@ -14,10 +14,10 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools shared-mime-info ];
   buildInputs = [
-    exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
+    exiv2 kactivities kactivities-stats karchive kbookmarks kconfig kconfigwidgets kcoreaddons
     kdbusaddons kdsoap kguiaddons kdnssd kiconthemes ki18n kio khtml
-    kpty syntax-highlighting libmtp libssh openexr openslp
-    phonon qtsvg samba solid gperf
+    kpty syntax-highlighting libmtp libssh openexr libtirpc openslp
+    phonon qtsvg samba solid gperf taglib
   ];
 
   # org.kde.kmtpd5 DBUS service launches kiod5 binary from kio derivation, not from kio-extras