From 559b4099ee7d4db3848a51e2de4002d128d50e19 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:01:00 +0800
Subject: [PATCH 01/24] CuboCore.coreaction: 4.5.0 -> 5.0.0

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

diff --git a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
index 944dc109c0e9..16b72bbeb2d8 100644
--- a/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreaction/default.nix
@@ -1,44 +1,44 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtsvg,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreaction";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-qhYuLqWXCpOJCqg+JJ8VQQokNEQVwxpHAtYGITxHZ3Y=";
+    repo = "coreaction";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-R/pzudaxs85etbI4hh2NwHNtO7EqI+vgJALY/4rIvrs=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtsvg
-    qtbase
+    qt6.qtsvg
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Side bar for showing widgets from the C Suite";
     mainProgram = "coreaction";
     homepage = "https://gitlab.com/cubocore/coreapps/coreaction";
-    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 9e0a129d1015..b7cd723e245b 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -15,7 +15,7 @@ let
       libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { };
 
       # Apps
-      coreaction = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreaction {
+      coreaction = callPackage ../applications/misc/cubocore-packages/coreaction {
         inherit libcprime libcsys;
       };
 

From 16bdb03f0888d526d6e08511a3491c996c7b006e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:10:40 +0800
Subject: [PATCH 02/24] CuboCore.libcprime: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/libcprime/-/compare/v4.5.0...v5.0.0
---
 .../libcprime/0001-fix-application-dirs.patch | 22 ++++++-------
 .../cubocore-packages/libcprime/default.nix   | 33 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch
index 08214c30a887..832e27cc9528 100644
--- a/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch
+++ b/pkgs/applications/misc/cubocore-packages/libcprime/0001-fix-application-dirs.patch
@@ -11,20 +11,20 @@ diff --git a/cprime/systemxdg.cpp b/cprime/systemxdg.cpp
 index 4c40d4c..5dbb6ff 100644
 --- a/cprime/systemxdg.cpp
 +++ b/cprime/systemxdg.cpp
-@@ -372,9 +372,10 @@ void SystemXdgMime::setApplicationAsDefault(QString appFileName, QString mimetyp
- 
+@@ -343,9 +343,10 @@
+
  SystemXdgMime::SystemXdgMime()
  {
--    appsDirs << QDir::home().filePath(".local/share/applications/");
--    appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/");
--    appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/");
-+    appsDirs << QDir::home().filePath(".nix-profile/share/applications/");
-+    appsDirs << "/run/current-system/sw/share/applications/";
-+    appsDirs << "/run/current-system/sw/share/applications/kde4/";
-+    appsDirs << "/run/current-system/sw/share/gnome/applications/";
+-	appsDirs << QDir::home().filePath(".local/share/applications/");
+-	appsDirs << QDir::root().filePath("usr/local/share/applications/") << QDir::root().filePath("usr/share/applications/");
+-	appsDirs << QDir::root().filePath("usr/share/applications/kde4/") << QDir::root().filePath("usr/share/gnome/applications/");
++	appsDirs << QDir::home().filePath(".nix-profile/share/applications/");
++	appsDirs << "/run/current-system/sw/share/applications/";
++	appsDirs << "/run/current-system/sw/share/applications/kde4/";
++	appsDirs << "/run/current-system/sw/share/gnome/applications/";
  }
- 
- 
+
+
 -- 
 2.39.0
 
diff --git a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
index 353128b091af..f190c303eae2 100644
--- a/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcprime/default.nix
@@ -1,23 +1,22 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
   libnotify,
   cmake,
   ninja,
-  qtbase,
-  qtconnectivity,
+  qt6,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libcprime";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-j6WFLcjDMkYl+9HCmhMRttwtjNX05oP5mfdOsoLC7og=";
+    repo = "libcprime";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3tAbF4CoZJf92Z2/M/Cq7ruPew34Hl5Ojks7fI6kPbU=";
   };
 
   patches = [
@@ -30,16 +29,18 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
-    qtconnectivity
+    qt6.qtbase
+    qt6.qtconnectivity
     libnotify
   ];
 
-  meta = with lib; {
+  dontWrapQtApps = true;
+
+  meta = {
     description = "Library for bookmarking, saving recent activites, managing settings of C-Suite";
-    homepage = "https://gitlab.com/cubocore/coreapps/libcprime";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    homepage = "https://gitlab.com/cubocore/libcprime";
+    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 b7cd723e245b..d237d7b91be0 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -10,7 +10,7 @@ let
     self: with self; {
 
       # Libs
-      libcprime = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcprime { };
+      libcprime = callPackage ../applications/misc/cubocore-packages/libcprime { };
 
       libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { };
 

From 7ec155af1c02e23c65bbbfb52139bc1699174bba Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:14:25 +0800
Subject: [PATCH 03/24] CuboCore.libcsys: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/libcsys/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/libcsys/default.nix     | 28 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
index ba9162ed33c8..d48596c9c78f 100644
--- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
@@ -1,22 +1,22 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
   udisks2,
-  qtbase,
+  qt6,
   cmake,
   ninja,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libcsys";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-1MHyx01w+dCeAeumcSXRBStgAec2yu1rLwaZaCXRgTc=";
+    repo = "libcsys";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-53vneIR2uy3VtbnOlEHl1anj3nXA3MU2KQt1PWm7KGI=";
   };
 
   nativeBuildInputs = [
@@ -25,15 +25,17 @@ mkDerivation rec {
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     udisks2
   ];
 
-  meta = with lib; {
+  dontWrapQtApps = true;
+
+  meta = {
     description = "Library for managing drive and getting system resource information in real time";
     homepage = "https://gitlab.com/cubocore/libcsys";
-    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 d237d7b91be0..7f345d79e5c7 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -12,7 +12,7 @@ let
       # Libs
       libcprime = callPackage ../applications/misc/cubocore-packages/libcprime { };
 
-      libcsys = libsForQt5.callPackage ../applications/misc/cubocore-packages/libcsys { };
+      libcsys = callPackage ../applications/misc/cubocore-packages/libcsys { };
 
       # Apps
       coreaction = callPackage ../applications/misc/cubocore-packages/coreaction {

From fd4d979e7101d1c12fad9323e67e61ac6b041025 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:19:30 +0800
Subject: [PATCH 04/24] CuboCore.corearchiver: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corearchiver/-/compare/v4.5.0...v5.0.0
---
 .../corearchiver/default.nix                  | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
index d06bea646dc7..c78878dc72c7 100644
--- a/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corearchiver/default.nix
@@ -1,8 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   libarchive,
   libarchive-qt,
   cmake,
@@ -11,36 +11,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corearchiver";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-TKBr/CFY4ixQnJuaN+wJB88s6g4lvQz4rwq9YsccRYk=";
+    repo = "corearchiver";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+XaBe1fNpAQf3cqXV+A1cZ1tPck3bCpgEDmFeF536q4=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libarchive-qt
     libarchive
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Archiver from the C Suite to create and extract archives";
     mainProgram = "corearchiver";
     homepage = "https://gitlab.com/cubocore/coreapps/corearchiver";
-    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 7f345d79e5c7..79397e844dc8 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -19,7 +19,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corearchiver = libsForQt5.callPackage ../applications/misc/cubocore-packages/corearchiver {
+      corearchiver = callPackage ../applications/misc/cubocore-packages/corearchiver {
         inherit libcprime libcsys;
       };
 

From 818e61aad032624bf6a556e72826cc3278d07d62 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:29:40 +0800
Subject: [PATCH 05/24] libarchive-qt: use qt6

---
 .../libraries/libarchive-qt/default.nix       | 23 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/libarchive-qt/default.nix b/pkgs/development/libraries/libarchive-qt/default.nix
index 1ed4e92e5b9b..74b7f79a11d1 100644
--- a/pkgs/development/libraries/libarchive-qt/default.nix
+++ b/pkgs/development/libraries/libarchive-qt/default.nix
@@ -1,6 +1,6 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
   libarchive,
   xz,
@@ -9,16 +9,17 @@
   meson,
   pkg-config,
   ninja,
+  qt6,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libarchive-qt";
   version = "2.0.8";
 
   src = fetchFromGitLab {
     owner = "marcusbritanicus";
-    repo = pname;
-    rev = "v${version}";
+    repo = "libarchive-qt";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-31a6DsxObSJWyLfT6mVtyjloT26IwFHpH53iuyC2mco=";
   };
 
@@ -26,6 +27,7 @@ mkDerivation rec {
     meson
     ninja
     pkg-config
+    qt6.wrapQtAppsNoGuiHook
   ];
 
   buildInputs = [
@@ -33,14 +35,17 @@ mkDerivation rec {
     bzip2
     zlib
     xz
+    qt6.qtbase
   ];
 
-  meta = with lib; {
+  mesonFlags = [ "-Duse_qt_version=qt6" ];
+
+  meta = {
     description = "Qt based archiving solution with libarchive backend";
     mainProgram = "archiver";
     homepage = "https://gitlab.com/marcusbritanicus/libarchive-qt";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc0e13af2e01..97746d8cf8a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9947,7 +9947,7 @@ with pkgs;
 
   libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
   libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
-  libarchive-qt = libsForQt5.callPackage ../development/libraries/libarchive-qt { };
+  libarchive-qt = callPackage ../development/libraries/libarchive-qt { };
 
   libaribcaption = callPackage ../by-name/li/libaribcaption/package.nix {
     inherit (darwin.apple_sdk.frameworks)

From 4a9574916ddc136301acf77fb7f40264f358f1ca Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:41:51 +0800
Subject: [PATCH 06/24] CuboCore.corefm: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corefm/-/compare/v4.5.0...v5.0.0
---
 .../misc/cubocore-packages/corefm/default.nix | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corefm/default.nix b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
index 1bdf0f104dee..43407b104869 100644
--- a/pkgs/applications/misc/cubocore-packages/corefm/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corefm/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corefm";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-mCFFT/vHzfC4jl1I8SkgaX8qu+AFNNcwUZx4eJeE+i4=";
+    repo = "corefm";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VsnbWknkMJp/2MDXbJuEQomotGqTXhZcUvu+ODJOjdM=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Lightwight filemanager from the C Suite";
     mainProgram = "corefm";
     homepage = "https://gitlab.com/cubocore/coreapps/corefm";
-    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 79397e844dc8..fbb6a23fbdd8 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -23,7 +23,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corefm = libsForQt5.callPackage ../applications/misc/cubocore-packages/corefm {
+      corefm = callPackage ../applications/misc/cubocore-packages/corefm {
         inherit libcprime libcsys;
       };
 

From 959ceb0f74a9cc9d5f82f65b3afe4edcc95946a8 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:45:07 +0800
Subject: [PATCH 07/24] CuboCore.coregarage: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/coregarage/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/coregarage/default.nix  | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
index 32ab1063a04b..279026051549 100644
--- a/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coregarage/default.nix
@@ -1,8 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   libarchive,
   libarchive-qt,
   cmake,
@@ -11,36 +11,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coregarage";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-WCSc3ppYaktj9WnPb4n7SmSNWxT2HiXNmPKS3md3ST4=";
+    repo = "coregarage";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-boe7z8KPnMaoWekBFS4g/Ay98rpREeLMAsHOr2olYws=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libarchive
     libarchive-qt
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Settings manager for the C Suite";
     mainProgram = "coregarage";
     homepage = "https://gitlab.com/cubocore/coreapps/coregarage";
-    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 fbb6a23fbdd8..923d866ec315 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -27,7 +27,7 @@ let
         inherit libcprime libcsys;
       };
 
-      coregarage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coregarage {
+      coregarage = callPackage ../applications/misc/cubocore-packages/coregarage {
         inherit libcprime libcsys;
       };
 

From fafa0c37db50ced7d48e5ade677a61356868bbb6 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:47:27 +0800
Subject: [PATCH 08/24] CuboCore.corehunt: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corehunt/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/corehunt/default.nix    | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
index 61d585e347fe..bce9d730a27c 100644
--- a/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corehunt/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corehunt";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Xir1RQG7AlO166lZq1TJssiWoSixY6EfLEjxek+9ifo=";
+    repo = "corehunt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-QJJ+e+5UKka1Hbrtyn+agpJ7FLADHupZt41K8Mq8H4c=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "File finder utility from the C Suite";
     mainProgram = "corehunt";
     homepage = "https://gitlab.com/cubocore/coreapps/corehunt";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    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 923d866ec315..47b28bdd5118 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -31,7 +31,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corehunt = libsForQt5.callPackage ../applications/misc/cubocore-packages/corehunt {
+      corehunt = callPackage ../applications/misc/cubocore-packages/corehunt {
         inherit libcprime libcsys;
       };
 

From f9525795822b4e5034b90dd2e2451973c3202b05 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:49:01 +0800
Subject: [PATCH 09/24] CuboCore.coreimage: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/coreimage/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/coreimage/default.nix   | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
index d0c01f95c0d2..b891e9f132a0 100644
--- a/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreimage/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreimage";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-SyGIeoYC4bTBWZ0adOfYJpWkW3/bvFNZg5zK2MN27kA=";
+    repo = "coreimage";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-sgOxDKACb9D/TvjjHz09JwBpFoE8eXA4HixcbN+0FoE=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Image viewer from the C Suite";
     mainProgram = "coreimage";
     homepage = "https://gitlab.com/cubocore/coreapps/coreimage";
-    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 47b28bdd5118..3bcd7ff1298e 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -35,7 +35,7 @@ let
         inherit libcprime libcsys;
       };
 
-      coreimage = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreimage {
+      coreimage = callPackage ../applications/misc/cubocore-packages/coreimage {
         inherit libcprime libcsys;
       };
 

From c9fdf0aa92a171ccad398dff5ab3f82867a7d67d Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 09:50:26 +0800
Subject: [PATCH 10/24] CuboCore.coreinfo: 4.5.0 -> 5.0.0

---
 .../cubocore-packages/coreinfo/default.nix    | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
index 7d788eea2286..9aba07fcff1d 100644
--- a/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreinfo/default.nix
@@ -1,35 +1,36 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
   libzen,
   libmediainfo,
   zlib,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreinfo";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-DmvmFMttEvNnIp1zwCe0BLrMx3Wlw1U9LcJwyb4Mx9U=";
+    repo = "coreinfo";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/L69lrkJZh+SJRoNxvogdJ5KRIorwcBzm7WGxrNpexM=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libzen
     libmediainfo
     zlib
@@ -37,12 +38,12 @@ mkDerivation rec {
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "File information tool from the C Suite";
     mainProgram = "coreinfo";
     homepage = "https://gitlab.com/cubocore/coreapps/coreinfo";
-    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 3bcd7ff1298e..4ab57de6e4c6 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -39,7 +39,7 @@ let
         inherit libcprime libcsys;
       };
 
-      coreinfo = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreinfo {
+      coreinfo = callPackage ../applications/misc/cubocore-packages/coreinfo {
         inherit libcprime libcsys;
       };
 

From a845e52eadb2aa9d7afcfd22d6ec631f4ff37762 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:00:46 +0800
Subject: [PATCH 11/24] CuboCore.corekeyboard: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corekeyboard/-/compare/v4.5.0...v5.0.0
---
 .../corekeyboard/default.nix                  | 29 +++++++++----------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
index d5df2a0bf830..4c7dffabe200 100644
--- a/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corekeyboard/default.nix
@@ -1,9 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtx11extras,
+  qt6,
   xorg,
   cmake,
   ninja,
@@ -11,37 +10,37 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corekeyboard";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Hylz1x9Wsk0iVhpNBFZJChsl3gIvJDICgpITjIXDZAg=";
+    repo = "corekeyboard";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-n7QbvRPZFMeUl/P4XiGYZDglZCA8Ftf08s5uzPmSyIQ=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
+    qt6.qtbase
     xorg.libXtst
     xorg.libX11
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Virtual keyboard for X11 from the C Suite";
     mainProgram = "corekeyboard";
     homepage = "https://gitlab.com/cubocore/coreapps/corekeyboard";
-    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 4ab57de6e4c6..65df73f88860 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -43,7 +43,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corekeyboard = libsForQt5.callPackage ../applications/misc/cubocore-packages/corekeyboard {
+      corekeyboard = callPackage ../applications/misc/cubocore-packages/corekeyboard {
         inherit libcprime libcsys;
       };
 

From a84b13489f5b3e12e548c726e554a390329b6346 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:16:17 +0800
Subject: [PATCH 12/24] CuboCore.corepad: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corepad/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/corepad/default.nix     | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corepad/default.nix b/pkgs/applications/misc/cubocore-packages/corepad/default.nix
index e3ff6fdf2b36..86c0689979ab 100644
--- a/pkgs/applications/misc/cubocore-packages/corepad/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepad/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepad";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-qiw6P+I9iAcFcBWiMKAzyxM6waXx/2TPVQHLcLjAnoY=";
+    repo = "corepad";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oGF2N0bUuvc/ixmh2nefEJKh0kDipvcL/dwaXNxwo84=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Document editor from the C Suite";
     mainProgram = "corepad";
     homepage = "https://gitlab.com/cubocore/coreapps/corepad";
-    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 65df73f88860..712b205d1fd8 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -47,7 +47,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corepad = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepad {
+      corepad = callPackage ../applications/misc/cubocore-packages/corepad {
         inherit libcprime libcsys;
       };
 

From cd3cd6eb1a98b4983d90e94aa90ab9018c2426ac Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 10:18:29 +0800
Subject: [PATCH 13/24] CuboCore.corepaint: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corepaint/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/corepaint/default.nix   | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
index 2f4e15543a2f..b281a3fd448d 100644
--- a/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepaint/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepaint";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-ndknVT/gl2P0s3ADW0txiVtAyI/l/ZFWEgufFleS0A4=";
+    repo = "corepaint";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ARFyBtkGYFMKnUD1h93GcQiKV6mFXxJvLEVeSXlaHZI=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Paint app from the C Suite";
     mainProgram = "corepaint";
     homepage = "https://gitlab.com/cubocore/coreapps/corepaint";
-    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 712b205d1fd8..b4d05641fbbc 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -51,7 +51,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corepaint = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepaint {
+      corepaint = callPackage ../applications/misc/cubocore-packages/corepaint {
         inherit libcprime libcsys;
       };
 

From ef60570bf7d69bfce0c2bfe58305fda2b566d987 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:11:50 +0800
Subject: [PATCH 14/24] CuboCore.corepdf: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corepdf/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/corepdf/default.nix     | 37 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
index b45330fef2ce..fa4e8374b511 100644
--- a/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepdf/default.nix
@@ -1,46 +1,49 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  poppler,
-  qtwebengine,
+  kdePackages,
   cmake,
   ninja,
+  pkg-config,
   libcprime,
   libcsys,
+  qdocumentview,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepdf";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-t3r/bF/uKoprdDoRjrmYTND0Jws+jX6tAGnBeqofBF8=";
+    repo = "corepdf";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fhEuMk15yCA6IUasD9rJPR8sB+h0tz8niOQtXFIe7Uc=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    pkg-config
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    poppler
-    qtwebengine
+    kdePackages.qtbase
+    kdePackages.qtwebengine
+    kdePackages.poppler
+    qdocumentview
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "PDF viewer from the C Suite";
     mainProgram = "corepdf";
     homepage = "https://gitlab.com/cubocore/coreapps/corepdf";
-    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 b4d05641fbbc..2180e07e1454 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -55,7 +55,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corepdf = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepdf {
+      corepdf = callPackage ../applications/misc/cubocore-packages/corepdf {
         inherit libcprime libcsys;
       };
 

From f330cb98547db70feaa919246613d0836f3db3be Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:11:54 +0800
Subject: [PATCH 15/24] qdocumentview: init at 0.3.0

---
 pkgs/by-name/qd/qdocumentview/package.nix | 45 +++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/qd/qdocumentview/package.nix

diff --git a/pkgs/by-name/qd/qdocumentview/package.nix b/pkgs/by-name/qd/qdocumentview/package.nix
new file mode 100644
index 000000000000..ff6c6934942a
--- /dev/null
+++ b/pkgs/by-name/qd/qdocumentview/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  kdePackages,
+  meson,
+  ninja,
+  pkg-config,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qdocumentview";
+  version = "0.3.0";
+
+  src = fetchFromGitLab {
+    owner = "extraqt";
+    repo = "qdocumentview";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-fGm19Bl3lSvMhau2jByZTTThwfWnsrm/Xx82J6ZJcVo=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    kdePackages.qtbase
+    kdePackages.poppler
+  ];
+
+  dontWrapQtApps = true;
+
+  meta = {
+    description = "Widget to render multi-page documents";
+    mainProgram = "qdocumentview";
+    homepage = "https://gitlab.com/extraqt/qdocumentview";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ emaryn ];
+    platforms = lib.platforms.linux;
+  };
+})

From 2212a7aecfa5caf1faacaeafe663673346096f02 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:14:51 +0800
Subject: [PATCH 16/24] CuboCore.corepins: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corepins/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/corepins/default.nix    | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corepins/default.nix b/pkgs/applications/misc/cubocore-packages/corepins/default.nix
index 19e34bfbfea1..d7d49426be56 100644
--- a/pkgs/applications/misc/cubocore-packages/corepins/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corepins/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corepins";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-vA2Phs+sEs+Gd73xzj6vb91Krm8q3+koWDM7rCUayTQ=";
+    repo = "corepins";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-noMdI2qk3cYc1FfRWd4rwpZBbeHiD557Z1T0ZxIhaTw=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Bookmarking app from the C Suite";
     mainProgram = "corepins";
     homepage = "https://gitlab.com/cubocore/coreapps/corepins";
-    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 2180e07e1454..f1d658c06f05 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -59,7 +59,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corepins = libsForQt5.callPackage ../applications/misc/cubocore-packages/corepins {
+      corepins = callPackage ../applications/misc/cubocore-packages/corepins {
         inherit libcprime libcsys;
       };
 

From fb1c2ad257e74c1494687911a16e2f6cd2299c00 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:16:56 +0800
Subject: [PATCH 17/24] CuboCore.corerenamer: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corerenamer/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/corerenamer/default.nix | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
index c500ab6fa6a8..c44dc5c41967 100644
--- a/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corerenamer/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corerenamer";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-jN1keyo2tDlgUu243173zgChw2nhvbsLPH9af6jDhKs=";
+    repo = "corerenamer";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9e8Gm7h0zWVQeb7eFcUmp8uTdSboenLa7baZpKc3HEQ=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Batch file renamer from the C Suite";
     mainProgram = "corerenamer";
     homepage = "https://gitlab.com/cubocore/coreapps/corerenamer";
-    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 f1d658c06f05..8f6096e3bf28 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -63,7 +63,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corerenamer = libsForQt5.callPackage ../applications/misc/cubocore-packages/corerenamer {
+      corerenamer = callPackage ../applications/misc/cubocore-packages/corerenamer {
         inherit libcprime libcsys;
       };
 

From 2275874bcea586f773092423ade6142ca4c498f0 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:19:47 +0800
Subject: [PATCH 18/24] CuboCore.coreshot: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/coreshot/-/compare/v4.5.0...v5.0.0
---
 .../cubocore-packages/coreshot/default.nix    | 29 +++++++++----------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
index b283e49237aa..2c75140f7465 100644
--- a/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreshot/default.nix
@@ -1,44 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtx11extras,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreshot";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-XPECvwZkJIoN/r5oFWJpgl/WASpybgLjCK/F0XVMHyU=";
+    repo = "coreshot";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5KGaMCL9BCGZwK7HQz87B1qrNvx5SQyMooZw4MwMdCc=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Screen capture utility from the C Suite";
     mainProgram = "coreshot";
     homepage = "https://gitlab.com/cubocore/coreapps/coreshot";
-    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 8f6096e3bf28..37cbf238a5be 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -67,7 +67,7 @@ let
         inherit libcprime libcsys;
       };
 
-      coreshot = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreshot {
+      coreshot = callPackage ../applications/misc/cubocore-packages/coreshot {
         inherit libcprime libcsys;
       };
 

From c8156c0cbf92f0dd22aadeb586cf86271ec435a1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:21:47 +0800
Subject: [PATCH 19/24] CuboCore.corestats: 4.5.0 -> 5.0.0

---
 .../cubocore-packages/corestats/default.nix   | 27 ++++++++++---------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corestats/default.nix b/pkgs/applications/misc/cubocore-packages/corestats/default.nix
index f557f48740f8..dfe7b160d1d2 100644
--- a/pkgs/applications/misc/cubocore-packages/corestats/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestats/default.nix
@@ -1,8 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   lm_sensors,
   cmake,
   ninja,
@@ -10,35 +10,36 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corestats";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-584dSlXhPfvTBeDjex1o2TZPoG40tl1fNDiIYqjyzOI=";
+    repo = "corestats";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0d03y3AYWxXh9DZrbPWqk34yq7iy5xUn/oMmJBu5GqQ=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     lm_sensors
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "System resource viewer from the C Suite";
     mainProgram = "corestats";
     homepage = "https://gitlab.com/cubocore/coreapps/corestats";
-    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 37cbf238a5be..0217de239e95 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -71,7 +71,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corestats = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestats {
+      corestats = callPackage ../applications/misc/cubocore-packages/corestats {
         inherit libcprime libcsys;
       };
 

From c02371480f991b1f7e18bf71f6aedccadcd153f2 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:28:03 +0800
Subject: [PATCH 20/24] CuboCore.corestuff: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/corestuff/-/compare/v4.5.0...v5.0.0
---
 .../corestuff/0001-fix-installPhase.patch     | 12 +++----
 .../cubocore-packages/corestuff/default.nix   | 34 +++++++++----------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch
index d1db6a0a0a2e..5c8f9557d17a 100644
--- a/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch
+++ b/pkgs/applications/misc/cubocore-packages/corestuff/0001-fix-installPhase.patch
@@ -1,11 +1,11 @@
 --- a/corestuff/CMakeLists.txt	2022-01-29 14:09:02.699700817 +0700
 +++ b/CMakeLists.txt	2022-01-29 14:09:23.211754633 +0700
-@@ -120,8 +120,3 @@
- install( FILES org.cubocore.CoreStuff.desktop DESTINATION share/applications )
- install( FILES org.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ )
+@@ -121,7 +121,3 @@
+ install( FILES cc.cubocore.CoreStuff.svg DESTINATION share/icons/hicolor/scalable/apps/ )
  install( FILES background/default.svg DESTINATION share/coreapps/background )
--
+
 -if ( DEFINED ADD_AUTOSTART )
--	message("INSTALLING TO AUTOSTART LOCATION")
--	install( FILES org.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart )
+-    message("INSTALLING TO AUTOSTART LOCATION")
+-    install( FILES cc.cubocore.CoreStuff.desktop DESTINATION /etc/xdg/autostart )
 -endif()
+
diff --git a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
index 8ec6080a4c32..55089f533438 100644
--- a/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/corestuff/default.nix
@@ -1,10 +1,8 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtx11extras,
-  kglobalaccel,
+  kdePackages,
   xorg,
   cmake,
   ninja,
@@ -12,15 +10,15 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corestuff";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-2tnJMBbROGWZQDWjy/xGBNkv7DXXKLWrHf2XnMjOjWQ=";
+    repo = "corestuff";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/EI7oM7c7GKEQ+XQSiWwkJ7uNrJkxgLXEXZ6r5Jqh70=";
   };
 
   patches = [
@@ -31,23 +29,25 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    kglobalaccel
+    kdePackages.qtbase
+    kdePackages.kglobalaccel
     xorg.libXcomposite
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Activity viewer from the C Suite";
     mainProgram = "corestuff";
     homepage = "https://gitlab.com/cubocore/coreapps/corestuff";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ dan4ik605743 ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ dan4ik605743 ];
+    platforms = lib.platforms.linux;
+    # Address boundary error
+    broken = true;
   };
-}
+})
diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix
index 0217de239e95..e3d6af798ecb 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -75,7 +75,7 @@ let
         inherit libcprime libcsys;
       };
 
-      corestuff = libsForQt5.callPackage ../applications/misc/cubocore-packages/corestuff {
+      corestuff = callPackage ../applications/misc/cubocore-packages/corestuff {
         inherit libcprime libcsys;
       };
 

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 21/24] 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;
       };
 

From 592bf439ccb272dc2a16dc0e28cace3b67278c5e Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:33:15 +0800
Subject: [PATCH 22/24] CuboCore.coretime: 4.5.0 -> 5.0.1

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

diff --git a/pkgs/applications/misc/cubocore-packages/coretime/default.nix b/pkgs/applications/misc/cubocore-packages/coretime/default.nix
index b210b0ca766c..4a48cf604cd9 100644
--- a/pkgs/applications/misc/cubocore-packages/coretime/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretime/default.nix
@@ -1,44 +1,44 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
-  qtmultimedia,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coretime";
-  version = "4.5.0";
+  version = "5.0.1";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-0x3014UG861lXRwIBpYiiYVPmhln9Q20jJ4tIO50Tjs=";
+    repo = "coretime";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RgaIYZ410/M/PHTJC3ja7wEb3HqPrNkBpEIsUK102qw=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    qt6.qtbase
+    qt6.qtmultimedia
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Time related task manager from the C Suite";
     mainProgram = "coretime";
     homepage = "https://gitlab.com/cubocore/coreapps/coretime";
-    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 b234a5052074..08636f91a604 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -84,7 +84,7 @@ let
         inherit libcprime libcsys;
       };
 
-      coretime = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretime {
+      coretime = callPackage ../applications/misc/cubocore-packages/coretime {
         inherit libcprime libcsys;
       };
 

From f5a95125c2f486b2abd643610b3b0fbb5aa3564a Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:40:26 +0800
Subject: [PATCH 23/24] CuboCore.coretoppings: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/coretoppings/-/compare/v4.5.0...v5.0.0
---
 .../coretoppings/0001-fix-install-phase.patch | 10 +++---
 .../coretoppings/default.nix                  | 32 +++++++++----------
 pkgs/top-level/cubocore-packages.nix          |  2 +-
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch
index 3c0c942ee43a..377d0ed90d7f 100644
--- a/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch
+++ b/pkgs/applications/misc/cubocore-packages/coretoppings/0001-fix-install-phase.patch
@@ -1,8 +1,8 @@
 --- a/corepkit/CMakeLists.txt	2021-12-25 17:52:20.000000000 +0700
 +++ b/corepkit/CMakeLists.txt	2021-12-29 17:58:09.298024297 +0700
-@@ -32,4 +32,4 @@
- target_link_libraries( corepkit  Qt5::Core )
- 
+@@ -31,4 +31,4 @@
+ target_link_libraries( corepkit  Qt6::Core )
+
  install( TARGETS corepkit DESTINATION libexec/coreapps/ )
--install( FILES org.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ )
-+install( FILES org.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ )
+-install( FILES cc.cubocore.coreapps.policy DESTINATION share/polkit-1/actions/ )
++install( FILES cc.cubocore.coreapps.policy DESTINATION ${CMAKE_INSTALL_PREFIX}/usr/share/polkit-1/actions/ )
diff --git a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
index ed5d5fc49fa9..70cb09b4dca3 100644
--- a/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coretoppings/default.nix
@@ -1,13 +1,11 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
+  qt6,
   ffmpeg,
   cmake,
   ninja,
-  qtbase,
-  qtx11extras,
-  qtconnectivity,
   v4l-utils,
   grim,
   wf-recorder,
@@ -29,15 +27,15 @@
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coretoppings";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-IYUkPGgFGI6889IyromMBobIoqSZtALVsSswQ7O1Bp0=";
+    repo = "coretoppings";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wHVdZqXn8DXqLbCdKz2fI8BjNVai5dRq3a45HVCvLa8=";
   };
 
   patches = [
@@ -48,12 +46,12 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qtconnectivity
+    qt6.qtbase
+    qt6.qtconnectivity
     libdbusmenu
     ffmpeg
     v4l-utils
@@ -78,12 +76,12 @@ mkDerivation rec {
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Additional features,plugins etc for CuboCore Application Suite";
     mainProgram = "shareIT";
     homepage = "https://gitlab.com/cubocore/coreapps/coretoppings";
-    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 08636f91a604..673ffe022a89 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -88,7 +88,7 @@ let
         inherit libcprime libcsys;
       };
 
-      coretoppings = libsForQt5.callPackage ../applications/misc/cubocore-packages/coretoppings {
+      coretoppings = callPackage ../applications/misc/cubocore-packages/coretoppings {
         inherit libcprime libcsys;
       };
 

From 2653a98ef8448ed9e549c31fac5e050f1a0ea37b Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sun, 20 Apr 2025 11:49:38 +0800
Subject: [PATCH 24/24] CuboCore.coreuniverse: 4.5.0 -> 5.0.0

Diff: https://gitlab.com/cubocore/coreapps/coreuniverse/-/compare/v4.5.0...v5.0.0
---
 .../coreuniverse/default.nix                  | 27 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  1 -
 pkgs/top-level/cubocore-packages.nix          |  5 ++--
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
index dfe9e4f1ea89..b5fa399805ac 100644
--- a/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/coreuniverse/default.nix
@@ -1,42 +1,43 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchFromGitLab,
-  qtbase,
+  qt6,
   cmake,
   ninja,
   libcprime,
   libcsys,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "coreuniverse";
-  version = "4.5.0";
+  version = "5.0.0";
 
   src = fetchFromGitLab {
     owner = "cubocore/coreapps";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-SjD37+uLKJrPvjxK0douNgGCUq9He3EK86takZlrX7Q=";
+    repo = "coreuniverse";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-T5BYHzOqSED40hOc5VwD+oLTwBJ1wARvS8MwiYOWlXM=";
   };
 
   nativeBuildInputs = [
     cmake
     ninja
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6.qtbase
     libcprime
     libcsys
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Shows information about apps from the C Suite";
     mainProgram = "coreuniverse";
     homepage = "https://gitlab.com/cubocore/coreapps/coreuniverse";
-    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/all-packages.nix b/pkgs/top-level/all-packages.nix
index 97746d8cf8a4..e1ffa20114ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7466,7 +7466,6 @@ with pkgs;
         newScope
         lxqt
         lib
-        libsForQt5
         ;
     }
   );
diff --git a/pkgs/top-level/cubocore-packages.nix b/pkgs/top-level/cubocore-packages.nix
index 673ffe022a89..a66b02e84f0e 100644
--- a/pkgs/top-level/cubocore-packages.nix
+++ b/pkgs/top-level/cubocore-packages.nix
@@ -1,8 +1,7 @@
 {
+  lib,
   newScope,
   lxqt,
-  lib,
-  libsForQt5,
 }:
 
 let
@@ -92,7 +91,7 @@ let
         inherit libcprime libcsys;
       };
 
-      coreuniverse = libsForQt5.callPackage ../applications/misc/cubocore-packages/coreuniverse {
+      coreuniverse = callPackage ../applications/misc/cubocore-packages/coreuniverse {
         inherit libcprime libcsys;
       };
     };