kaidan: 0.10.1 -> 0.11.0 (#385339)

pkgs/applications/networking/instant-messengers/kaidan/default.nix

@@ -1,16 +1,18 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitLab,
   cmake,
   extra-cmake-modules,
   pkg-config,
-  qtquickcontrols2,
+  wrapQtAppsHook,
+  qtbase,
+  qttools,
   qtmultimedia,
   qtlocation,
   qqc2-desktop-style,
   kirigami-addons,
-  kirigami2,
+  kirigami,
   kio,
   knotifications,
   kquickimageedit,
@@ -18,33 +20,36 @@
   qxmpp,
   sonnet,
   gst_all_1,
+  prison,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "kaidan";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-u+8uNBDfszH5YJokie4A2QhW04ANq/JTwkMeu5gY0to=";
+    hash = "sha256-8pC4vINeKSYY+LlVgCXUtBq9UjraPdTikBOwLBLeQ3Y=";
   };
 
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
     pkg-config
+    wrapQtAppsHook
   ];
 
   buildInputs = with gst_all_1; [
-    qtquickcontrols2
+    qtbase
+    qttools
     qtmultimedia
     qtlocation
     qqc2-desktop-style
     kirigami-addons
-    kirigami2
+    kirigami
     kio
     knotifications
     kquickimageedit
@@ -54,7 +59,8 @@ mkDerivation rec {
     gstreamer
     gst-plugins-bad
     gst-plugins-base
-    gst-plugins-good
+    (gst-plugins-good.override { qt6Support = true; })
+    prison
   ];
   postInstall = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")

pkgs/development/libraries/qxmpp/default.nix

@@ -1,28 +1,30 @@
-{ mkDerivation
+{ stdenv
 , lib
 , fetchFromGitHub
 , cmake
 , pkg-config
+, wrapQtAppsNoGuiHook
+, qtbase
+, qca
 , withGstreamer ? true
 , gst_all_1
 , withOmemo ? true
-, qca-qt5
 , libomemo-c
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qxmpp";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "qxmpp-project";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-pM0KxYoGMIukj5SX1MX5v4VJz5/zwNmaLP717o5++Ec=";
+    hash = "sha256-mb8JMBV5M+0hFJLTxwYE47jB/FJKi/MPUwd3Nhan+QQ=";
   };
 
   nativeBuildInputs = [
-    cmake
+    cmake wrapQtAppsNoGuiHook
   ] ++ lib.optionals (withGstreamer || withOmemo) [
     pkg-config
   ];
@@ -32,7 +34,8 @@ mkDerivation rec {
     gst-plugins-base
     gst-plugins-good
   ]) ++ lib.optionals withOmemo [
-    qca-qt5
+    qtbase
+    qca
     libomemo-c
   ];
   cmakeFlags = [

pkgs/top-level/all-packages.nix

@@ -9024,7 +9024,7 @@ with pkgs;
     inherit (darwin.apple_sdk_12_3.libs) xpc;
   });
 
-  qxmpp = libsForQt5.callPackage ../development/libraries/qxmpp { };
+  qxmpp = qt6Packages.callPackage ../development/libraries/qxmpp { };
 
   gnu-efi = if stdenv.hostPlatform.isEfi
               then callPackage ../development/libraries/gnu-efi { }
@@ -13945,7 +13945,7 @@ with pkgs;
 
   kbibtex = libsForQt5.callPackage ../applications/office/kbibtex { };
 
-  kaidan = libsForQt5.callPackage ../applications/networking/instant-messengers/kaidan { };
+  kaidan = kdePackages.callPackage ../applications/networking/instant-messengers/kaidan { };
 
   kdeltachat = libsForQt5.callPackage ../applications/networking/instant-messengers/kdeltachat { };