From bcf57a348ca5d96d40b2463191d82cad32693008 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:31:11 +0800
Subject: [PATCH] CuboCore.coreterminal: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/coreterminal/-/compare/v4.5.0...v5.0.0
---
 .../coreterminal/default.nix                  | 30 +++++++++----------
 pkgs/top-level/cubocore-packages.nix          |  4 +--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
index f2671ab3eff2..59f3c26c31af 100644
--- a/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreterminal/default.nix
@@ -1,9 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtserialport,
+  qt6,
   qtermwidget,
   cmake,
   ninja,
@@ -11,36 +10,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreterminal";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-zMSE1gQ2HJQCqil3MB4slRe0Cojv2XRLd8wLTokF8H0=";
+    repo = "coreterminal";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-CSPZ1mbZ5ylfMQAwzj+hNodhEuyC7klvlKU5bj+HiyE=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtserialport
+    qt6.qtbase
+    qt6.qtserialport
     qtermwidget
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Terminal emulator from the C Suite";
     mainProgram = "coreterminal";
     homepage = "https://gitlab.com/cubocore/coreapps/coreterminal";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix
index e3d6af798ecb..b234a5052074 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -79,8 +79,8 @@ let
         inherit libcprime libcsys;
       };
 
-      coreterminal = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreterminal {
-        qtermwidget = lxqt.qtermwidget_1_4;
+      coreterminal = callPackage ../applications/misc/cubocore-packages/coreterminal {
+        qtermwidget = lxqt.qtermwidget;
         inherit libcprime libcsys;
       };