From f7e77f1f312b27c876bd360dfc4b05d737d4fcf8 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Wed, 25 Mar 2026 14:27:15 +0800
Subject: [PATCH] labplot: move to by-name

---
 .../la/labplot/package.nix}                   | 69 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 25 insertions(+), 46 deletions(-)
 rename pkgs/{applications/science/math/labplot/default.nix => by-name/la/labplot/package.nix} (68%)

diff --git a/pkgs/applications/science/math/labplot/default.nix b/pkgs/by-name/la/labplot/package.nix
similarity index 68%
rename from pkgs/applications/science/math/labplot/default.nix
rename to pkgs/by-name/la/labplot/package.nix
index 30a86b541f61..83fb62803d2c 100644
--- a/pkgs/applications/science/math/labplot/default.nix
+++ b/pkgs/by-name/la/labplot/package.nix
@@ -5,28 +5,11 @@
   fetchpatch,
   cmake,
   pkg-config,
-  extra-cmake-modules,
+  kdePackages,
+  qt6,
   shared-mime-info,
   bison,
   flex,
-  wrapQtAppsHook,
-
-  qtbase,
-
-  karchive,
-  kcompletion,
-  kconfig,
-  kcoreaddons,
-  kcrash,
-  kdoctools,
-  ki18n,
-  kiconthemes,
-  kio,
-  knewstuff,
-  kparts,
-  ktextwidgets,
-  kxmlgui,
-  syntax-highlighting,
 
   gsl,
 
@@ -36,21 +19,19 @@
   netcdf,
   cfitsio,
   libcerf,
-  cantor,
   zlib,
   lz4,
   readstat,
   matio,
-  qtserialport,
   discount,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "labplot";
   version = "2.12.1";
 
   src = fetchurl {
-    url = "mirror://kde/stable/labplot/labplot-${version}.tar.xz";
+    url = "mirror://kde/stable/labplot/labplot-${finalAttrs.version}.tar.xz";
     hash = "sha256-4oFVv930DltvfEeRMTVW0eSBOARPIW8hDVFbn21sEGo=";
   };
 
@@ -70,45 +51,45 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    extra-cmake-modules
+    kdePackages.extra-cmake-modules
     shared-mime-info
     bison
     flex
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
 
-    karchive
-    kcompletion
-    kconfig
-    kcoreaddons
-    kcrash
-    kdoctools
-    ki18n
-    kiconthemes
-    kio
-    knewstuff
-    kparts
-    ktextwidgets
-    kxmlgui
+    kdePackages.karchive
+    kdePackages.kcompletion
+    kdePackages.kconfig
+    kdePackages.kcoreaddons
+    kdePackages.kcrash
+    kdePackages.kdoctools
+    kdePackages.ki18n
+    kdePackages.kiconthemes
+    kdePackages.kio
+    kdePackages.knewstuff
+    kdePackages.kparts
+    kdePackages.ktextwidgets
+    kdePackages.kxmlgui
 
-    syntax-highlighting
+    kdePackages.syntax-highlighting
     gsl
 
-    poppler
+    kdePackages.poppler
     fftw
     hdf5
     netcdf
     cfitsio
     libcerf
-    cantor
+    kdePackages.cantor
     zlib
     lz4
     readstat
     matio
-    qtserialport
+    qt6.qtserialport
     discount
   ];
 
@@ -131,4 +112,4 @@ stdenv.mkDerivation rec {
     mainProgram = "labplot2";
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d0e11e21108..8acde5818395 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10949,8 +10949,6 @@ with pkgs;
 
   blas-ilp64 = blas.override { isILP64 = true; };
 
-  labplot = kdePackages.callPackage ../applications/science/math/labplot { };
-
   lapack-ilp64 = lapack.override { isILP64 = true; };
 
   liblapack = lapack-reference;