From a3dbd9ed85e397212d49819e6722769e622e4304 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 08:27:23 -0300
Subject: [PATCH 1/2] cutecom: move to by-name

---
 .../cutecom/default.nix => by-name/cu/cutecom/package.nix} | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/cutecom/default.nix => by-name/cu/cutecom/package.nix} (92%)

diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/by-name/cu/cutecom/package.nix
similarity index 92%
rename from pkgs/tools/misc/cutecom/default.nix
rename to pkgs/by-name/cu/cutecom/package.nix
index 2ef00647be52..ce246c196ce0 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/by-name/cu/cutecom/package.nix
@@ -2,9 +2,8 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  qtserialport,
+  qt5,
   cmake,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation {
@@ -23,10 +22,10 @@ stdenv.mkDerivation {
       --replace "/Applications" "$out/Applications"
   '';
 
-  buildInputs = [ qtserialport ];
+  buildInputs = [ qt5.qtserialport ];
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   postInstall =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486b519307ce..50de8068e28a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10920,8 +10920,6 @@ with pkgs;
     hamlib = hamlib_4;
   };
 
-  cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
-
   darcs = haskell.lib.compose.disableCabalFlag "library" (
     haskell.lib.compose.justStaticExecutables haskellPackages.darcs
   );

From 0611726bb387ca000fa24134901f4fa6ef9fdd63 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 08:29:55 -0300
Subject: [PATCH 2/2] cutecom: 0.51.0+patch -> 0.60.0-RC1

---
 pkgs/by-name/cu/cutecom/package.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cu/cutecom/package.nix b/pkgs/by-name/cu/cutecom/package.nix
index ce246c196ce0..969ab97b2451 100644
--- a/pkgs/by-name/cu/cutecom/package.nix
+++ b/pkgs/by-name/cu/cutecom/package.nix
@@ -2,19 +2,19 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  qt5,
+  qt6,
   cmake,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cutecom";
-  version = "0.51.0+patch";
+  version = "0.60.0-RC1";
 
   src = fetchFromGitLab {
     owner = "cutecom";
     repo = "cutecom";
-    rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca";
-    sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-Co0bUW7klSPf1VfBt7oT2DlQmf6CLELS0oapIyjpx8w=";
   };
 
   postPatch = ''
@@ -22,10 +22,11 @@ stdenv.mkDerivation {
       --replace "/Applications" "$out/Applications"
   '';
 
-  buildInputs = [ qt5.qtserialport ];
+  buildInputs = [ qt6.qtserialport ];
+
   nativeBuildInputs = [
     cmake
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   postInstall =
@@ -42,12 +43,12 @@ stdenv.mkDerivation {
         cp cutecom.1 "$out/share/man/man1"
       '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical serial terminal";
     homepage = "https://gitlab.com/cutecom/cutecom/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ bennofs ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ bennofs ];
+    platforms = lib.platforms.unix;
     mainProgram = "cutecom";
   };
-}
+})