From c718169b9e1680829c50e4ed9e8a10e70ac65b2b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 5 Oct 2025 19:34:03 +0200
Subject: [PATCH 1/2] qgit: 2.11 -> 2.12

---
 .../version-management/qgit/default.nix       | 22 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix
index 444adfbdab90..9955932b340a 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/applications/version-management/qgit/default.nix
@@ -1,25 +1,33 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   cmake,
   qtbase,
+  qt5compat,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qgit";
-  version = "2.11";
+  version = "2.12";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-DmwxOy71mIklLQ7V/qMzi8qCMtKa9nWHlkjEr/9HJIU=";
+    rev = "qgit-${version}";
+    hash = "sha256-q81nY9D/8riMTFP8gDRbY2PjVo+NwRu/XEN1Yn0P/pk=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [
+    qtbase
+    qt5compat
+  ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
 
   meta = with lib; {
     license = licenses.gpl2Only;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba932e007ef6..f6c6376cb551 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1261,7 +1261,7 @@ with pkgs;
     python3Packages.callPackage ../applications/version-management/pass-git-helper
       { };
 
-  qgit = qt5.callPackage ../applications/version-management/qgit { };
+  qgit = qt6Packages.callPackage ../applications/version-management/qgit { };
 
   silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { };
 

From d36ea036bee6d2ae01b55e0571c17b9f155e178e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 5 Oct 2025 19:35:25 +0200
Subject: [PATCH 2/2] qgit: refactor, cleanup

---
 .../version-management/qgit/default.nix       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix
index 9955932b340a..cc946a3e78d1 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/applications/version-management/qgit/default.nix
@@ -8,36 +8,36 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qgit";
   version = "2.12";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
-    rev = "qgit-${version}";
+    rev = "qgit-${finalAttrs.version}";
     hash = "sha256-q81nY9D/8riMTFP8gDRbY2PjVo+NwRu/XEN1Yn0P/pk=";
   };
 
-  buildInputs = [
-    qtbase
-    qt5compat
-  ];
-
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook
   ];
 
-  meta = with lib; {
-    license = licenses.gpl2Only;
+  buildInputs = [
+    qtbase
+    qt5compat
+  ];
+
+  meta = {
+    license = lib.licenses.gpl2Only;
     homepage = "https://github.com/tibirna/qgit";
     description = "Graphical front-end to Git";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       peterhoeg
       markuskowa
     ];
     inherit (qtbase.meta) platforms;
     mainProgram = "qgit";
   };
-}
+})