diff --git a/pkgs/applications/science/electronics/qucs-s/default.nix b/pkgs/by-name/qu/qucs-s/package.nix
similarity index 76%
rename from pkgs/applications/science/electronics/qucs-s/default.nix
rename to pkgs/by-name/qu/qucs-s/package.nix
index 0b3d5b738b9f..8445b2081fe2 100644
--- a/pkgs/applications/science/electronics/qucs-s/default.nix
+++ b/pkgs/by-name/qu/qucs-s/package.nix
@@ -4,32 +4,27 @@
   fetchFromGitHub,
   flex,
   bison,
-  qtbase,
-  qtcharts,
-  qttools,
-  qtsvg,
-  qtwayland,
-  wrapQtAppsHook,
   libX11,
   cmake,
   gperf,
   adms,
   ngspice,
   qucsator-rf,
+  qt6Packages,
   kernels ? [
     ngspice
     qucsator-rf
   ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qucs-s";
   version = "25.1.2";
 
   src = fetchFromGitHub {
     owner = "ra3xdh";
     repo = "qucs_s";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-+xPhHmuogNuolmMFcUAP2hMfJh1D+O4DrPkcuR6+mR8=";
   };
 
@@ -55,22 +50,26 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     flex
     bison
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
     cmake
   ];
-  buildInputs = [
-    qtbase
-    qttools
-    qtcharts
-    qtsvg
-    gperf
-    adms
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
-    libX11
-  ]
-  ++ kernels;
+  buildInputs =
+    with qt6Packages;
+    [
+      qtbase
+      qttools
+      qtcharts
+      qtsvg
+    ]
+    ++ [
+      gperf
+      adms
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      qtwayland
+      libX11
+    ]
+    ++ kernels;
 
   cmakeFlags = [
     "-DWITH_QT6=ON"
@@ -84,27 +83,27 @@ stdenv.mkDerivation rec {
     (lib.makeBinPath kernels)
   ];
 
-  QTDIR = qtbase.dev;
+  QTDIR = qt6Packages.qtbase.dev;
 
   doInstallCheck = true;
   installCheck = ''
     $out/bin/qucs-s --version
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Spin-off of Qucs that allows custom simulation kernels";
     longDescription = ''
       Spin-off of Qucs that allows custom simulation kernels.
       Default version is installed with ngspice.
     '';
     homepage = "https://ra3xdh.github.io/";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "qucs-s";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       mazurel
       kashw2
       thomaslepoix
     ];
-    platforms = with platforms; unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e5b49255772..23ae43f624d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15373,8 +15373,6 @@ with pkgs;
     qcsxcad = libsForQt5.qcsxcad;
   };
 
-  qucs-s = qt6Packages.callPackage ../applications/science/electronics/qucs-s { };
-
   xyce-parallel = callPackage ../by-name/xy/xyce/package.nix {
     withMPI = true;
     trilinos = trilinos-mpi;