From 4b674fa47230db050958a4459c6a17c8b8b2892c Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 7 Aug 2025 05:58:36 -0700
Subject: [PATCH 1/3] catppuccin-qt5ct: add nullcube as maintainer

---
 pkgs/by-name/ca/catppuccin-qt5ct/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
index d0b4c5380931..5705518c2fc1 100644
--- a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
+++ b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
@@ -25,7 +25,10 @@ stdenvNoCC.mkDerivation {
     description = "Soothing pastel theme for qt5ct";
     homepage = "https://github.com/catppuccin/qt5ct";
     license = licenses.mit;
-    maintainers = with maintainers; [ pluiedev ];
+    maintainers = with maintainers; [
+      pluiedev
+      nullcube
+    ];
     platforms = platforms.all;
   };
 }

From e21a96a1b48613b6afb856cead380840f0afb905 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 7 Aug 2025 06:01:11 -0700
Subject: [PATCH 2/3] catppuccin-qt5ct: remove with lib;

---
 pkgs/by-name/ca/catppuccin-qt5ct/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
index 5705518c2fc1..2b3358ce6f63 100644
--- a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
+++ b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
@@ -21,14 +21,14 @@ stdenvNoCC.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Soothing pastel theme for qt5ct";
     homepage = "https://github.com/catppuccin/qt5ct";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       pluiedev
       nullcube
     ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
   };
 }

From 41e3c55a6f44dfe0dd8be0876c210ff1c97551c1 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Thu, 7 Aug 2025 05:57:10 -0700
Subject: [PATCH 3/3] catppuccin-qt5ct: 2023-03-21 -> 0-unstable-2025-03-29

---
 pkgs/by-name/ca/catppuccin-qt5ct/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
index 2b3358ce6f63..9212dab435e5 100644
--- a/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
+++ b/pkgs/by-name/ca/catppuccin-qt5ct/package.nix
@@ -5,24 +5,25 @@
 }:
 stdenvNoCC.mkDerivation {
   pname = "catppuccin-qt5ct";
-  version = "2023-03-21";
+  version = "0-unstable-2025-03-29";
 
   src = fetchFromGitHub {
     owner = "catppuccin";
     repo = "qt5ct";
-    rev = "89ee948e72386b816c7dad72099855fb0d46d41e";
-    hash = "sha256-t/uyK0X7qt6qxrScmkTU2TvcVJH97hSQuF0yyvSO/qQ=";
+    rev = "cb585307edebccf74b8ae8f66ea14f21e6666535";
+    hash = "sha256-wDj6kQ2LQyMuEvTQP6NifYFdsDLT+fMCe3Fxr8S783w=";
   };
 
   installPhase = ''
     runHook preInstall
-    mkdir -p $out/share/qt5ct
+    mkdir -p $out/share/qt{5,6}ct
     cp -r themes $out/share/qt5ct/colors
+    cp -r themes $out/share/qt6ct/colors
     runHook postInstall
   '';
 
   meta = {
-    description = "Soothing pastel theme for qt5ct";
+    description = "Soothing pastel theme for qt5ct & qt6ct";
     homepage = "https://github.com/catppuccin/qt5ct";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [