plasma-mobile: 23.1 -> 23.04.0, (partially) absorb into kde/gear

20 files changed, 30 insertions, 85 deletions

diff --git a/pkgs/applications/plasma-mobile/alligator.nix b/pkgs/applications/kde/alligator.nix
index 4470141af2962..4470141af2962 100644
--- a/pkgs/applications/plasma-mobile/alligator.nix
+++ b/pkgs/applications/kde/alligator.nix
diff --git a/pkgs/applications/plasma-mobile/angelfish.nix b/pkgs/applications/kde/angelfish.nix
index 7a7e48d736d0c..6de8e703bd70d 100644
--- a/pkgs/applications/plasma-mobile/angelfish.nix
+++ b/pkgs/applications/kde/angelfish.nix
@@ -3,7 +3,6 @@
 , cmake
 , corrosion
 , extra-cmake-modules
-, gcc12
 , kconfig
 , kcoreaddons
 , kdbusaddons
@@ -15,13 +14,14 @@
 , kwindowsystem
 , qtfeedback
 , qtquickcontrols2
+, qqc2-desktop-style
 , qtwebengine
 , rustPlatform
 , srcs
 
 # These must be updated in tandem with package updates.
-, cargoShaForVersion ? "23.01.0"
-, cargoSha256 ? "sha256-dIXA875HsG56baHrTWw9L560n4s0wRv6Ag/2oj1x0gk="
+, cargoShaForVersion ? "23.03.80"
+, cargoSha256 ? "sha256-nXWQNXVlPWRQdDPXR5NsHJR6kaLxV7UxPC0OIubH/4c="
 }:
 
 # Guard against incomplete updates.
@@ -46,7 +46,6 @@ mkDerivation rec {
     cmake
     corrosion
     extra-cmake-modules
-    gcc12 # doesn't build with GCC 9 from stdenv on aarch64
   ] ++ (with rustPlatform; [
     cargoSetupHook
     rust.cargo
@@ -65,6 +64,7 @@ mkDerivation rec {
     kwindowsystem
     qtfeedback
     qtquickcontrols2
+    qqc2-desktop-style
     qtwebengine
   ];
 
diff --git a/pkgs/applications/plasma-mobile/audiotube.nix b/pkgs/applications/kde/audiotube.nix
index 14bfc6d18917e..0bd22ee06f63a 100644
--- a/pkgs/applications/plasma-mobile/audiotube.nix
+++ b/pkgs/applications/kde/audiotube.nix
@@ -2,7 +2,6 @@
 , mkDerivation
 
 , extra-cmake-modules
-, gcc12
 , wrapGAppsHook
 
 , gst_all_1
@@ -10,6 +9,7 @@
 , kcrash
 , ki18n
 , kirigami2
+, kirigami-addons
 , qtimageformats
 , qtmultimedia
 , qtquickcontrols2
@@ -22,7 +22,6 @@ mkDerivation rec {
   nativeBuildInputs = [
     extra-cmake-modules
     wrapGAppsHook
-    gcc12 # doesn't build with GCC 9 from stdenv on aarch64
     python3Packages.wrapPython
     python3Packages.pybind11
   ];
@@ -32,6 +31,7 @@ mkDerivation rec {
     kcrash
     ki18n
     kirigami2
+    kirigami-addons
     qtimageformats
     qtmultimedia
     qtquickcontrols2
diff --git a/pkgs/applications/plasma-mobile/calindori.nix b/pkgs/applications/kde/calindori.nix
index bb10fa7bb10c7..bb10fa7bb10c7 100644
--- a/pkgs/applications/plasma-mobile/calindori.nix
+++ b/pkgs/applications/kde/calindori.nix
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 6a57ccf9ee6ed..3ffb345a3477c 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -235,6 +235,24 @@ let
       umbrello = callPackage ./umbrello.nix {};
       yakuake = callPackage ./yakuake.nix {};
       zanshin = callPackage ./zanshin.nix {};
+
+      # Plasma Mobile Gear
+      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 {};
+      neochat = callPackage ./neochat.nix {};
+      plasmatube = callPackage ./plasmatube {};
+      qmlkonsole = callPackage ./qmlkonsole.nix {};
+      tokodon = callPackage ./tokodon.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/kalk.nix b/pkgs/applications/kde/kalk.nix
index 8d63991fb0808..8d63991fb0808 100644
--- a/pkgs/applications/plasma-mobile/kalk.nix
+++ b/pkgs/applications/kde/kalk.nix
diff --git a/pkgs/applications/plasma-mobile/kasts.nix b/pkgs/applications/kde/kasts.nix
index 59b455398203d..59b455398203d 100644
--- a/pkgs/applications/plasma-mobile/kasts.nix
+++ b/pkgs/applications/kde/kasts.nix
diff --git a/pkgs/applications/plasma-mobile/kclock.nix b/pkgs/applications/kde/kclock.nix
index 6212fa8b0400b..6212fa8b0400b 100644
--- a/pkgs/applications/plasma-mobile/kclock.nix
+++ b/pkgs/applications/kde/kclock.nix
diff --git a/pkgs/applications/plasma-mobile/keysmith.nix b/pkgs/applications/kde/keysmith.nix
index eaca7f68e24be..eaca7f68e24be 100644
--- a/pkgs/applications/plasma-mobile/keysmith.nix
+++ b/pkgs/applications/kde/keysmith.nix
diff --git a/pkgs/applications/plasma-mobile/koko.nix b/pkgs/applications/kde/koko.nix
index 3543a7284bffd..3543a7284bffd 100644
--- a/pkgs/applications/plasma-mobile/koko.nix
+++ b/pkgs/applications/kde/koko.nix
diff --git a/pkgs/applications/plasma-mobile/krecorder.nix b/pkgs/applications/kde/krecorder.nix
index 71164d1b02d43..71164d1b02d43 100644
--- a/pkgs/applications/plasma-mobile/krecorder.nix
+++ b/pkgs/applications/kde/krecorder.nix
diff --git a/pkgs/applications/plasma-mobile/ktrip.nix b/pkgs/applications/kde/ktrip.nix
index 5377dd1065865..5377dd1065865 100644
--- a/pkgs/applications/plasma-mobile/ktrip.nix
+++ b/pkgs/applications/kde/ktrip.nix
diff --git a/pkgs/applications/plasma-mobile/kweather.nix b/pkgs/applications/kde/kweather.nix
index d6a1f999ce651..d6a1f999ce651 100644
--- a/pkgs/applications/plasma-mobile/kweather.nix
+++ b/pkgs/applications/kde/kweather.nix
diff --git a/pkgs/applications/plasma-mobile/neochat.nix b/pkgs/applications/kde/neochat.nix
index 8b3da82b8b885..4df33add6795e 100644
--- a/pkgs/applications/plasma-mobile/neochat.nix
+++ b/pkgs/applications/kde/neochat.nix
@@ -1,6 +1,5 @@
-{ gcc12Stdenv
+{ mkDerivation
 , lib
-, srcs
 
 , cmake
 , extra-cmake-modules
@@ -30,10 +29,8 @@
 , sonnet
 }:
 
-# Workaround for AArch64 not using GCC11 yet.
-gcc12Stdenv.mkDerivation rec {
+mkDerivation {
   pname = "neochat";
-  inherit (srcs.neochat) version src;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/applications/plasma-mobile/plasmatube/default.nix b/pkgs/applications/kde/plasmatube/default.nix
index c9753babeaaf0..555b9f801c228 100644
--- a/pkgs/applications/plasma-mobile/plasmatube/default.nix
+++ b/pkgs/applications/kde/plasmatube/default.nix
@@ -11,7 +11,6 @@
 , mpv
 , qtmultimedia
 , qtquickcontrols2
-, yt-dlp
 }:
 
 mkDerivation {
@@ -37,15 +36,6 @@ mkDerivation {
     gstreamer
   ]);
 
-  patches = [
-    ./0001-Add-placeholders-for-runtime-dependencies.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace src/videomodel.cpp \
-      --replace "@yt-dlp@" "${yt-dlp}/bin/yt-dlp"
-  '';
-
   preFixup = ''
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
diff --git a/pkgs/applications/plasma-mobile/qmlkonsole.nix b/pkgs/applications/kde/qmlkonsole.nix
index da892fb47c0e4..da892fb47c0e4 100644
--- a/pkgs/applications/plasma-mobile/qmlkonsole.nix
+++ b/pkgs/applications/kde/qmlkonsole.nix
diff --git a/pkgs/applications/plasma-mobile/tokodon.nix b/pkgs/applications/kde/tokodon.nix
index f93336d40fa8c..bf40a5a001550 100644
--- a/pkgs/applications/plasma-mobile/tokodon.nix
+++ b/pkgs/applications/kde/tokodon.nix
@@ -11,7 +11,6 @@
 , kirigami2
 , kirigami-addons
 , knotifications
-, libwebsockets
 , qqc2-desktop-style
 , qtbase
 , qtkeychain
@@ -21,29 +20,11 @@
 , qtwebsockets
 , kitemmodels
 , pimcommon
-
-# Workarounds for the point release being missing.
-, libsForQt5
-, fetchFromGitLab
 }:
 
-# NOTE: we cannot use `mkDerivation` injected by the Plasma Mobile package
-#       set for the point release, as the point release was not uploaded to
-#       the Plasma Mobile gear repo, and the injected `mkDerivation` only can
-#       use the src (and version) from the `srcs` set.
-libsForQt5.mkDerivation rec {
+mkDerivation {
   pname = "tokodon";
 
-  version = "23.01.0";
-  # NOTE: the tokodon point release was not uploaded to the Plasma Mobile gear repo.
-  src = fetchFromGitLab {
-    domain = "invent.kde.org";
-    owner = "network";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-iJRyKEFdoWtZLZ/nkMvy2S7EF+JRHXi3O0DswfrClDU=";
-  };
-
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/applications/plasma-mobile/default.nix b/pkgs/applications/plasma-mobile/default.nix
index 255b3828f7682..97076070ae600 100644
--- a/pkgs/applications/plasma-mobile/default.nix
+++ b/pkgs/applications/plasma-mobile/default.nix
@@ -57,26 +57,10 @@ let
         inherit mkDerivation;
       };
     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 {};
-      neochat = callPackage ./neochat.nix { inherit srcs; };
       plasma-dialer = callPackage ./plasma-dialer.nix {};
       plasma-phonebook = callPackage ./plasma-phonebook.nix {};
       plasma-settings = callPackage ./plasma-settings.nix {};
-      plasmatube = callPackage ./plasmatube {};
-      qmlkonsole = callPackage ./qmlkonsole.nix {};
       spacebar = callPackage ./spacebar.nix {};
-      tokodon = callPackage ./tokodon.nix {};
     };
 
 in lib.makeScope libsForQt5.newScope packages
diff --git a/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch b/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch
deleted file mode 100644
index 704b92b2b01a7..0000000000000
--- a/pkgs/applications/plasma-mobile/plasmatube/0001-Add-placeholders-for-runtime-dependencies.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7a9405ed02b0d86839644a2c237ca7ca8b891b76 Mon Sep 17 00:00:00 2001
-From: Samuel Dionne-Riel <samuel@dionne-riel.com>
-Date: Wed, 30 Nov 2022 21:07:56 -0500
-Subject: [PATCH] Add placeholders for runtime dependencies
-
----
- src/videomodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/videomodel.cpp b/src/videomodel.cpp
-index 4bb3451..b558f31 100644
---- a/src/videomodel.cpp
-+++ b/src/videomodel.cpp
-@@ -121,7 +121,7 @@ QString VideoModel::remoteUrl()
-         return {};
-     }
- 
--    QString youtubeDl = QStringLiteral("yt-dlp");
-+    QString youtubeDl = QStringLiteral("@yt-dlp@");
-     QStringList arguments;
-     arguments << QLatin1String("--dump-json")
-               << m_videoId;
--- 
-2.38.0
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 60bd366de97ac..27010136f5e19 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -80,7 +80,7 @@ mapAliases ({
   amuleDaemon = throw "amuleDaemon was renamed to amule-daemon"; # Added 2022-02-11
   amuleGui = throw "amuleGui was renamed to amule-gui"; # Added 2022-02-11
   amsn = throw "amsn has been removed due to being unmaintained"; # Added 2020-12-09
-  angelfish = libsForQt5.plasmaMobileGear.angelfish; # Added 2021-10-06
+  angelfish = libsForQt5.kdeGear.angelfish; # Added 2021-10-06
   ansible_2_11 = throw "Ansible 2.11 goes end of life in 2022/11 and can't be supported throughout the 22.05 release cycle"; # Added 2022-03-30
   ansible_2_10 = throw "Ansible 2.10 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
   ansible_2_9 = throw "Ansible 2.9 went end of life in 2022/05 and has subsequently been dropped"; # Added 2022-03-30
@@ -782,7 +782,7 @@ mapAliases ({
   kexectools = kexec-tools; # Added 2021-09-03
   kexpand = "kexpand awless has been dropped due to the lack of maintanence from upstream since 2017"; # Added 2022-06-01
   keybase-go = throw "'keybase-go' has been renamed to/replaced by 'keybase'"; # Converted to throw 2022-02-22
-  keysmith = libsForQt5.plasmaMobileGear.keysmith; # Added 2021-07-14
+  keysmith = libsForQt5.kdeGear.keysmith; # Added 2021-07-14
   kgx = gnome-console; # Added 2022-02-19
   kibana7-oss = throw "kibana7-oss has been removed, as the distribution is no longer provided by upstream. https://github.com/NixOS/nixpkgs/pull/114456"; # Added 2021-06-09
   kicad-with-packages3d = kicad; # Added 2019-11-25
@@ -1087,7 +1087,7 @@ mapAliases ({
   navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07
   ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22
   neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12
-  neochat = libsForQt5.plasmaMobileGear.neochat; # added 2022-05-10
+  neochat = libsForQt5.kdeGear.neochat; # added 2022-05-10
   netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31
   nettools_mptcp = throw "'nettools_mptcp' has been moved to https://github.com/teto/mptcp-flake"; # Converted to throw 2022-10-04
   networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22