From 7959f2439f657f2c4f4a60d0f97d156594a1c55b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 10 May 2022 04:56:18 +0000
Subject: [PATCH] libsForQt5.plasmaMobileGear: 21.12 -> 22.04

https://plasma-mobile.org/2022/02/09/plasma-mobile-gear-22-02/
https://plasma-mobile.org/2022/04/26/plasma-mobile-gear-22-04/
---
 pkgs/applications/plasma-mobile/angelfish.nix |   6 +-
 pkgs/applications/plasma-mobile/audiotube.nix |   2 +
 pkgs/applications/plasma-mobile/fetch.sh      |   2 +-
 pkgs/applications/plasma-mobile/krecorder.nix |   2 +
 .../plasma-mobile/plasma-dialer.nix           |   8 +-
 pkgs/applications/plasma-mobile/srcs.nix      | 184 +++++++++---------
 6 files changed, 105 insertions(+), 99 deletions(-)

diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix
index 0bc689b0f1eae..acd3a7a8c84d4 100644
--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -4,6 +4,7 @@
 , cmake
 , corrosion
 , extra-cmake-modules
+, gcc11
 , kconfig
 , kcoreaddons
 , kdbusaddons
@@ -19,8 +20,8 @@
 , srcs
 
 # These must be updated in tandem with package updates.
-, cargoShaForVersion ? "21.12"
-, cargoSha256 ? "lEqaLwXC30YBWZieEh84O8GUDvnsBSh0HaMWJWHaZJI="
+, cargoShaForVersion ? "22.04"
+, cargoSha256 ? "RtdZMBKixC3mdHeFXY9u0pHyDv93Z8p4EVY+lz1aISM="
 }:
 
 # Guard against incomplete updates.
@@ -45,6 +46,7 @@ mkDerivation rec {
     cmake
     corrosion
     extra-cmake-modules
+    gcc11 # doesn't build with GCC 9 from stdenv on aarch64
   ] ++ (with rustPlatform; [
     cargoSetupHook
     rust.cargo
diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/plasma-mobile/audiotube.nix
index cc74551e4ca0a..f020c22b1ae5a 100644
--- a/pkgs/applications/plasma-mobile/audiotube.nix
+++ b/pkgs/applications/plasma-mobile/audiotube.nix
@@ -2,6 +2,7 @@
 , mkDerivation
 
 , extra-cmake-modules
+, gcc11
 
 , kcoreaddons
 , kcrash
@@ -17,6 +18,7 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     extra-cmake-modules
+    gcc11 # doesn't build with GCC 9 from stdenv on aarch64
     python3Packages.wrapPython
     python3Packages.pybind11
   ];
diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
index 34413051ad5ea..3a3d5b18a5347 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/21.12/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/22.04/ -A '*.tar.xz' )
diff --git a/pkgs/applications/plasma-mobile/krecorder.nix b/pkgs/applications/plasma-mobile/krecorder.nix
index c41413be8842e..35d38af566c3d 100644
--- a/pkgs/applications/plasma-mobile/krecorder.nix
+++ b/pkgs/applications/plasma-mobile/krecorder.nix
@@ -5,6 +5,7 @@
 , extra-cmake-modules
 
 , kconfig
+, kcoreaddons
 , ki18n
 , kirigami2
 , qtmultimedia
@@ -21,6 +22,7 @@ mkDerivation rec {
 
   buildInputs = [
     kconfig
+    kcoreaddons
     ki18n
     kirigami2
     qtmultimedia
diff --git a/pkgs/applications/plasma-mobile/plasma-dialer.nix b/pkgs/applications/plasma-mobile/plasma-dialer.nix
index a93020e4df1df..1a30977aba9d5 100644
--- a/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ b/pkgs/applications/plasma-mobile/plasma-dialer.nix
@@ -4,6 +4,7 @@
 , cmake
 , extra-cmake-modules
 
+, callaudiod
 , kcontacts
 , kcoreaddons
 , kdbusaddons
@@ -12,11 +13,10 @@
 , knotifications
 , kpeople
 , libphonenumber
-, libpulseaudio
 , modemmanager-qt
 , protobuf
-, pulseaudio-qt
 , qtfeedback
+, qtmpris
 , qtquickcontrols2
 }:
 
@@ -29,6 +29,7 @@ mkDerivation rec {
   ];
 
   buildInputs = [
+    callaudiod
     kcontacts
     kcoreaddons
     kdbusaddons
@@ -37,11 +38,10 @@ mkDerivation rec {
     knotifications
     kpeople
     libphonenumber
-    libpulseaudio
     modemmanager-qt
     protobuf # Needed by libphonenumber
-    pulseaudio-qt
     qtfeedback
+    qtmpris
     qtquickcontrols2
   ];
 
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
index a5fc67d43c5fb..e7da4d7b0f454 100644
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -4,187 +4,187 @@
 
 {
   alligator = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/alligator-21.12.tar.xz";
-      sha256 = "0g4fp9b5n1dn27yn5ynk9yiqq2841cfa33ba9dvvmh21y82qsnkw";
-      name = "alligator-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/alligator-22.04.tar.xz";
+      sha256 = "1f2s0ay4qr7ylqnx8d1fawwi4h15gza2d4dsvrww1gm8ar1miqwc";
+      name = "alligator-22.04.tar.xz";
     };
   };
   angelfish = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/angelfish-21.12.tar.xz";
-      sha256 = "19wv68g9637zlgpnvf1jp60pdbakfgdh0z6jpzsaxqh70vlgmiba";
-      name = "angelfish-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/angelfish-22.04.tar.xz";
+      sha256 = "169bhkymfxcs93injzp86cvcdhv78pl4dfsscjahlh9c1g5lsbqa";
+      name = "angelfish-22.04.tar.xz";
     };
   };
   audiotube = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/audiotube-21.12.tar.xz";
-      sha256 = "1q7zraa9z7vdfyg3r3mkigk2x15sskwnhaz06zmprxim0bky44qp";
-      name = "audiotube-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/audiotube-22.04.tar.xz";
+      sha256 = "0x9xmlfz39ac15c4rbg33sl1bbjmglxgz39flmrvrrw9h2m62s2x";
+      name = "audiotube-22.04.tar.xz";
     };
   };
   calindori = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/calindori-21.12.tar.xz";
-      sha256 = "1rm9gdb0hp5w7wzb8km0fr0affbng9jy6vcc86qsz6b4v4j2pirb";
-      name = "calindori-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/calindori-22.04.tar.xz";
+      sha256 = "1zinhlflrx230yymlfxvm98dvvq1yig3r49bq61fmyrzq6fdfv60";
+      name = "calindori-22.04.tar.xz";
     };
   };
   kalk = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/kalk-21.12.tar.xz";
-      sha256 = "109q95kyrxp8m7zfmdmpgz4kzlqrkhz90gnrcclg1vcj272nbcyj";
-      name = "kalk-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/kalk-22.04.tar.xz";
+      sha256 = "0aaqcb7jkkqypawfkzjnqglzyni17064d0mhch8g7q0qm5izvap8";
+      name = "kalk-22.04.tar.xz";
     };
   };
   kasts = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/kasts-21.12.tar.xz";
-      sha256 = "1rnmhpxjjq9p2kpbhdpd9v5hwk47jn1x8v0krbw5761v1sc1j5v0";
-      name = "kasts-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/kasts-22.04.tar.xz";
+      sha256 = "0c60wp0i6l7ji13ap69lh21vpdq09h2nmqpzjlrwlbjqbhhx7lsh";
+      name = "kasts-22.04.tar.xz";
     };
   };
   kclock = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/kclock-21.12.tar.xz";
-      sha256 = "15069139zvxw1766gckqzb01ka55pd5idzbv8nd7n24kbls90xqj";
-      name = "kclock-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/kclock-22.04.tar.xz";
+      sha256 = "1ycln85ydd3qmzfadgg80zf7jlwx5yijxs1mbfmx7f1rr427qdk6";
+      name = "kclock-22.04.tar.xz";
     };
   };
   keysmith = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/keysmith-21.12.tar.xz";
-      sha256 = "05k2v3bd2szb1h47jwfvshbhx1ifmx1m8lv76i8jmn8kpwla0fzy";
-      name = "keysmith-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/keysmith-22.04.tar.xz";
+      sha256 = "0cx14r820mnlh75l3blc0ywxwmlinn2wakdnwl75w6i8l46k48li";
+      name = "keysmith-22.04.tar.xz";
     };
   };
   khealthcertificate = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/khealthcertificate-21.12.tar.xz";
-      sha256 = "065nc1mswpqz2lrxqamm5jf5f6nx3xhf3h7rw313crf175xq1vi3";
-      name = "khealthcertificate-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/khealthcertificate-22.04.tar.xz";
+      sha256 = "0sr90ki42m3cbjy63rl2ay02wm089wyka0lc4ik7jaic6wb47y5d";
+      name = "khealthcertificate-22.04.tar.xz";
     };
   };
   koko = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/koko-21.12.tar.xz";
-      sha256 = "18gxhngjzrg6ngprcal309kk42ls7xvaf311iybxfqsjxzc63hml";
-      name = "koko-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/koko-22.04.tar.xz";
+      sha256 = "0i4h2brc5dqwdmj2bs7nywrz7cgqcf7nmm6yl03047vj9aah01cw";
+      name = "koko-22.04.tar.xz";
     };
   };
   kongress = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/kongress-21.12.tar.xz";
-      sha256 = "1b85pq25grrcl3y5d0npay1f8jajr9iqqrpvvqh7i56bsxh6vwzw";
-      name = "kongress-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/kongress-22.04.tar.xz";
+      sha256 = "07yb8hddxl7m1wl0z7rcwdls3k9q89zl1d271n15j1rwrsbwiyxd";
+      name = "kongress-22.04.tar.xz";
     };
   };
   krecorder = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/krecorder-21.12.tar.xz";
-      sha256 = "02di8py29ah60cqanggjyf5jlcz0qixl8jgb0hm89jjqsqndd14w";
-      name = "krecorder-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/krecorder-22.04.tar.xz";
+      sha256 = "0d7nvq87avw4gj6whjrlmxs361r9cvzfmfsrca5f536jlazp95pg";
+      name = "krecorder-22.04.tar.xz";
     };
   };
   ktrip = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/ktrip-21.12.tar.xz";
-      sha256 = "1i31j1hf6c4h86vprl3gyv05dvg6dvzls6im71kqx1ynm1xjr6gr";
-      name = "ktrip-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/ktrip-22.04.tar.xz";
+      sha256 = "1ijy19axc492l4naayr3d8qdjznc286105qnki8vmcaw93p48n9x";
+      name = "ktrip-22.04.tar.xz";
     };
   };
   kweather = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/kweather-21.12.tar.xz";
-      sha256 = "101virkh7sbrzm2022axnnb5k3gw3hk4gr2v0w0i8xfl6d4dpr7j";
-      name = "kweather-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/kweather-22.04.tar.xz";
+      sha256 = "0080l00dya34d35sf6z2j3ra6lls0nafr045a9jmxv09763ydb5d";
+      name = "kweather-22.04.tar.xz";
     };
   };
   neochat = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/neochat-21.12.tar.xz";
-      sha256 = "12mb518chd4psb9gbxgnbjl8n7grsmr2wk03k7f238pxjmxi94w3";
-      name = "neochat-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/neochat-22.04.tar.xz";
+      sha256 = "04i1kn52w9jjaaw8x53mksw2vzrpsq1xrq13h158c1s3q1g9jdm8";
+      name = "neochat-22.04.tar.xz";
     };
   };
   plasma-dialer = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/plasma-dialer-21.12.tar.xz";
-      sha256 = "0pvyz4f9fmm5iahndps9mgnhbvh35ajgmnzkmmknny0pr5b3x01d";
-      name = "plasma-dialer-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/plasma-dialer-22.04.tar.xz";
+      sha256 = "0hnxasj6psplwykahhisipyvy67hfr820azixw5p820fzy11x2g4";
+      name = "plasma-dialer-22.04.tar.xz";
     };
   };
   plasma-phonebook = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/plasma-phonebook-21.12.tar.xz";
-      sha256 = "1qh7hqr6sbxrf92sa1pzsdp59fgc3s3b8vh42vyfww7p1v9gf4aq";
-      name = "plasma-phonebook-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/plasma-phonebook-22.04.tar.xz";
+      sha256 = "14nd2yx9cf6gabb10kcaqkdn7kb96n2209qrib7daq2ldva8c9i9";
+      name = "plasma-phonebook-22.04.tar.xz";
     };
   };
   plasma-settings = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/plasma-settings-21.12.tar.xz";
-      sha256 = "1gr6wb4jsdizxg3zc0vynfa7fwpiz5ah2s1qpcdir80fjyxhxld7";
-      name = "plasma-settings-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/plasma-settings-22.04.tar.xz";
+      sha256 = "1k40mviikpij1srar1hkg732qg14ld0176g1mpza0ysr3yr21vny";
+      name = "plasma-settings-22.04.tar.xz";
     };
   };
   plasmatube = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/plasmatube-21.12.tar.xz";
-      sha256 = "15jyffv4q11sklh7wwivdny58ia09yyrjdj2r6wqjclrdb8n9ni7";
-      name = "plasmatube-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/plasmatube-22.04.tar.xz";
+      sha256 = "01bmxdh0aclm184j5s0kddjc7a14225bdnbkr8jlk21g9wlw8cyx";
+      name = "plasmatube-22.04.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "21.12";
+    version = "22.04.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/qmlkonsole-21.12.tar.xz";
-      sha256 = "0ywdrz00i40hwhci3l4p8f0z4bjnn9vvsz0p154p1cdn7cz9ydca";
-      name = "qmlkonsole-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/qmlkonsole-22.04.1.tar.xz";
+      sha256 = "06zfrqaag9sgihs5k93nssgm4smrs2ymh7q0fx35z7fcphngjpaw";
+      name = "qmlkonsole-22.04.1.tar.xz";
     };
   };
   spacebar = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/spacebar-21.12.tar.xz";
-      sha256 = "062vcba6krp3ksskd2v8szvdblmbzdw580blzy767iac4fx6zybf";
-      name = "spacebar-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/spacebar-22.04.tar.xz";
+      sha256 = "0ga3symavdrq5aim924bd889b9cmv09dyplz9gcspk46w49vx3s5";
+      name = "spacebar-22.04.tar.xz";
     };
   };
   tokodon = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/tokodon-21.12.tar.xz";
-      sha256 = "0wd41f7xza26lmznj3qisn9islhwnp6kzqsbm66j0vppb35sbfb3";
-      name = "tokodon-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/tokodon-22.04.tar.xz";
+      sha256 = "0c9q2ax0h047xm3g5r5cn6sxfyv2lb93dahd5z3nw67bfrzwvnw2";
+      name = "tokodon-22.04.tar.xz";
     };
   };
   vakzination = {
-    version = "21.12";
+    version = "22.04";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.12/vakzination-21.12.tar.xz";
-      sha256 = "191g6j7s01khg5vbxzbx8d6729vxvgbw3di1bprgm26ahxl430l4";
-      name = "vakzination-21.12.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/22.04/vakzination-22.04.tar.xz";
+      sha256 = "0zadygzw4xzpwbdnb6dwjjjls1h915gp9xaf59kbfbmzwb6m4mf8";
+      name = "vakzination-22.04.tar.xz";
     };
   };
 }