From d271eed0ba06260724c301aca3c1c19c5da6780b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Fri, 30 Sep 2022 23:43:35 -0400
Subject: [PATCH 01/10] libsForQt5.plasmaMobileGear: 22.06 -> 22.09

https://plasma-mobile.org/2022/09/27/plasma-mobile-gear-22-09/
---
 pkgs/applications/plasma-mobile/angelfish.nix |   4 +-
 pkgs/applications/plasma-mobile/fetch.sh      |   2 +-
 pkgs/applications/plasma-mobile/srcs.nix      | 192 +++++++++---------
 3 files changed, 99 insertions(+), 99 deletions(-)

diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix
index 35f7b60a45a9..c6f95917f445 100644
--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -20,8 +20,8 @@
 , srcs
 
 # These must be updated in tandem with package updates.
-, cargoShaForVersion ? "22.06"
-, cargoSha256 ? "ckxShWgqGaApYoGQdrRQKCKOsbwUH5QP82x3BNM4Jx8="
+, cargoShaForVersion ? "22.09"
+, cargoSha256 ? "sha256-uxLvAhRV185srZZ0ZMsLRevAyMmajXERPRYotMcnLJA="
 }:
 
 # Guard against incomplete updates.
diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
index 41ff6d0f7d6d..eca997005288 100644
--- a/pkgs/applications/plasma-mobile/fetch.sh
+++ b/pkgs/applications/plasma-mobile/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.06/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.09/ -A '*.tar.xz' )
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
index 849118e5ce65..5bc824c44196 100644
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -4,195 +4,195 @@
 
 {
   alligator = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/alligator-22.06.tar.xz";
-      sha256 = "1h4jawzmiikn81iajc62pkgdv0xlc2w9g80l04awfiz2546rcxmf";
-      name = "alligator-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/alligator-22.09.tar.xz";
+      sha256 = "0krys21df6mlyi2zxdxgqx02k1q7njliz0nsxcygxrd89ajxlslb";
+      name = "alligator-22.09.tar.xz";
     };
   };
   angelfish = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/angelfish-22.06.tar.xz";
-      sha256 = "0s9kzkw0ikb4r4x04nyd568kika7wvi5gj0k6735nwjn5qyp933f";
-      name = "angelfish-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/angelfish-22.09.tar.xz";
+      sha256 = "1blhn84xka11zjwqimr30qv94jp5slfcmc44xcjxginl3n6hicwx";
+      name = "angelfish-22.09.tar.xz";
     };
   };
   audiotube = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/audiotube-22.06.tar.xz";
-      sha256 = "0680cr90nsa5qc9qm9vpl7993zmz0r1ms0m4f63cds7k8zrwwal0";
-      name = "audiotube-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/audiotube-22.09.tar.xz";
+      sha256 = "1ay3qrg8lnw209kwmgm2ll5k1gbp2q694g6w837xl2wjy792vqw8";
+      name = "audiotube-22.09.tar.xz";
     };
   };
   calindori = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/calindori-22.06.tar.xz";
-      sha256 = "0fcbkk1yisdd6z1qvac9x6i55wfppqpdma87a0n5smm191lkjg07";
-      name = "calindori-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/calindori-22.09.tar.xz";
+      sha256 = "1pwgdqznp76mhk0ikzjhy3c67qgk91kgv69ygqwzlh5hwiw5sl4n";
+      name = "calindori-22.09.tar.xz";
     };
   };
   kalk = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kalk-22.06.tar.xz";
-      sha256 = "09c3rfnljjacw55vdrgcpp18vkbbjzq6brcfs6gb0nhfgbjj6ava";
-      name = "kalk-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kalk-22.09.tar.xz";
+      sha256 = "0sci3jv3asjxahcdz2vkmh90fbffx8lfj1cy5kqnpijdxcm10gfq";
+      name = "kalk-22.09.tar.xz";
     };
   };
   kasts = {
-    version = "22.06";
+    version = "22.09.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kasts-22.06.tar.xz";
-      sha256 = "0hznam4gxrhz1sbykl7wr0mqa6r23mskx5qhp0lq3sxaxiy9jlrk";
-      name = "kasts-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kasts-22.09.2.tar.xz";
+      sha256 = "10i0b8k1k0ki8pq8hsj979y7np75iaq49bxkyj95zzci9g73vd59";
+      name = "kasts-22.09.2.tar.xz";
     };
   };
   kclock = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kclock-22.06.tar.xz";
-      sha256 = "1rd2gxbc3p5h1xjwn59vqr5v2xdk8b0m0dx6qsmihx1qnr2k5vrj";
-      name = "kclock-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kclock-22.09.tar.xz";
+      sha256 = "18b5lncgh9vc94bgrdmzigi853j4l7hqrvggk4hfcklj4pnv1bav";
+      name = "kclock-22.09.tar.xz";
     };
   };
   keysmith = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/keysmith-22.06.tar.xz";
-      sha256 = "0qwfvznjp85y93y3dry5pkcqz6y63wpk2h2p5m3qiymk3qckm9yj";
-      name = "keysmith-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/keysmith-22.09.tar.xz";
+      sha256 = "0w3vvmp9rn6ahly2fm9n6f4glfr7d84bfvj33mrs5pn7n99h7jgy";
+      name = "keysmith-22.09.tar.xz";
     };
   };
   khealthcertificate = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/khealthcertificate-22.06.tar.xz";
-      sha256 = "079j9df21hcfs62ikh2q8sjxq59qiqvinicjvghk708xf0dkl8nh";
-      name = "khealthcertificate-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/khealthcertificate-22.09.tar.xz";
+      sha256 = "16vkjpyxwx34pvdpnci0l6mx2bdjialiscjvbdx53xbsq9ff701k";
+      name = "khealthcertificate-22.09.tar.xz";
     };
   };
   koko = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/koko-22.06.tar.xz";
-      sha256 = "0fcwls7xq0dmb2ghn8x6xq26a4qa9ashnlm8ypcyfmfr4pvxwlml";
-      name = "koko-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/koko-22.09.tar.xz";
+      sha256 = "1z3ysc2f1agbkmm2cxa87x5rk2nx9fjv3czlvcsn8s5ssfdws3gl";
+      name = "koko-22.09.tar.xz";
     };
   };
   kongress = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kongress-22.06.tar.xz";
-      sha256 = "1mlyqdv0y112z4c56a9746hc8x0xrcvw0qqafm7vvd7hy5idqsrb";
-      name = "kongress-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kongress-22.09.tar.xz";
+      sha256 = "0pjp2s774sgw2dklqib8alm1a9fkixy3s92i2v8v00znx08zf2jz";
+      name = "kongress-22.09.tar.xz";
     };
   };
   krecorder = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/krecorder-22.06.tar.xz";
-      sha256 = "148gqz5xya1pxw0mhs82dns0wmpvl8h48hrb5hly9jwdymb7143g";
-      name = "krecorder-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/krecorder-22.09.tar.xz";
+      sha256 = "0kcgw7bsyw3bhai2djcq3qjn5ims7i4qbvpm7nwpjkm1p3m7fjii";
+      name = "krecorder-22.09.tar.xz";
     };
   };
   ktrip = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/ktrip-22.06.tar.xz";
-      sha256 = "123770qa8d4xhpgga6gbs7dnnfmka9jshsbkpckvbzl3ndcnlpql";
-      name = "ktrip-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/ktrip-22.09.tar.xz";
+      sha256 = "0x9s4yh2nvy7zmg3ds9bn8ir6wx10i8d0mvfaylbzb39rcabpmrl";
+      name = "ktrip-22.09.tar.xz";
     };
   };
   kweather = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/kweather-22.06.tar.xz";
-      sha256 = "0a47swzvp6z1fdn3vhgfnqz06583x6xsgvf01wsspkz4g2lxj5zk";
-      name = "kweather-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/kweather-22.09.tar.xz";
+      sha256 = "0z3z659y1r1jry02w0hxwcpghkgxgqiwj1kqck07vlg8ks7lz1jz";
+      name = "kweather-22.09.tar.xz";
     };
   };
   neochat = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/neochat-22.06.tar.xz";
-      sha256 = "16wxkc3h0bqlnb7jhkk6qh1v5hj06rwaj7khzqxbm9cj8zh29wdn";
-      name = "neochat-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/neochat-22.09.tar.xz";
+      sha256 = "1j8p6mv89q1krjjbc9n26r83csqpxwd03zzhvzxxm53334qwqdci";
+      name = "neochat-22.09.tar.xz";
     };
   };
   plasma-dialer = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasma-dialer-22.06.tar.xz";
-      sha256 = "07sbjmk9hzf1nhk7jhvavikwkb4nmy0bwccs7qa4nf9g2yzbli87";
-      name = "plasma-dialer-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasma-dialer-22.09.tar.xz";
+      sha256 = "1wk8q5lc15d53viqyknsww1hgci1rxmnra4hj887fabnj0id29rs";
+      name = "plasma-dialer-22.09.tar.xz";
     };
   };
   plasma-phonebook = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasma-phonebook-22.06.tar.xz";
-      sha256 = "00h9plfjgr4bmcay56la074pza2hp4l28a566nbqqivagpn1qz8w";
-      name = "plasma-phonebook-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasma-phonebook-22.09.tar.xz";
+      sha256 = "1wsv330sfjh78fg98kd2g6a4bsmdyf7gn9r3aqazci7p7i5n2ln0";
+      name = "plasma-phonebook-22.09.tar.xz";
     };
   };
   plasma-settings = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasma-settings-22.06.tar.xz";
-      sha256 = "096zyzxff0b948wnnmdykp9fm87r8xyn8kkndnjkrmacz2p3822m";
-      name = "plasma-settings-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasma-settings-22.09.tar.xz";
+      sha256 = "0jq2r7ckz27a8r41n4jn61wlrpcx0qwlasipig4jz7rc9i0ayfka";
+      name = "plasma-settings-22.09.tar.xz";
     };
   };
   plasmatube = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/plasmatube-22.06.tar.xz";
-      sha256 = "009kcba9blhyx8xhbsxawjxayq1vrpi2byig1n1ra848kij0hi3q";
-      name = "plasmatube-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/plasmatube-22.09.tar.xz";
+      sha256 = "00w9p5fcpv4s406lmcdcbrxf19sgkvf9yy8pfjmf1asvvvi8bpnk";
+      name = "plasmatube-22.09.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/qmlkonsole-22.06.tar.xz";
-      sha256 = "1h244bb566sgfgswgdqkljfdd70z4v52gxm0h5bmvmdqjhb6zg7n";
-      name = "qmlkonsole-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/qmlkonsole-22.09.tar.xz";
+      sha256 = "19bf9f4vxa8arnl1zjappg6kh21br131cbsx902qnpv6y0r3swz1";
+      name = "qmlkonsole-22.09.tar.xz";
     };
   };
   spacebar = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/spacebar-22.06.tar.xz";
-      sha256 = "0jl9gvhf8dfg9y8wwxp0c86rlsmj8inrl7syb25pz57z1mvv4kkr";
-      name = "spacebar-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/spacebar-22.09.tar.xz";
+      sha256 = "0fmk7fa7i67l8ff0amn80yxhf05vf0j9c42zj6qg5p30d1j31pbl";
+      name = "spacebar-22.09.tar.xz";
     };
   };
   telly-skout = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/telly-skout-22.06.tar.xz";
-      sha256 = "09ibm424x5k1kjbay1cn48car6xacz82dk6qwi8ww3jph32jm4pf";
-      name = "telly-skout-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/telly-skout-22.09.tar.xz";
+      sha256 = "1byakylbjjxyz6bh59dydqnvh8c627jpx39ih1ylrdl8jlkd0scy";
+      name = "telly-skout-22.09.tar.xz";
     };
   };
   tokodon = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/tokodon-22.06.tar.xz";
-      sha256 = "0cgg42ys7liab754n9nwbanwl3i7iz587933vvhf5k9zmvx4jqhb";
-      name = "tokodon-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/tokodon-22.09.tar.xz";
+      sha256 = "123vyq9vfl48l7ssrymvkhxlkwihplnssal0wvz4n2dk59byl46p";
+      name = "tokodon-22.09.tar.xz";
     };
   };
   vakzination = {
-    version = "22.06";
+    version = "22.09";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/22.06/vakzination-22.06.tar.xz";
-      sha256 = "0wa58a9fps9i0brbppcdkda1przxckg7sir8f2p8k842k2qnsvbp";
-      name = "vakzination-22.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.09/vakzination-22.09.tar.xz";
+      sha256 = "01xzc1di57j0fgzkqwa39jng0fd90laya0rj85vjda7mbh2lxxk6";
+      name = "vakzination-22.09.tar.xz";
     };
   };
 }

From 71ba09e60e192239f9734d33812453d2e72380bd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 00:21:44 -0400
Subject: [PATCH 02/10] libsForQt5.kweathercore: 0.5 -> 0.6

Closes #150010
---
 pkgs/development/libraries/kweathercore/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix
index f3617059f1e7..e0e804c11018 100644
--- a/pkgs/development/libraries/kweathercore/default.nix
+++ b/pkgs/development/libraries/kweathercore/default.nix
@@ -2,23 +2,25 @@
 , lib
 , fetchFromGitLab
 , extra-cmake-modules
+, kholidays
 , ki18n
 , qtlocation
 }:
 
 mkDerivation rec {
   pname = "kweathercore";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = pname;
     rev = "v${version}";
-    sha256 = "08ipabskhsbspkzzdlpwl89r070q8d0vc9500ma6d5i9fnpmkz6d";
+    sha256 = "sha256-LIgUSXKHcRqcBwGTRxU5Z4eHuWmPLerorlrnI6Cf9k4=";
   };
 
   buildInputs = [
+    kholidays
     ki18n
     qtlocation
   ];

From 19e66a67b0b1090b0d9c9623a688465efe4a428f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 00:36:42 -0400
Subject: [PATCH 03/10] kirigami-addons: 21.05 -> 0.4

---
 pkgs/development/libraries/kirigami-addons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/kirigami-addons/default.nix b/pkgs/development/libraries/kirigami-addons/default.nix
index 3af1c44bf885..3ccde40b751b 100644
--- a/pkgs/development/libraries/kirigami-addons/default.nix
+++ b/pkgs/development/libraries/kirigami-addons/default.nix
@@ -12,14 +12,14 @@
 
 mkDerivation rec {
   pname = "kirigami-addons";
-  version = "21.05";
+  version = "0.4";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0pwkpag15mvzhd3hvdwx0a8ajwq9j30r6069vsx85bagnag3zanh";
+    sha256 = "sha256-3RPOab10kLcMVBngcRILDXbhOBI/BhjkMZqWVC0IPlM=";
   };
 
   nativeBuildInputs = [

From 035448ea710a4c1329f2cd13e6ab0ff227bc7181 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 00:18:48 -0400
Subject: [PATCH 04/10] spacebar: Fixes for 22.09

---
 pkgs/applications/plasma-mobile/spacebar.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/plasma-mobile/spacebar.nix b/pkgs/applications/plasma-mobile/spacebar.nix
index 0e30c86df981..6a40858cdccf 100644
--- a/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/pkgs/applications/plasma-mobile/spacebar.nix
@@ -4,6 +4,8 @@
 , cmake
 , extra-cmake-modules
 
+, c-ares
+, curl
 , kcontacts
 , ki18n
 , kio
@@ -27,6 +29,8 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    c-ares
+    curl
     kcontacts
     ki18n
     kio

From a0a8b76e69bd18f599060e320069ef1f4793605b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 00:37:30 -0400
Subject: [PATCH 05/10] krecorder: Fixes for 22.09

---
 pkgs/applications/plasma-mobile/krecorder.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/plasma-mobile/krecorder.nix b/pkgs/applications/plasma-mobile/krecorder.nix
index 35d38af566c3..191a0bddb680 100644
--- a/pkgs/applications/plasma-mobile/krecorder.nix
+++ b/pkgs/applications/plasma-mobile/krecorder.nix
@@ -8,6 +8,7 @@
 , kcoreaddons
 , ki18n
 , kirigami2
+, kirigami-addons
 , qtmultimedia
 , qtquickcontrols2
 }:
@@ -25,6 +26,7 @@ mkDerivation rec {
     kcoreaddons
     ki18n
     kirigami2
+    kirigami-addons
     qtmultimedia
     qtquickcontrols2
   ];

From 02f99314830ff98f192407c8123040c913899f86 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 00:41:49 -0400
Subject: [PATCH 06/10] kweather: Fixes for 22.09

---
 pkgs/applications/plasma-mobile/kweather.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix
index 497061624b92..49dcb1db99f7 100644
--- a/pkgs/applications/plasma-mobile/kweather.nix
+++ b/pkgs/applications/plasma-mobile/kweather.nix
@@ -6,6 +6,7 @@
 
 , kconfig
 , ki18n
+, kirigami-addons
 , kirigami2
 , knotifications
 , kquickcharts
@@ -26,6 +27,7 @@ mkDerivation rec {
   buildInputs = [
     kconfig
     ki18n
+    kirigami-addons
     kirigami2
     knotifications
     kquickcharts

From 0fd0632bc5fcf6bf14dcd540a85f256136e6ab1e Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 00:53:02 -0400
Subject: [PATCH 07/10] plasma-settings: Fixes for 22.09

---
 pkgs/applications/plasma-mobile/plasma-settings.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/applications/plasma-mobile/plasma-settings.nix b/pkgs/applications/plasma-mobile/plasma-settings.nix
index 039f2d674b34..d44998ebd17d 100644
--- a/pkgs/applications/plasma-mobile/plasma-settings.nix
+++ b/pkgs/applications/plasma-mobile/plasma-settings.nix
@@ -10,10 +10,16 @@
 , kcoreaddons
 , kdbusaddons
 , ki18n
+, kirigami-addons
+, kirigami2
 , kitemmodels
+, libselinux
+, libsepol
 , modemmanager-qt
 , networkmanager-qt
+, pcre
 , plasma-framework
+, util-linux
 }:
 
 mkDerivation rec {
@@ -30,10 +36,16 @@ mkDerivation rec {
     kcoreaddons
     kdbusaddons
     ki18n
+    kirigami-addons
+    kirigami2
     kitemmodels
+    libselinux
+    libsepol
     modemmanager-qt
     networkmanager-qt
+    pcre
     plasma-framework
+    util-linux
   ];
 
   meta = with lib; {

From 67074445e831be68e4f50ff1eba2ffed3f27b1f2 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 00:18:36 -0400
Subject: [PATCH 08/10] plasma-dialer: Fixes for 22.09

https://invent.kde.org/plasma-mobile/plasma-dialer/-/commit/51e565a505ae0a8a6d9c5360c180c2ef3dd7903c
---
 .../plasma-mobile/plasma-dialer.nix           | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix
index 1a30977aba9d..9804daa35678 100644
--- a/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix
@@ -9,15 +9,24 @@
 , kcoreaddons
 , kdbusaddons
 , ki18n
+, kio
 , kirigami2
 , knotifications
 , kpeople
 , libphonenumber
+, libselinux
+, libsepol
 , modemmanager-qt
+, pcre
+, plasma-wayland-protocols
 , protobuf
+, pulseaudio-qt
 , qtfeedback
 , qtmpris
 , qtquickcontrols2
+, util-linux
+, wayland
+, wayland-protocols
 }:
 
 mkDerivation rec {
@@ -34,17 +43,31 @@ mkDerivation rec {
     kcoreaddons
     kdbusaddons
     ki18n
+    kio
     kirigami2
     knotifications
     kpeople
     libphonenumber
+    libselinux
+    libsepol
     modemmanager-qt
+    pcre
+    plasma-wayland-protocols
     protobuf # Needed by libphonenumber
+    pulseaudio-qt
     qtfeedback
     qtmpris
     qtquickcontrols2
+    util-linux
+    wayland
+    wayland-protocols
   ];
 
+  postPatch = ''
+    substituteInPlace plasma-dialer/org.kde.phone.dialer.desktop \
+      --replace "/usr/bin/" "$out/bin/"
+  '';
+
   meta = with lib; {
     description = "Dialer for Plasma Mobile";
     homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer";

From d1fa81f702eace731ee282012d5e22186c6328ef Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Oct 2022 01:52:54 -0400
Subject: [PATCH 09/10] plasma-nm: Build mobile parts too

Looking at the implementation, I don't think they'd be a problem on
stock Plasma.
---
 pkgs/desktops/plasma-5/plasma-nm/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 54c8079cf5f4..9bbb3f153b72 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -23,6 +23,11 @@ mkDerivation {
     modemmanager-qt networkmanager-qt qca-qt5
     mobile-broadband-provider-info openconnect
   ];
+
+  cmakeFlags = [
+    "-DBUILD_MOBILE=ON"
+  ];
+
   patches = [
     (substituteAll {
       src = ./0002-openvpn-binary-path.patch;

From 139173a984ad51c39fc3c2ee07329a95960714e7 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Thu, 13 Oct 2022 23:57:50 -0400
Subject: [PATCH 10/10] plasma-dialer: Disable overlay support

See:

 - https://invent.kde.org/plasma-mobile/plasma-dialer/-/issues/66
 - https://invent.kde.org/plasma-mobile/plasma-dialer/-/commit/3a91964828fb2b9f54d9f9eb5f81865af5676a42

When Plasma Gear 22.09 was released, KWin 5.26 wasn't released yet.

The linked commit was not part of Gear 22.09.
---
 pkgs/applications/plasma-mobile/plasma-dialer.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix
index 9804daa35678..6c453e3af706 100644
--- a/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix
@@ -68,6 +68,13 @@ mkDerivation rec {
       --replace "/usr/bin/" "$out/bin/"
   '';
 
+  # Plasma gear 22.09 shipped before KWin 5.26 was made available.
+  # This feature requires 5.26. Otherwise plasma-dialer segfaults.
+  # Note that we may need to keep it disabled until it stops segfaulting outside of KWin.
+  cmakeFlags = [
+    "-DDIALER_BUILD_SHELL_OVERLAY=OFF"
+  ];
+
   meta = with lib; {
     description = "Dialer for Plasma Mobile";
     homepage = "https://invent.kde.org/plasma-mobile/plasma-dialer";