hotspot: Use Qt 6, move to by-name, add kgraphviewer and qcustomplot dependencies (#412125)

pkgs/by-name/ho/hotspot/package.nix

@@ -3,27 +3,16 @@
   stdenv,
   binutils,
   cmake,
-  extra-cmake-modules,
   patchelfUnstable,
-  wrapQtAppsHook,
   elfutils,
   fetchFromGitHub,
-  kconfigwidgets,
+  fetchpatch,
   kddockwidgets,
-  ki18n,
-  kio,
-  kitemmodels,
-  kitemviews,
-  konsole,
-  kparts,
-  kwindowsystem,
+  kdePackages,
   libelf,
   linuxPackages,
-  qtbase,
-  qtsvg,
+  qt6,
   rustc-demangle,
-  syntax-highlighting,
-  threadweaver,
   zstd,
 }:
 
@@ -41,32 +30,48 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    extra-cmake-modules
+    kdePackages.extra-cmake-modules
     # stable patchelf corrupts the binary
     patchelfUnstable
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h
-    kconfigwidgets
-    kddockwidgets
-    ki18n
-    kio
-    kitemmodels
-    kitemviews
-    konsole
-    kparts
-    kwindowsystem
-    libelf
-    qtbase
-    qtsvg
-    rustc-demangle
-    syntax-highlighting
-    threadweaver
-    zstd
+  patches = [
+    # Fix build issue with Qt 6.9, can be removed in next release
+    (fetchpatch {
+      url = "https://github.com/KDAB/hotspot/pull/694/commits/5ef04c1dd60846b0d1746132e7e63289ee25f259.patch";
+      hash = "sha256-WYMM1/CY05fztSiRNZQ2Q16n5erjY+AE6gSQgSlb3HA=";
+    })
   ];
 
+  cmakeFlags = [ (lib.strings.cmakeBool "QT6_BUILD" true) ];
+
+  buildInputs =
+    [
+      (elfutils.override { enableDebuginfod = true; }) # perfparser needs to find debuginfod.h
+      kddockwidgets
+      libelf
+      qt6.qtbase
+      qt6.qtsvg
+      rustc-demangle
+      zstd
+    ]
+    ++ (with kdePackages; [
+      kconfig
+      kconfigwidgets
+      kgraphviewer
+      ki18n
+      kio
+      kitemmodels
+      kitemviews
+      konsole
+      kparts
+      kwindowsystem
+      qcustomplot
+      syntax-highlighting
+      threadweaver
+    ]);
+
   qtWrapperArgs = [
     "--suffix PATH : ${
       lib.makeBinPath [
@@ -98,6 +103,9 @@ stdenv.mkDerivation rec {
       gpl3Only
     ];
     platforms = platforms.linux;
-    maintainers = with maintainers; [ nh2 ];
+    maintainers = with maintainers; [
+      nh2
+      tmarkus
+    ];
   };
 }

pkgs/by-name/kd/kddockwidgets/package.nix

@@ -3,10 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  qtdeclarative,
-  qtquickcontrols2,
-  qtx11extras,
+  qt6,
   spdlog,
   fmt,
   nlohmann_json,
@@ -29,13 +26,13 @@ stdenv.mkDerivation rec {
     fmt
     nlohmann_json
   ];
-  propagatedBuildInputs = [
+  propagatedBuildInputs = with qt6; [
     qtbase
     qtdeclarative
-    qtquickcontrols2
-    qtx11extras
   ];
 
+  cmakeFlags = [ (lib.strings.cmakeBool "KDDockWidgets_QT6" true) ];
+
   dontWrapQtApps = true;
 
   meta = with lib; {
@@ -45,6 +42,9 @@ stdenv.mkDerivation rec {
       gpl2Only
       gpl3Only
     ];
-    maintainers = with maintainers; [ _1000teslas ];
+    maintainers = with maintainers; [
+      _1000teslas
+      tmarkus
+    ];
   };
 }

pkgs/top-level/all-packages.nix

@@ -3306,8 +3306,6 @@ with pkgs;
 
   hotdoc = python3Packages.callPackage ../development/tools/hotdoc { };
 
-  hotspot = libsForQt5.callPackage ../development/tools/analysis/hotspot { };
-
   hpccm = with python3Packages; toPythonApplication hpccm;
 
   hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { };
@@ -8574,8 +8572,6 @@ with pkgs;
 
   json2yaml = haskell.lib.compose.justStaticExecutables haskellPackages.json2yaml;
 
-  kddockwidgets = libsForQt5.callPackage ../development/libraries/kddockwidgets { };
-
   keybinder = callPackage ../development/libraries/keybinder {
     automake = automake111x;
     lua = lua5_1;