kmymoney, alkimia: switch to Qt6

pkgs/applications/office/kmymoney/default.nix

@@ -2,10 +2,13 @@
   stdenv,
   lib,
   fetchurl,
+
+  cmake,
   doxygen,
   extra-cmake-modules,
   graphviz,
   kdoctools,
+  pkg-config,
   wrapQtAppsHook,
   autoPatchelfHook,
 
@@ -14,7 +17,6 @@
   aqbanking,
   gmp,
   gwenhywfar,
-  kactivities,
   karchive,
   kcmutils,
   kcontacts,
@@ -25,6 +27,7 @@
   kitemmodels,
   libical,
   libofx,
+  plasma-activities,
   qgpgme,
 
   sqlcipher,
@@ -37,27 +40,24 @@
 
 stdenv.mkDerivation rec {
   pname = "kmymoney";
-  version = "5.1.3";
+  version = "5.2.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/kmymoney/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-OTi4B4tzkboy4Su0I5di+uE0aDoMLsGnUQXDAso+Xj8=";
+    url = "mirror://kde/stable/kmymoney/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-/q30C21MkNd+MnFqhY3SN2kIGGMQTYzqYpELHsPkM2s=";
   };
 
   cmakeFlags = [
-    # Remove this when upgrading to a KMyMoney release that includes
-    # https://invent.kde.org/office/kmymoney/-/merge_requests/118
-    "-DENABLE_WEBENGINE=ON"
+    "-DBUILD_WITH_QT6=1"
   ];
 
-  # Hidden dependency that wasn't included in CMakeLists.txt:
-  env.NIX_CFLAGS_COMPILE = "-I${kitemmodels.dev}/include/KF5";
-
   nativeBuildInputs = [
+    cmake
     doxygen
     extra-cmake-modules
     graphviz
     kdoctools
+    pkg-config
     python3.pkgs.wrapPython
     wrapQtAppsHook
     autoPatchelfHook
@@ -69,7 +69,6 @@ stdenv.mkDerivation rec {
     aqbanking
     gmp
     gwenhywfar
-    kactivities
     karchive
     kcmutils
     kcontacts
@@ -80,6 +79,7 @@ stdenv.mkDerivation rec {
     kitemmodels
     libical
     libofx
+    plasma-activities
     qgpgme
     sqlcipher
 
@@ -99,13 +99,6 @@ stdenv.mkDerivation rec {
       "kmymoney/plugins/woob/interface/kmymoneywoob.py"
   '';
 
-  doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
-  nativeInstallCheckInputs = [ xvfb-run ];
-  installCheckPhase = lib.optionalString doInstallCheck ''
-    xvfb-run -s '-screen 0 1024x768x24' make test \
-      ARGS="-E '(reports-chart-test)'" # Test fails, so exclude it for now.
-  '';
-
   # libpython is required by the python interpreter embedded in kmymoney, so we
   # need to explicitly tell autoPatchelf about it.
   postFixup = ''

pkgs/development/libraries/alkimia/default.nix

@@ -2,14 +2,14 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  cmake,
   extra-cmake-modules,
   doxygen,
   graphviz,
   qtbase,
   qtwebengine,
   mpir,
-  kdelibs4support,
-  plasma-framework,
+  libplasma,
   knewstuff,
   kpackage,
   wrapQtAppsHook,
@@ -27,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-v5DfnnzOMsoCXr074ydXxBIrSsnbex6G/OqF6psTvPs=";
   };
 
+  cmakeFlags = [
+    "-DBUILD_WITH_QT6=1"
+  ];
+
   nativeBuildInputs = [
+    cmake
     extra-cmake-modules
     doxygen
     graphviz
@@ -40,8 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     qtbase
     qtwebengine
-    kdelibs4support
-    plasma-framework
+    libplasma
     knewstuff
     kpackage
   ];

pkgs/top-level/all-packages.nix

@@ -12408,7 +12408,8 @@ with pkgs;
 
   kmplayer = libsForQt5.callPackage ../applications/video/kmplayer { };
 
-  kmymoney = libsForQt5.callPackage ../applications/office/kmymoney { };
+  alkimia = kdePackages.callPackage ../development/libraries/alkimia { };
+  kmymoney = kdePackages.callPackage ../applications/office/kmymoney { };
 
   kotatogram-desktop =
     callPackage ../applications/networking/instant-messengers/telegram/kotatogram-desktop

pkgs/top-level/qt5-packages.nix

@@ -118,7 +118,6 @@ makeScopeWithSplicing' {
 
         accounts-qt = callPackage ../development/libraries/accounts-qt { };
 
-        alkimia = callPackage ../development/libraries/alkimia { };
 
         applet-window-appmenu = callPackage ../development/libraries/applet-window-appmenu { };