diff --git a/pkgs/applications/networking/browsers/angelfish/default.nix b/pkgs/applications/plasma-mobile/angelfish.nix
similarity index 58%
rename from pkgs/applications/networking/browsers/angelfish/default.nix
rename to pkgs/applications/plasma-mobile/angelfish.nix
index dedc51469670..99df3f55c1d5 100644
--- a/pkgs/applications/networking/browsers/angelfish/default.nix
+++ b/pkgs/applications/plasma-mobile/angelfish.nix
@@ -16,21 +16,29 @@
 , qtquickcontrols2
 , 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";
-  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}";
-    sha256 = "1pbvw9hdzn3i97mahdy9y6jnjsmwmjs3lxfz7q6r9r10i8swbkak";
+    src = srcs.angelfish.src;
+    name = "${pname}-${srcs.angelfish.version}";
+    sha256 = cargoSha256;
   };
 
   nativeBuildInputs = [
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 18f550955c57..fd9ae2a2bae8 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -62,12 +62,17 @@ let
       };
     in {
       alligator = callPackage ./alligator.nix {};
+      angelfish = callPackage ./angelfish.nix { inherit srcs; };
+      audiotube = callPackage ./audiotube.nix {};
       calindori = callPackage ./calindori.nix {};
       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 {};
+      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/fetch.sh b/pkgs/applications/plasma-mobile/fetch.sh
index 29a8e6b4c792..14995aeb2b7f 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=( https://download.kde.org/stable/plasma-mobile/21.08/ -A '*.tar.xz' )
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 ];
+  };
+}
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/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
   ];
 
diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/plasma-mobile/kweather.nix
new file mode 100644
index 000000000000..497061624b92
--- /dev/null
+++ b/pkgs/applications/plasma-mobile/kweather.nix
@@ -0,0 +1,44 @@
+{ lib
+, mkDerivation
+
+, cmake
+, extra-cmake-modules
+
+, kconfig
+, ki18n
+, kirigami2
+, knotifications
+, kquickcharts
+, kweathercore
+, plasma-framework
+, qtcharts
+, qtquickcontrols2
+}:
+
+mkDerivation rec {
+  pname = "kweather";
+
+  nativeBuildInputs = [
+    cmake
+    extra-cmake-modules
+  ];
+
+  buildInputs = [
+    kconfig
+    ki18n
+    kirigami2
+    knotifications
+    kquickcharts
+    kweathercore
+    plasma-framework
+    qtcharts
+    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 ];
+  };
+}
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
   ];
 
diff --git a/pkgs/applications/plasma-mobile/srcs.nix b/pkgs/applications/plasma-mobile/srcs.nix
index 4df185aa0aec..06b551a94cf4 100644
--- a/pkgs/applications/plasma-mobile/srcs.nix
+++ b/pkgs/applications/plasma-mobile/srcs.nix
@@ -1,118 +1,158 @@
 # 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.05";
+    version = "21.08";
     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.08/alligator-21.08.tar.xz";
+      sha256 = "1dhwfwd1v5wmx3sldpygb79kz87j13wd0arhlkm94z1whsixan0q";
+      name = "alligator-21.08.tar.xz";
     };
   };
   angelfish = {
-    version = "21.05";
+    version = "21.08";
     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.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.05";
+    version = "21.08";
     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.08/calindori-21.08.tar.xz";
+      sha256 = "08s16a8skh02n8ygqwryxpzczj5aqr5k58aijaz2gzx45m7ym31b";
+      name = "calindori-21.08.tar.xz";
     };
   };
   kalk = {
-    version = "21.05";
+    version = "21.08";
     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.08/kalk-21.08.tar.xz";
+      sha256 = "0xzrahpz47yajalsfmpzmavxjwmr4bgljwyz2dhxdg40ryjxdy23";
+      name = "kalk-21.08.tar.xz";
+    };
+  };
+  kasts = {
+    version = "21.08";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.08/kasts-21.08.tar.xz";
+      sha256 = "10v6icxwv46nihzbdi0n2w71bsg7l166z7jf9rb7vf2mjh1gqavn";
+      name = "kasts-21.08.tar.xz";
     };
   };
   kclock = {
-    version = "21.05";
+    version = "21.08";
     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.08/kclock-21.08.tar.xz";
+      sha256 = "1zq0fxlwd7l3b6dgfqsmv1x4wvhmrjz5r0a38hbd7j7pzgyix47d";
+      name = "kclock-21.08.tar.xz";
+    };
+  };
+  keysmith = {
+    version = "21.08";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.08/keysmith-21.08.tar.xz";
+      sha256 = "0fa8inli7cwmb75af0mr2cflng0r6k3pd6ckih6ph7szqbpg2x90";
+      name = "keysmith-21.08.tar.xz";
     };
   };
   koko = {
-    version = "21.05";
+    version = "21.08";
     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.08/koko-21.08.tar.xz";
+      sha256 = "1sqlcl871m6dlrnkkhqa3xfwix01d74d7jf94r1a3p32hqljv76p";
+      name = "koko-21.08.tar.xz";
     };
   };
   kongress = {
-    version = "21.05";
+    version = "21.08";
     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.08/kongress-21.08.tar.xz";
+      sha256 = "099ds4bv4ngx21f28hxcvc17wd2nk786kydwf2h5n3mdd2mgz3ka";
+      name = "kongress-21.08.tar.xz";
     };
   };
   krecorder = {
-    version = "21.05";
+    version = "21.08";
     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.08/krecorder-21.08.tar.xz";
+      sha256 = "1381x889h37saf6k875iqhwz5vbixrp7650smxp31r56ycrqq26i";
+      name = "krecorder-21.08.tar.xz";
     };
   };
   ktrip = {
-    version = "21.05";
+    version = "21.08";
     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.08/ktrip-21.08.tar.xz";
+      sha256 = "0ipxi3pqd7mznq3qjf9j9w3wyck85lxnr81ay6b3ricfb08ry68x";
+      name = "ktrip-21.08.tar.xz";
+    };
+  };
+  kweather = {
+    version = "21.08";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.08/kweather-21.08.tar.xz";
+      sha256 = "0b1zjwsakwsnh6827zjhypvb04c78gwwygr7k1cy2x3finrp5if5";
+      name = "kweather-21.08.tar.xz";
     };
   };
   plasma-dialer = {
-    version = "21.05";
+    version = "21.08";
     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.08/plasma-dialer-21.08.tar.xz";
+      sha256 = "14vgjg0nihhm446cfrrld1l43r50dlah5xs2ypdnm68618bdc7p1";
+      name = "plasma-dialer-21.08.tar.xz";
     };
   };
   plasma-phonebook = {
-    version = "21.05";
+    version = "21.08";
     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.08/plasma-phonebook-21.08.tar.xz";
+      sha256 = "09gr5mkwhayx6k6bhm29bmcvdlqqw8jj7gydh5fz40g9z98c84km";
+      name = "plasma-phonebook-21.08.tar.xz";
     };
   };
   plasma-settings = {
-    version = "21.05";
+    version = "21.08";
     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.08/plasma-settings-21.08.tar.xz";
+      sha256 = "005v1gyrzl9b0k875p2wipja3l8l4awp8nl2d1jx7c28lqaspz2j";
+      name = "plasma-settings-21.08.tar.xz";
     };
   };
   qmlkonsole = {
-    version = "21.05";
+    version = "21.08";
     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.08/qmlkonsole-21.08.tar.xz";
+      sha256 = "1p3ysf6sgiji86400523hm67rvw3znj3a7k6g6s83dxynxdh2faq";
+      name = "qmlkonsole-21.08.tar.xz";
     };
   };
   spacebar = {
-    version = "21.05";
+    version = "21.08";
     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.08/spacebar-21.08.tar.xz";
+      sha256 = "1cg36iys4x7p97ywilnp2lzz1ry5a1m7jz38yh2yiw6m8wvzfqff";
+      name = "spacebar-21.08.tar.xz";
+    };
+  };
+  tokodon = {
+    version = "21.08";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma-mobile/21.08/tokodon-21.08.tar.xz";
+      sha256 = "0j9zfcdss1872hv8xxrmy0jjmcz3y5kdz8gdrd6qmig5scrzjvnf";
+      name = "tokodon-21.08.tar.xz";
     };
   };
 }
diff --git a/pkgs/development/libraries/kweathercore/default.nix b/pkgs/development/libraries/kweathercore/default.nix
new file mode 100644
index 000000000000..f3617059f1e7
--- /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.5";
+
+  src = fetchFromGitLab {
+    domain = "invent.kde.org";
+    owner = "libraries";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "08ipabskhsbspkzzdlpwl89r070q8d0vc9500ma6d5i9fnpmkz6d";
+  };
+
+  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/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 = [
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 726b7ab33af9..eb5abb37d382 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
@@ -390,6 +391,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 50d808c30c1e..6c1879e39624 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7038,8 +7038,6 @@ with pkgs;
 
   kea = callPackage ../tools/networking/kea { };
 
-  keysmith = libsForQt5.callPackage ../tools/security/keysmith { };
-
   ispell = callPackage ../tools/text/ispell {};
 
   iodash = callPackage ../development/libraries/iodash { };
@@ -23662,8 +23660,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 {};
diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix
index 21d11d339f3a..bc3f5524e6aa 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 { };