3 files changed, 38 insertions(+), 37 deletions(-)

M gnu/packages/kde-sdk.scm
M gnu/packages/kde.scm
M gnu/packages/qt.scm

@@ 33,7 33,9 @@
   #:use-module (gnu packages kde)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages python)
   #:use-module (gnu packages qt)
   #:use-module (gnu packages version-control))
 


@@ 110,6 112,41 @@ structure.  It features:
 @end itemize")
     (license license:gpl2+)))
 
+(define-public kcachegrind
+  (package
+    (name "kcachegrind")
+    (version "24.12.1")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://kde/stable/release-service/" version
+                                  "/src/kcachegrind-" version ".tar.xz"))
+              (sha256
+               (base32
+                "0wk26gpyld2q4xxlyzynp8v4bq72wyf8qr1lb2aj61dbv9b112nk"))))
+    (build-system cmake-build-system)
+    (native-inputs
+     (list extra-cmake-modules perl python qttools kdoctools))
+    (inputs
+     (list qtbase karchive ki18n kio kxmlgui kdbusaddons))
+    (arguments (list #:tests? #f))
+    ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on
+    ;; Python and PHP, respectively.  These are optional and we ignore them
+    ;; for now.
+    (home-page "https://kcachegrind.github.io/html/Home.html")
+    (synopsis "Visualize profiles produces by Valgrind's Cachegrind tool")
+    (description
+     "The data files generated by the Callgrind of Valgrind, an application
+profiler, can be loaded into KCachegrind for browsing the performance results.
+There is also a command-line tool to get ASCII reports from data files without
+the need to use KCachegrind.
+
+The format of Callgrind output is documented.  With conversion scripts,
+KCachegrind is able to visualize output of other profilers like OProfile, a
+system-wide profiler for Linux using statistical sampling with hardware
+performance counters.  There also exist converters for profiling output of
+Python, PHP, and Perl.")
+    (license license:gpl2)))
+
 (define-public kdevelop-pg-qt
   (package
     (name "kdevelop-pg-qt")

@@ 1033,42 1033,6 @@ to perform data analysis.")
     (license (list license:gpl2+     ;labplot
                    license:gpl3+)))) ;liborigin
 
-
-(define-public kcachegrind
-  (package
-    (name "kcachegrind")
-    (version "24.12.1")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://kde/stable/release-service/" version
-                                  "/src/kcachegrind-" version ".tar.xz"))
-              (sha256
-               (base32
-                "0wk26gpyld2q4xxlyzynp8v4bq72wyf8qr1lb2aj61dbv9b112nk"))))
-    (build-system cmake-build-system)
-    (native-inputs
-     (list extra-cmake-modules perl python qttools kdoctools))
-    (inputs
-     (list qtbase karchive ki18n kio kxmlgui kdbusaddons))
-    (arguments (list #:tests? #f))
-    ;; Note: The 'hotshot2calltree' and 'pprof2calltree' scripts depend on
-    ;; Python and PHP, respectively.  These are optional and we ignore them
-    ;; for now.
-    (home-page "https://kcachegrind.github.io/html/Home.html")
-    (synopsis "Visualize profiles produces by Valgrind's Cachegrind tool")
-    (description
-     "The data files generated by the Callgrind of Valgrind, an application
-profiler, can be loaded into KCachegrind for browsing the performance results.
-There is also a command-line tool to get ASCII reports from data files without
-the need to use KCachegrind.
-
-The format of Callgrind output is documented.  With conversion scripts,
-KCachegrind is able to visualize output of other profilers like OProfile, a
-system-wide profiler for Linux using statistical sampling with hardware
-performance counters.  There also exist converters for profiling output of
-Python, PHP, and Perl.")
-    (license license:gpl2)))
-
 (define-public marble-qt
   (package
     (name "marble-qt")

@@ 103,6 103,7 @@
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
   #:use-module (gnu packages kde-frameworks)
+  #:use-module (gnu packages kde-sdk)
   #:use-module (gnu packages libevent)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)


@@ 125,7 126,6 @@
   #:use-module (gnu packages python-check)
   #:use-module (gnu packages python-web)
   #:use-module (gnu packages python-xyz)
-  #:use-module (gnu packages kde)
   #:use-module (gnu packages regex)
   #:use-module (gnu packages ruby)
   #:use-module (gnu packages rust-sources)