From e51348d672c74b0d848976182600a41f14752fac Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 14 Jul 2021 00:37:09 -0400
Subject: [PATCH 01/15] plasmaMobileGear: 21.05 -> 21.06

 - https://www.plasma-mobile.org/2021/06/10/plasma-mobile-update-june/
 - https://www.plasma-mobile.org/info/plasma-mobile-gear-21-06/

New:

 - kasts
 - keysmith
 - kweather
 - tokodon
---
 pkgs/applications/plasma-mobile/fetch.sh |   2 +-
 pkgs/applications/plasma-mobile/srcs.nix | 144 ++++++++++++++---------
 2 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
index 29a8e6b4c792..754fc3d1ce34 100644
--- a/pkgs/applications/plasma-mobile/fetch.sh
+++ b/pkgs/applications/plasma-mobile/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma-mobile/21.05 -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma-mobile/21.06 -A '*.tar.xz' )
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
index 4df185aa0aec..509770a4d91e 100644
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -4,115 +4,147 @@
 
 {
   alligator = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/alligator-21.05.tar.xz";
-      sha256 = "04zgxfx2zmn1p2ap08i5sfsnrly3smip4ylr07ghkhkiyjzbv9w6";
-      name = "alligator-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/alligator-21.06.tar.xz";
+      sha256 = "18f1hsfl5glmrs778z8xkcszcs7fj148giz9bs5adg1sczjdja2j";
+      name = "alligator-21.06.tar.xz";
     };
   };
   angelfish = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/angelfish-21.05.tar.xz";
-      sha256 = "11jd5dwy0xa7kh5z5rc29xy3wfn20hm31908zjax4x83qqjrm075";
-      name = "angelfish-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/angelfish-21.06.tar.xz";
+      sha256 = "0yvp307gbj3c8wk7cyk2hdh1r1gy1x7j2mbr8pkl6sfyy0djcy48";
+      name = "angelfish-21.06.tar.xz";
     };
   };
   calindori = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/calindori-21.05.tar.xz";
-      sha256 = "110f9ri9r1nb6q1ybhkfxljl4q5gqxikh9z0xkzjjbxjjqfscqcj";
-      name = "calindori-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/calindori-21.06.tar.xz";
+      sha256 = "0ivfy9n7gcbxpyk6d6zlaj6xnzcvgrn01svild61cza5vcp1dp28";
+      name = "calindori-21.06.tar.xz";
     };
   };
   kalk = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/kalk-21.05.tar.xz";
-      sha256 = "04n65hx0j9rx6b3jq69zgypi8qjd4ig3rfw7d44c3q7dgh4k451l";
-      name = "kalk-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/kalk-21.06.tar.xz";
+      sha256 = "06i9z3x8c5yiylzk272cbmp88q1bk6plspp6zckwzbmi19pkvmki";
+      name = "kalk-21.06.tar.xz";
+    };
+  };
+  kasts = {
+    version = "21.06";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.06/kasts-21.06.tar.xz";
+      sha256 = "0kayg137haqfjb2j7bc61vnqq2gp0f24n41lqygwnndh2wyl22x0";
+      name = "kasts-21.06.tar.xz";
     };
   };
   kclock = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/kclock-21.05.tar.xz";
-      sha256 = "0pa5hvax0y80l8yrqczh9mcknfm3z0vdq3xc35cxdiz1vc6fwqmd";
-      name = "kclock-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/kclock-21.06.tar.xz";
+      sha256 = "1h91l2ip15kfd2p85r96npib34gms7zacnn8dqb4j2m6znxjh9ib";
+      name = "kclock-21.06.tar.xz";
+    };
+  };
+  keysmith = {
+    version = "21.06";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.06/keysmith-21.06.tar.xz";
+      sha256 = "01v05m327av4hwn50slay8w1flsgh2as06z582r08y4rrn2q6crg";
+      name = "keysmith-21.06.tar.xz";
     };
   };
   koko = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/koko-21.05.tar.xz";
-      sha256 = "00hnzkl8dvf15psrcfh96b8wfb3pbggd2f7xnadzcb87sbaml035";
-      name = "koko-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/koko-21.06.tar.xz";
+      sha256 = "117v8m68i4yq0j1lr2xm1c08474xlscxdnxv979gjcz0ghw402q2";
+      name = "koko-21.06.tar.xz";
     };
   };
   kongress = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/kongress-21.05.tar.xz";
-      sha256 = "0qxgpi04ra9crc6drgbdm9arjbvcx52pprjr1dj8acch07f6i2gs";
-      name = "kongress-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/kongress-21.06.tar.xz";
+      sha256 = "03nm9jnhv5nqq8l9qp6xxk96vl44dias9y9y59agcs9lz16vxxvz";
+      name = "kongress-21.06.tar.xz";
     };
   };
   krecorder = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/krecorder-21.05.tar.xz";
-      sha256 = "0ydaidxx2616bixihyaagvyym1r5s9rjkgg04vq9k4608d4vnn5c";
-      name = "krecorder-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/krecorder-21.06.tar.xz";
+      sha256 = "1l2wq9hwd1dimc8n35hd7cckh8mcjabjv936qzk32c7pychxnz5f";
+      name = "krecorder-21.06.tar.xz";
     };
   };
   ktrip = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/ktrip-21.05.tar.xz";
-      sha256 = "0hxgnncyc2ir6i9p6s9fy1r4mhxgm643pxvp8lj3j5y0c5wk2kp9";
-      name = "ktrip-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/ktrip-21.06.tar.xz";
+      sha256 = "172y49g7h60dksd96fim67c1lmqfpha83rvh5r0hljla8x4jjrip";
+      name = "ktrip-21.06.tar.xz";
+    };
+  };
+  kweather = {
+    version = "21.06";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.06/kweather-21.06.tar.xz";
+      sha256 = "0ja0bagsk5rbdmgpakc236vlx1dfk5bnr60cdb1da7pswvxz9gfn";
+      name = "kweather-21.06.tar.xz";
     };
   };
   plasma-dialer = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/plasma-dialer-21.05.tar.xz";
-      sha256 = "0kwkjn7ry6snc86qi1j7kcq5qa6rbyk5i7v6gqf7a7wywkk9n045";
-      name = "plasma-dialer-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/plasma-dialer-21.06.tar.xz";
+      sha256 = "1b6zdswy5wfbzcmpy5hmblbv95hb5bwdh6bi7f1r196aw74j4hxl";
+      name = "plasma-dialer-21.06.tar.xz";
     };
   };
   plasma-phonebook = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/plasma-phonebook-21.05.tar.xz";
-      sha256 = "0aqqi3gvcsh4zg41zf8y0c626lwrabjchhr8pxj4n9la7y0wdvca";
-      name = "plasma-phonebook-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/plasma-phonebook-21.06.tar.xz";
+      sha256 = "0a5vkvysjmp3lbwn9s1pfjijk9mc0yvyp3xshg0w8bz5ky06rs8f";
+      name = "plasma-phonebook-21.06.tar.xz";
     };
   };
   plasma-settings = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/plasma-settings-21.05.tar.xz";
-      sha256 = "16bhx0i8gvi9ina4jxzx02xyzypyjic9646lahxvzvzmd9hn9ipi";
-      name = "plasma-settings-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/plasma-settings-21.06.tar.xz";
+      sha256 = "1lvjjdrgk5cxxzsb2knlbh27n7ji1plpcxr2lycfv0fjq51rjsjg";
+      name = "plasma-settings-21.06.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/qmlkonsole-21.05.tar.xz";
-      sha256 = "1ga48n09zlgvf5vvk2m26ak3ih5gjf361xxnyfprimmd7yj23han";
-      name = "qmlkonsole-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/qmlkonsole-21.06.tar.xz";
+      sha256 = "15rwn0rhx4c7mn68494ylg8ng1pb4afhwwndiarr8fzmi29fgx8l";
+      name = "qmlkonsole-21.06.tar.xz";
     };
   };
   spacebar = {
-    version = "21.05";
+    version = "21.06";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.05/spacebar-21.05.tar.xz";
-      sha256 = "16lvi5yzmvk6gb5m7csk44y2jbkk7psn1lkljmj1938p2475b94c";
-      name = "spacebar-21.05.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.06/spacebar-21.06.tar.xz";
+      sha256 = "14wk35yk7crp9449x23yy8sxg8cnxb7gp6fhnws8zc89w3l2faqn";
+      name = "spacebar-21.06.tar.xz";
+    };
+  };
+  tokodon = {
+    version = "21.06";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.06/tokodon-21.06.tar.xz";
+      sha256 = "1xzjq3sqdccarq9a3w54hajqnhlg3lplg17f81sy9yld1as4rria";
+      name = "tokodon-21.06.tar.xz";
     };
   };
 }

From 099ac66d71b524ac17d9d131aba2b6914f033d80 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 14 Jul 2021 00:42:28 -0400
Subject: [PATCH 02/15] pulseaudio-qt: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/libraries/pulseaudio-qt/default.nix b/pkgs/development/libraries/pulseaudio-qt/default.nix
index 03d656f91fae..c1ba89f05842 100644
--- a/pkgs/development/libraries/pulseaudio-qt/default.nix
+++ b/pkgs/development/libraries/pulseaudio-qt/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   pname = "pulseaudio-qt";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/${pname}/${pname}-${lib.versions.majorMinor version}.tar.xz";
-    sha256 = "1i0ql68kxv9jxs24rsd3s7jhjid3f2fq56fj4wbp16zb4wd14099";
+    sha256 = "1i4yb0v1mmhih8c2i61hybg6q60qys3pc5wbjb7a0vwl1mihgsxw";
   };
 
   buildInputs = [

From abd65c818d6127c1a82ae78067956518f8a5f4a3 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 14 Jul 2021 00:59:33 -0400
Subject: [PATCH 03/15] kasts: init at 21.06

---
 pkgs/applications/plasma-mobile/default.nix |  1 +
 pkgs/applications/plasma-mobile/kasts.nix   | 57 +++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/kasts.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 18f550955c57..6283989f846a 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -64,6 +64,7 @@ let
       alligator = callPackage ./alligator.nix {};
       calindori = callPackage ./calindori.nix {};
       kalk = callPackage ./kalk.nix {};
+      kasts = callPackage ./kasts.nix {};
       kclock = callPackage ./kclock.nix {};
       koko = callPackage ./koko.nix {};
       krecorder = callPackage ./krecorder.nix {};
diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/plasma-mobile/kasts.nix
new file mode 100644
index 000000000000..370cba7e2ea8
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/kasts.nix
@@ -0,0 +1,57 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+, wrapGAppsHook
+
+, gst_all_1
+, kconfig
+, kcoreaddons
+, ki18n
+, kirigami2
+, qtmultimedia
+, qtquickcontrols2
+, syndication
+}:
+
+let
+  inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad;
+in
+mkDerivation rec {
+  pname = "kasts";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gstreamer
+
+    kconfig
+    kcoreaddons
+    ki18n
+    kirigami2
+    qtquickcontrols2
+    qtmultimedia
+    syndication
+  ];
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+  dontWrapGApps = true;
+
+  meta = with lib; {
+    description = "Mobile podcast application";
+    homepage = "https://apps.kde.org/kasts/";
+    # https://invent.kde.org/plasma-mobile/kasts/-/tree/master/LICENSES
+    license = with licenses; [ bsd2 cc-by-sa-40 cc0 gpl2Only gpl2Plus gpl3Only gpl3Plus lgpl3Plus ];
+    maintainers = with maintainers; [ samueldr ];
+  };
+}

From ae5b37c833e7c4b93022c00ffd089c303d1be2b9 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 14 Jul 2021 01:12:01 -0400
Subject: [PATCH 04/15] keysmith: 0.2 -> 21.06

---
 pkgs/applications/plasma-mobile/default.nix  |  1 +
 pkgs/applications/plasma-mobile/keysmith.nix | 39 +++++++++++++++++++
 pkgs/tools/security/keysmith/default.nix     | 40 --------------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  2 -
 5 files changed, 41 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/applications/plasma-mobile/keysmith.nix
 delete mode 100644 pkgs/tools/security/keysmith/default.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 6283989f846a..d02bf4b9f396 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -66,6 +66,7 @@ let
       kalk = callPackage ./kalk.nix {};
       kasts = callPackage ./kasts.nix {};
       kclock = callPackage ./kclock.nix {};
+      keysmith = callPackage ./keysmith.nix {};
       koko = callPackage ./koko.nix {};
       krecorder = callPackage ./krecorder.nix {};
       ktrip = callPackage ./ktrip.nix {};
diff --git a/pkgs/applications/plasma-mobile/keysmith.nix b/pkgs/applications/plasma-mobile/keysmith.nix
new file mode 100644
index 000000000000..eaca7f68e24b
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/keysmith.nix
@@ -0,0 +1,39 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kdbusaddons
+, ki18n
+, kirigami2
+, kwindowsystem
+, libsodium
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  pname = "keysmith";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kdbusaddons
+    ki18n
+    kirigami2
+    kwindowsystem
+    libsodium
+    qtquickcontrols2
+  ];
+
+  meta = with lib; {
+    description = "OTP client for Plasma Mobile and Desktop";
+    license = licenses.gpl3;
+    homepage = "https://github.com/KDE/keysmith";
+    maintainers = with maintainers; [ samueldr shamilton ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/security/keysmith/default.nix b/pkgs/tools/security/keysmith/default.nix
deleted file mode 100644
index 142e9c1e4a04..000000000000
--- a/pkgs/tools/security/keysmith/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ lib
-, mkDerivation
-, makeWrapper
-, fetchFromGitHub
-, cmake
-, extra-cmake-modules
-, qtbase
-, qtquickcontrols2
-, qtdeclarative
-, qtgraphicaleffects
-, kirigami2
-, oathToolkit
-, ki18n
-, libsodium
-}:
-mkDerivation rec {
-
-  pname = "keysmith";
-  version = "0.2";
-
-  src = fetchFromGitHub {
-    owner = "KDE";
-    repo = "keysmith";
-    rev = "v${version}";
-    sha256 = "1gvzw23mly8cp7ag3xpbngpid9gqrfj8cyv9dar6i9j660bh03km";
-  };
-
-  nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
-
-  buildInputs = [ libsodium ki18n oathToolkit kirigami2 qtquickcontrols2 qtbase ];
-  propagatedBuildInput = [ oathToolkit ];
-
-  meta = with lib; {
-    description = "OTP client for Plasma Mobile and Desktop";
-    license = licenses.gpl3;
-    homepage = "https://github.com/KDE/keysmith";
-    maintainers = with maintainers; [ shamilton ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index de1f397d89bd..b7938faada57 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -392,6 +392,7 @@ mapAliases ({
   keepassx2-http = keepassx-reboot; # added 2016-10-17
   kexectools = kexec-tools; # added 2021-09-03
   keybase-go = keybase;  # added 2016-08-24
+  keysmith = libsForQt5.plasmaMobileGear.keysmith; # added 2021-07-14
   kinetic-cpp-client = throw "kinetic-cpp-client has been removed from nixpkgs, as it's abandoned."; # 2020-04-28
   kicad-with-packages3d = kicad; # added 2019-11-25
   kindlegen = throw "kindlegen has been removed from nixpkgs, as it's abandoned and no longer available for download."; # 2021-03-09
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f5f4114b467..2ed831d797be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6925,8 +6925,6 @@ with pkgs;
 
   kea = callPackage ../tools/networking/kea { };
 
-  keysmith = libsForQt5.callPackage ../tools/security/keysmith { };
-
   ispell = callPackage ../tools/text/ispell {};
 
   iodash = callPackage ../development/libraries/iodash { };

From 847b2cec0dd40f07dde8ad9fb12a1cca90aceca8 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 15:34:08 -0400
Subject: [PATCH 05/15] kweathercore: init at v0.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Why 0.4 when 0.5 is tagged? Because current kweather depends on 0.4 and
won't build with 0.5...

¯\_(ツ)_/¯
---
 .../libraries/kweathercore/default.nix        | 35 +++++++++++++++++++
 pkgs/top-level/qt5-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/kweathercore/default.nix

diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix
new file mode 100644
index 000000000000..8ab5d358e5c9
--- /dev/null
+++ b/pkgs/development/libraries/kweathercore/default.nix
@@ -0,0 +1,35 @@
+{ mkDerivation
+, lib
+, fetchFromGitLab
+, extra-cmake-modules
+, ki18n
+, qtlocation
+}:
+
+mkDerivation rec {
+  pname = "kweathercore";
+  version = "0.4";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "libraries";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0mwmkr1xg0mcgbjgzp04chf55xyrgf0gndg3hs4c21bfjpy1gp3k";
+  };
+
+  buildInputs = [
+    ki18n
+    qtlocation
+  ];
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+
+  meta = with lib; {
+    license = [ licenses.cc0 ];
+    maintainers = [ maintainers.samueldr ];
+    description = ''
+      Library to facilitate retrieval of weather information including forecasts and alerts
+    '';
+  };
+}
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index a5adec5d78f6..6a9450125b8e 100644
--- a/pkgs/top-level/qt5-packages.nix
+++ b/pkgs/top-level/qt5-packages.nix
@@ -108,6 +108,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea
 
   kquickimageedit = callPackage ../development/libraries/kquickimageedit { };
 
+  kweathercore = libsForQt5.callPackage ../development/libraries/kweathercore { };
+
   ldutils = callPackage ../development/libraries/ldutils { };
 
   libcommuni = callPackage ../development/libraries/libcommuni { };

From f50a6b50a59a8ef66483b6cf41b0a0a8a5502c0f Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 22 Mar 2021 16:20:08 -0400
Subject: [PATCH 06/15] kweather: init at 21.06

---
 pkgs/applications/plasma-mobile/default.nix  |  1 +
 pkgs/applications/plasma-mobile/kweather.nix | 42 ++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/kweather.nix

diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index d02bf4b9f396..04532ea18e14 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -70,6 +70,7 @@ let
       koko = callPackage ./koko.nix {};
       krecorder = callPackage ./krecorder.nix {};
       ktrip = callPackage ./ktrip.nix {};
+      kweather = callPackage ./kweather.nix {};
       plasma-dialer = callPackage ./plasma-dialer.nix {};
       plasma-phonebook = callPackage ./plasma-phonebook.nix {};
       spacebar = callPackage ./spacebar.nix {};
diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix
new file mode 100644
index 000000000000..8d12c76646b5
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/kweather.nix
@@ -0,0 +1,42 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kconfig
+, ki18n
+, kirigami2
+, knotifications
+, kquickcharts
+, kweathercore
+, plasma-framework
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  pname = "kweather";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kconfig
+    ki18n
+    kirigami2
+    knotifications
+    kquickcharts
+    kweathercore
+    plasma-framework
+    qtquickcontrols2
+  ];
+
+  meta = with lib; {
+    description = "Weather application for Plasma Mobile";
+    homepage = "https://invent.kde.org/plasma-mobile/kweather";
+    license = with licenses; [ gpl2Plus cc-by-40 ];
+    maintainers = with maintainers; [ samueldr ];
+  };
+}

From e4767481a3fbd51f4169bc1675f1dfa3166012a4 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 16:45:22 -0400
Subject: [PATCH 07/15] plasmaMobileGear: 21.06 -> 21.07

 - https://www.plasma-mobile.org/2021/07/20/plasma-mobile-gear-21-07/

(Nothing new)
---
 pkgs/applications/plasma-mobile/fetch.sh |   2 +-
 pkgs/applications/plasma-mobile/srcs.nix | 146 +++++++++++------------
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
index 754fc3d1ce34..7531dafc63f3 100644
--- a/pkgs/applications/plasma-mobile/fetch.sh
+++ b/pkgs/applications/plasma-mobile/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma-mobile/21.06 -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.07/ -A '*.tar.xz' )
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
index 509770a4d91e..f8bb5cbdefa2 100644
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -1,150 +1,150 @@
 # DO NOT EDIT! This file is generated automatically.
-# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile/
+# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/plasma-mobile
 { fetchurl, mirror }:
 
 {
   alligator = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/alligator-21.06.tar.xz";
-      sha256 = "18f1hsfl5glmrs778z8xkcszcs7fj148giz9bs5adg1sczjdja2j";
-      name = "alligator-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/alligator-21.07.tar.xz";
+      sha256 = "1zcx21wabsvk42lhcqqw911f26zilbh70vhlp2vpl5f8adhjl9ak";
+      name = "alligator-21.07.tar.xz";
     };
   };
   angelfish = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/angelfish-21.06.tar.xz";
-      sha256 = "0yvp307gbj3c8wk7cyk2hdh1r1gy1x7j2mbr8pkl6sfyy0djcy48";
-      name = "angelfish-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/angelfish-21.07.tar.xz";
+      sha256 = "0znxzs261924an756bqhnm7y9placxd3ar8fi48vcp3x34kczm3v";
+      name = "angelfish-21.07.tar.xz";
     };
   };
   calindori = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/calindori-21.06.tar.xz";
-      sha256 = "0ivfy9n7gcbxpyk6d6zlaj6xnzcvgrn01svild61cza5vcp1dp28";
-      name = "calindori-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/calindori-21.07.tar.xz";
+      sha256 = "00c4iklzfd4ap1nm6nh3dl5fzcsmf35i4dhyhz242byriz0k5gw2";
+      name = "calindori-21.07.tar.xz";
     };
   };
   kalk = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/kalk-21.06.tar.xz";
-      sha256 = "06i9z3x8c5yiylzk272cbmp88q1bk6plspp6zckwzbmi19pkvmki";
-      name = "kalk-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/kalk-21.07.tar.xz";
+      sha256 = "142cy2jz2dnlsmghwnsgb2a4kmxbcr0mw9lxrn98rxfd4bb33pki";
+      name = "kalk-21.07.tar.xz";
     };
   };
   kasts = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/kasts-21.06.tar.xz";
-      sha256 = "0kayg137haqfjb2j7bc61vnqq2gp0f24n41lqygwnndh2wyl22x0";
-      name = "kasts-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/kasts-21.07.tar.xz";
+      sha256 = "1ivdvhr9z3awa0pr531y4zyp2h63g1whr0kralak2k5n0wpzy44r";
+      name = "kasts-21.07.tar.xz";
     };
   };
   kclock = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/kclock-21.06.tar.xz";
-      sha256 = "1h91l2ip15kfd2p85r96npib34gms7zacnn8dqb4j2m6znxjh9ib";
-      name = "kclock-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/kclock-21.07.tar.xz";
+      sha256 = "0b1264qpwrw6rbszwbaafbah0awgik4pjq7i3q36w14b5wmjyg64";
+      name = "kclock-21.07.tar.xz";
     };
   };
   keysmith = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/keysmith-21.06.tar.xz";
-      sha256 = "01v05m327av4hwn50slay8w1flsgh2as06z582r08y4rrn2q6crg";
-      name = "keysmith-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/keysmith-21.07.tar.xz";
+      sha256 = "1vbcxabibxvzh97x028g6vzlgrbi1niiqj89p0icvjz7bsjzfiy7";
+      name = "keysmith-21.07.tar.xz";
     };
   };
   koko = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/koko-21.06.tar.xz";
-      sha256 = "117v8m68i4yq0j1lr2xm1c08474xlscxdnxv979gjcz0ghw402q2";
-      name = "koko-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/koko-21.07.tar.xz";
+      sha256 = "0sg4h1imb5zxkbn16ybsbiydqimah2cm9asrbjwgnr47ydx176hn";
+      name = "koko-21.07.tar.xz";
     };
   };
   kongress = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/kongress-21.06.tar.xz";
-      sha256 = "03nm9jnhv5nqq8l9qp6xxk96vl44dias9y9y59agcs9lz16vxxvz";
-      name = "kongress-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/kongress-21.07.tar.xz";
+      sha256 = "0j3jj5xkb1l5bxqz2hi8y66xpi145phrkdgxysq444fwdxp7pr2l";
+      name = "kongress-21.07.tar.xz";
     };
   };
   krecorder = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/krecorder-21.06.tar.xz";
-      sha256 = "1l2wq9hwd1dimc8n35hd7cckh8mcjabjv936qzk32c7pychxnz5f";
-      name = "krecorder-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/krecorder-21.07.tar.xz";
+      sha256 = "18vyhykwr5az2g2d8m8p8il7znffqzivrfix7r7aqizj7jf46l0y";
+      name = "krecorder-21.07.tar.xz";
     };
   };
   ktrip = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/ktrip-21.06.tar.xz";
-      sha256 = "172y49g7h60dksd96fim67c1lmqfpha83rvh5r0hljla8x4jjrip";
-      name = "ktrip-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/ktrip-21.07.tar.xz";
+      sha256 = "1aglj0s72ilpb4fgkk6v6i0yg0l3g2918k8whvm63k98y0jwa7r9";
+      name = "ktrip-21.07.tar.xz";
     };
   };
   kweather = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/kweather-21.06.tar.xz";
-      sha256 = "0ja0bagsk5rbdmgpakc236vlx1dfk5bnr60cdb1da7pswvxz9gfn";
-      name = "kweather-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/kweather-21.07.tar.xz";
+      sha256 = "092fx2w2bv80d6kddj93xw942a85mjbrbzsjqrg9msdbakcxfaal";
+      name = "kweather-21.07.tar.xz";
     };
   };
   plasma-dialer = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/plasma-dialer-21.06.tar.xz";
-      sha256 = "1b6zdswy5wfbzcmpy5hmblbv95hb5bwdh6bi7f1r196aw74j4hxl";
-      name = "plasma-dialer-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/plasma-dialer-21.07.tar.xz";
+      sha256 = "1f69cfjdjxnldg03xrdrm9jaavmrpc7l8plnfmvria24dq8bzkx0";
+      name = "plasma-dialer-21.07.tar.xz";
     };
   };
   plasma-phonebook = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/plasma-phonebook-21.06.tar.xz";
-      sha256 = "0a5vkvysjmp3lbwn9s1pfjijk9mc0yvyp3xshg0w8bz5ky06rs8f";
-      name = "plasma-phonebook-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/plasma-phonebook-21.07.tar.xz";
+      sha256 = "0cw3wm2pm3q9d80b23p7ina9jpbq6f8j662plyhdz2dq18c9dyni";
+      name = "plasma-phonebook-21.07.tar.xz";
     };
   };
   plasma-settings = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/plasma-settings-21.06.tar.xz";
-      sha256 = "1lvjjdrgk5cxxzsb2knlbh27n7ji1plpcxr2lycfv0fjq51rjsjg";
-      name = "plasma-settings-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/plasma-settings-21.07.tar.xz";
+      sha256 = "0cyvbjj4j0778bqslrydllgri7j72jj04yi3rlb7n6i4a5ziaibd";
+      name = "plasma-settings-21.07.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/qmlkonsole-21.06.tar.xz";
-      sha256 = "15rwn0rhx4c7mn68494ylg8ng1pb4afhwwndiarr8fzmi29fgx8l";
-      name = "qmlkonsole-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/qmlkonsole-21.07.tar.xz";
+      sha256 = "1y8jv8bspzinxbzz6aj6fwp8118k15vxcqs0jlyjd912kkjpg978";
+      name = "qmlkonsole-21.07.tar.xz";
     };
   };
   spacebar = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/spacebar-21.06.tar.xz";
-      sha256 = "14wk35yk7crp9449x23yy8sxg8cnxb7gp6fhnws8zc89w3l2faqn";
-      name = "spacebar-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/spacebar-21.07.tar.xz";
+      sha256 = "0xqffhzzs0gzyzdyajksfghzsgsls0f0sbykmywqsk3a0jpr0d1w";
+      name = "spacebar-21.07.tar.xz";
     };
   };
   tokodon = {
-    version = "21.06";
+    version = "21.07";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.06/tokodon-21.06.tar.xz";
-      sha256 = "1xzjq3sqdccarq9a3w54hajqnhlg3lplg17f81sy9yld1as4rria";
-      name = "tokodon-21.06.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.07/tokodon-21.07.tar.xz";
+      sha256 = "08mjh75h3ckvmkprjvarjhhkqq8nldyblzlz2q5rmmg682v6mf7v";
+      name = "tokodon-21.07.tar.xz";
     };
   };
 }

From caaebc00820f46eff90a599a1897a8de56144166 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 17:01:32 -0400
Subject: [PATCH 08/15] ktrip: Fix build for 21.07

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

diff --git a/pkgs/applications/plasma-mobile/ktrip.nix b/pkgs/applications/plasma-mobile/ktrip.nix
index cc1404d064fd..5377dd106586 100644
--- a/pkgs/applications/plasma-mobile/ktrip.nix
+++ b/pkgs/applications/plasma-mobile/ktrip.nix
@@ -12,6 +12,7 @@
 , kirigami2
 , kitemmodels
 , kpublictransport
+, qqc2-desktop-style
 , qtquickcontrols2
 }:
 
@@ -32,6 +33,7 @@ mkDerivation rec {
     kirigami2
     kitemmodels
     kpublictransport
+    qqc2-desktop-style
     qtquickcontrols2
   ];
 

From 1b87466f2c7d5948e8c504e8cfb9a06257f0f3dd Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 17:03:12 -0400
Subject: [PATCH 09/15] spacebar: Fix build for 21.07

---
 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 1c661041f7ae..8d5665501086 100644
--- a/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/pkgs/applications/plasma-mobile/spacebar.nix
@@ -9,7 +9,9 @@
 , kirigami2
 , knotifications
 , kpeople
+, libphonenumber
 , libqofono
+, protobuf
 , telepathy
 }:
 
@@ -27,7 +29,9 @@ mkDerivation rec {
     kirigami2
     knotifications
     kpeople
+    libphonenumber
     libqofono
+    protobuf # Needed by libphonenumber
     telepathy
   ];
 

From 1e62112123a2234c9373340e1467ae6c7f32ec69 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 17:16:31 -0400
Subject: [PATCH 10/15] plasmaMobileGear: 21.07 -> 21.08

 - https://www.plasma-mobile.org/2021/08/31/plasma-mobile-gear-21-08/

New:

 - audiotube
---
 pkgs/applications/plasma-mobile/fetch.sh |   2 +-
 pkgs/applications/plasma-mobile/srcs.nix | 152 ++++++++++++-----------
 2 files changed, 81 insertions(+), 73 deletions(-)

diff --git a/pkgs/applications/plasma-mobile/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
index 7531dafc63f3..14995aeb2b7f 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.07/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' )
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
index f8bb5cbdefa2..06b551a94cf4 100644
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -4,147 +4,155 @@
 
 {
   alligator = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/alligator-21.07.tar.xz";
-      sha256 = "1zcx21wabsvk42lhcqqw911f26zilbh70vhlp2vpl5f8adhjl9ak";
-      name = "alligator-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/alligator-21.08.tar.xz";
+      sha256 = "1dhwfwd1v5wmx3sldpygb79kz87j13wd0arhlkm94z1whsixan0q";
+      name = "alligator-21.08.tar.xz";
     };
   };
   angelfish = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/angelfish-21.07.tar.xz";
-      sha256 = "0znxzs261924an756bqhnm7y9placxd3ar8fi48vcp3x34kczm3v";
-      name = "angelfish-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/angelfish-21.08.tar.xz";
+      sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh";
+      name = "angelfish-21.08.tar.xz";
+    };
+  };
+  audiotube = {
+    version = "21.08";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.08/audiotube-21.08.tar.xz";
+      sha256 = "14h4xna9v70lmp7cfpvdnz0f5a4gwgj0q3byccmawm38xsv15v8c";
+      name = "audiotube-21.08.tar.xz";
     };
   };
   calindori = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/calindori-21.07.tar.xz";
-      sha256 = "00c4iklzfd4ap1nm6nh3dl5fzcsmf35i4dhyhz242byriz0k5gw2";
-      name = "calindori-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/calindori-21.08.tar.xz";
+      sha256 = "08s16a8skh02n8ygqwryxpzczj5aqr5k58aijaz2gzx45m7ym31b";
+      name = "calindori-21.08.tar.xz";
     };
   };
   kalk = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/kalk-21.07.tar.xz";
-      sha256 = "142cy2jz2dnlsmghwnsgb2a4kmxbcr0mw9lxrn98rxfd4bb33pki";
-      name = "kalk-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/kalk-21.08.tar.xz";
+      sha256 = "0xzrahpz47yajalsfmpzmavxjwmr4bgljwyz2dhxdg40ryjxdy23";
+      name = "kalk-21.08.tar.xz";
     };
   };
   kasts = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/kasts-21.07.tar.xz";
-      sha256 = "1ivdvhr9z3awa0pr531y4zyp2h63g1whr0kralak2k5n0wpzy44r";
-      name = "kasts-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/kasts-21.08.tar.xz";
+      sha256 = "10v6icxwv46nihzbdi0n2w71bsg7l166z7jf9rb7vf2mjh1gqavn";
+      name = "kasts-21.08.tar.xz";
     };
   };
   kclock = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/kclock-21.07.tar.xz";
-      sha256 = "0b1264qpwrw6rbszwbaafbah0awgik4pjq7i3q36w14b5wmjyg64";
-      name = "kclock-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/kclock-21.08.tar.xz";
+      sha256 = "1zq0fxlwd7l3b6dgfqsmv1x4wvhmrjz5r0a38hbd7j7pzgyix47d";
+      name = "kclock-21.08.tar.xz";
     };
   };
   keysmith = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/keysmith-21.07.tar.xz";
-      sha256 = "1vbcxabibxvzh97x028g6vzlgrbi1niiqj89p0icvjz7bsjzfiy7";
-      name = "keysmith-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/keysmith-21.08.tar.xz";
+      sha256 = "0fa8inli7cwmb75af0mr2cflng0r6k3pd6ckih6ph7szqbpg2x90";
+      name = "keysmith-21.08.tar.xz";
     };
   };
   koko = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/koko-21.07.tar.xz";
-      sha256 = "0sg4h1imb5zxkbn16ybsbiydqimah2cm9asrbjwgnr47ydx176hn";
-      name = "koko-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/koko-21.08.tar.xz";
+      sha256 = "1sqlcl871m6dlrnkkhqa3xfwix01d74d7jf94r1a3p32hqljv76p";
+      name = "koko-21.08.tar.xz";
     };
   };
   kongress = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/kongress-21.07.tar.xz";
-      sha256 = "0j3jj5xkb1l5bxqz2hi8y66xpi145phrkdgxysq444fwdxp7pr2l";
-      name = "kongress-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/kongress-21.08.tar.xz";
+      sha256 = "099ds4bv4ngx21f28hxcvc17wd2nk786kydwf2h5n3mdd2mgz3ka";
+      name = "kongress-21.08.tar.xz";
     };
   };
   krecorder = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/krecorder-21.07.tar.xz";
-      sha256 = "18vyhykwr5az2g2d8m8p8il7znffqzivrfix7r7aqizj7jf46l0y";
-      name = "krecorder-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/krecorder-21.08.tar.xz";
+      sha256 = "1381x889h37saf6k875iqhwz5vbixrp7650smxp31r56ycrqq26i";
+      name = "krecorder-21.08.tar.xz";
     };
   };
   ktrip = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/ktrip-21.07.tar.xz";
-      sha256 = "1aglj0s72ilpb4fgkk6v6i0yg0l3g2918k8whvm63k98y0jwa7r9";
-      name = "ktrip-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/ktrip-21.08.tar.xz";
+      sha256 = "0ipxi3pqd7mznq3qjf9j9w3wyck85lxnr81ay6b3ricfb08ry68x";
+      name = "ktrip-21.08.tar.xz";
     };
   };
   kweather = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/kweather-21.07.tar.xz";
-      sha256 = "092fx2w2bv80d6kddj93xw942a85mjbrbzsjqrg9msdbakcxfaal";
-      name = "kweather-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/kweather-21.08.tar.xz";
+      sha256 = "0b1zjwsakwsnh6827zjhypvb04c78gwwygr7k1cy2x3finrp5if5";
+      name = "kweather-21.08.tar.xz";
     };
   };
   plasma-dialer = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/plasma-dialer-21.07.tar.xz";
-      sha256 = "1f69cfjdjxnldg03xrdrm9jaavmrpc7l8plnfmvria24dq8bzkx0";
-      name = "plasma-dialer-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/plasma-dialer-21.08.tar.xz";
+      sha256 = "14vgjg0nihhm446cfrrld1l43r50dlah5xs2ypdnm68618bdc7p1";
+      name = "plasma-dialer-21.08.tar.xz";
     };
   };
   plasma-phonebook = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/plasma-phonebook-21.07.tar.xz";
-      sha256 = "0cw3wm2pm3q9d80b23p7ina9jpbq6f8j662plyhdz2dq18c9dyni";
-      name = "plasma-phonebook-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/plasma-phonebook-21.08.tar.xz";
+      sha256 = "09gr5mkwhayx6k6bhm29bmcvdlqqw8jj7gydh5fz40g9z98c84km";
+      name = "plasma-phonebook-21.08.tar.xz";
     };
   };
   plasma-settings = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/plasma-settings-21.07.tar.xz";
-      sha256 = "0cyvbjj4j0778bqslrydllgri7j72jj04yi3rlb7n6i4a5ziaibd";
-      name = "plasma-settings-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/plasma-settings-21.08.tar.xz";
+      sha256 = "005v1gyrzl9b0k875p2wipja3l8l4awp8nl2d1jx7c28lqaspz2j";
+      name = "plasma-settings-21.08.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/qmlkonsole-21.07.tar.xz";
-      sha256 = "1y8jv8bspzinxbzz6aj6fwp8118k15vxcqs0jlyjd912kkjpg978";
-      name = "qmlkonsole-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/qmlkonsole-21.08.tar.xz";
+      sha256 = "1p3ysf6sgiji86400523hm67rvw3znj3a7k6g6s83dxynxdh2faq";
+      name = "qmlkonsole-21.08.tar.xz";
     };
   };
   spacebar = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/spacebar-21.07.tar.xz";
-      sha256 = "0xqffhzzs0gzyzdyajksfghzsgsls0f0sbykmywqsk3a0jpr0d1w";
-      name = "spacebar-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/spacebar-21.08.tar.xz";
+      sha256 = "1cg36iys4x7p97ywilnp2lzz1ry5a1m7jz38yh2yiw6m8wvzfqff";
+      name = "spacebar-21.08.tar.xz";
     };
   };
   tokodon = {
-    version = "21.07";
+    version = "21.08";
     src = fetchurl {
-      url = "${mirror}/stable/plasma-mobile/21.07/tokodon-21.07.tar.xz";
-      sha256 = "08mjh75h3ckvmkprjvarjhhkqq8nldyblzlz2q5rmmg682v6mf7v";
-      name = "tokodon-21.07.tar.xz";
+      url = "${mirror}/stable/plasma-mobile/21.08/tokodon-21.08.tar.xz";
+      sha256 = "0j9zfcdss1872hv8xxrmy0jjmcz3y5kdz8gdrd6qmig5scrzjvnf";
+      name = "tokodon-21.08.tar.xz";
     };
   };
 }

From a24b5e511cf2c6859dda725af48f8c296f777613 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 17:27:56 -0400
Subject: [PATCH 11/15] kweathercore: 0.4 -> 0.5

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

diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix
index 8ab5d358e5c9..f3617059f1e7 100644
--- a/pkgs/development/libraries/kweathercore/default.nix
+++ b/pkgs/development/libraries/kweathercore/default.nix
@@ -8,14 +8,14 @@
 
 mkDerivation rec {
   pname = "kweathercore";
-  version = "0.4";
+  version = "0.5";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0mwmkr1xg0mcgbjgzp04chf55xyrgf0gndg3hs4c21bfjpy1gp3k";
+    sha256 = "08ipabskhsbspkzzdlpwl89r070q8d0vc9500ma6d5i9fnpmkz6d";
   };
 
   buildInputs = [

From b9ecb689753d392d49237823083aec626c73ea58 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 17:28:04 -0400
Subject: [PATCH 12/15] kweather: Fix build for 21.08

---
 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 8d12c76646b5..497061624b92 100644
--- a/pkgs/applications/plasma-mobile/kweather.nix
+++ b/pkgs/applications/plasma-mobile/kweather.nix
@@ -11,6 +11,7 @@
 , kquickcharts
 , kweathercore
 , plasma-framework
+, qtcharts
 , qtquickcontrols2
 }:
 
@@ -30,6 +31,7 @@ mkDerivation rec {
     kquickcharts
     kweathercore
     plasma-framework
+    qtcharts
     qtquickcontrols2
   ];
 

From 2837f21ee941c86f49b298452a7e009e721c8eed Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 20:55:48 -0400
Subject: [PATCH 13/15] audiotube: init at 21.08

---
 pkgs/applications/plasma-mobile/audiotube.nix | 61 +++++++++++++++++++
 pkgs/applications/plasma-mobile/default.nix   |  1 +
 2 files changed, 62 insertions(+)
 create mode 100644 pkgs/applications/plasma-mobile/audiotube.nix

diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/plasma-mobile/audiotube.nix
new file mode 100644
index 000000000000..1a1dedc7b426
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/audiotube.nix
@@ -0,0 +1,61 @@
+{ lib
+, mkDerivation
+, fetchpatch
+
+, extra-cmake-modules
+
+, kcoreaddons
+, kcrash
+, ki18n
+, kirigami2
+, qtmultimedia
+, qtquickcontrols2
+, python3Packages
+}:
+
+mkDerivation rec {
+  pname = "audiotube";
+
+  patches = [
+    # Fix compatibility with ytmusicapi 0.19.1
+    (fetchpatch {
+      url = "https://invent.kde.org/plasma-mobile/audiotube/-/commit/734caa02805988200f923b88d1590b3f7dac8ac2.patch";
+      sha256 = "0zq4f0w84dv0630bpvmqkfmhxbvibr2fxhzy6d2mnf098028gzyd";
+    })
+  ];
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    python3Packages.wrapPython
+    python3Packages.pybind11
+  ];
+
+  buildInputs = [
+    kcoreaddons
+    kcrash
+    ki18n
+    kirigami2
+    qtmultimedia
+    qtquickcontrols2
+    python3Packages.youtube-dl
+    python3Packages.ytmusicapi
+  ];
+
+  pythonPath = [
+    python3Packages.youtube-dl
+    python3Packages.ytmusicapi
+  ];
+
+  preFixup = ''
+    buildPythonPath "$pythonPath"
+    qtWrapperArgs+=(--prefix PYTHONPATH : "$program_PYTHONPATH")
+  '';
+
+  meta = with lib; {
+    description = "Client for YouTube Music";
+    homepage = "https://invent.kde.org/plasma-mobile/audiotube";
+    # https://invent.kde.org/plasma-mobile/audiotube/-/tree/c503d0607a3386112beaa9cf990ab85fe33ef115/LICENSES
+    license = with licenses; [ bsd2 cc0 gpl2Only gpl3Only ];
+    maintainers = with maintainers; [ samueldr ];
+  };
+}
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 04532ea18e14..643727834f99 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -62,6 +62,7 @@ let
       };
     in {
       alligator = callPackage ./alligator.nix {};
+      audiotube = callPackage ./audiotube.nix {};
       calindori = callPackage ./calindori.nix {};
       kalk = callPackage ./kalk.nix {};
       kasts = callPackage ./kasts.nix {};

From 74134f7eeef4108b718fc929bb05985c1cc1f982 Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Wed, 6 Oct 2021 20:58:48 -0400
Subject: [PATCH 14/15] angelfish: Provide as Plasma Mobile Gear

---
 .../default.nix => plasma-mobile/angelfish.nix}       | 11 +++--------
 pkgs/applications/plasma-mobile/default.nix           |  1 +
 pkgs/top-level/aliases.nix                            |  1 +
 pkgs/top-level/all-packages.nix                       |  2 --
 4 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/applications/{networking/browsers/angelfish/default.nix => plasma-mobile/angelfish.nix} (80%)

diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/plasma-mobile/angelfish.nix
similarity index 80%
rename from pkgs/applications/networking/browsers/angelfish/default.nix
rename to pkgs/applications/plasma-mobile/angelfish.nix
index dedc51469670..29d511d85f8b 100644
--- a/pkgs/applications/networking/browsers/angelfish/default.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -16,20 +16,15 @@
 , qtquickcontrols2
 , qtwebengine
 , rustPlatform
+, srcs
 }:
 
 mkDerivation rec {
   pname = "angelfish";
-  version = "21.08";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/plasma-mobile/${version}/angelfish-${version}.tar.xz";
-    sha256 = "1gzvlha159bw767mj8lisn89592j4j4dazzfws3v4anddjh60xnh";
-  };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
-    inherit src;
-    name = "${pname}-${version}";
+    src = srcs.angelfish.src;
+    name = "${pname}-${srcs.angelfish.version}";
     sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak";
   };
 
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 643727834f99..fd9ae2a2bae8 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -62,6 +62,7 @@ let
       };
     in {
       alligator = callPackage ./alligator.nix {};
+      angelfish = callPackage ./angelfish.nix { inherit srcs; };
       audiotube = callPackage ./audiotube.nix {};
       calindori = callPackage ./calindori.nix {};
       kalk = callPackage ./kalk.nix {};
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b7938faada57..ada242aab1f8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -53,6 +53,7 @@ mapAliases ({
   aminal = throw "aminal was renamed to darktile."; # added 2021-09-28
   ammonite-repl = ammonite; # added 2017-05-02
   amsn = throw "amsn has been removed due to being unmaintained."; # added 2020-12-09
+  angelfish = libsForQt5.plasmaMobileGear.angelfish; # added 2021-10-06
   antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06
   arduino_core = arduino-core;  # added 2015-02-04
   ardour_5 = throw "ardour_5 has been removed. see https://github.com/NixOS/nixpkgs/issues/139549"; # added 2021-09-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ed831d797be..7bf7a500bbfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23437,8 +23437,6 @@ with pkgs;
     });
   android-studio = androidStudioPackages.stable;
 
-  angelfish = libsForQt5.callPackage ../applications/networking/browsers/angelfish { };
-
   animbar = callPackage ../applications/graphics/animbar { };
 
   antfs-cli = callPackage ../applications/misc/antfs-cli {};

From 88fe1fe9ec34a05bc262fb5b30dd1b77dd88ac0b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Mon, 18 Oct 2021 16:23:44 -0400
Subject: [PATCH 15/15] angelfish: Break build on partial updates

The hardcoded cargo hash could have been left unchanged on package
updates. By breaking the build explicitly we ensure partial updates
won't accidentally slip past us.
---
 pkgs/applications/plasma-mobile/angelfish.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/plasma-mobile/angelfish.nix
index 29d511d85f8b..99df3f55c1d5 100644
--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -17,15 +17,28 @@
 , qtwebengine
 , rustPlatform
 , srcs
+
+# These must be updated in tandem with package updates.
+, cargoShaForVersion ? "21.08"
+, cargoSha256 ? "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak"
 }:
 
+# Guard against incomplete updates.
+# Values are provided as callPackage inputs to enable easier overrides through overlays.
+if cargoShaForVersion != srcs.angelfish.version
+then builtins.throw ''
+  angelfish package update is incomplete.
+         Hash for cargo dependencies is declared for version ${cargoShaForVersion}, but we're building ${srcs.angelfish.version}.
+         Update the cargoSha256 and cargoShaForVersion for angelfish.
+'' else
+
 mkDerivation rec {
   pname = "angelfish";
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     src = srcs.angelfish.src;
     name = "${pname}-${srcs.angelfish.version}";
-    sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak";
+    sha256 = cargoSha256;
   };
 
   nativeBuildInputs = [