From e878307708630955e5f774caea9b24916adc9c06 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 23 Jun 2025 18:15:26 -0700
Subject: [PATCH 1/2] gitqlient: modernize

---
 .../version-management/gitqlient/default.nix  | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/applications/version-management/gitqlient/default.nix
index f396dfeed177..2dd1b4973ad3 100644
--- a/pkgs/applications/version-management/gitqlient/default.nix
+++ b/pkgs/applications/version-management/gitqlient/default.nix
@@ -1,30 +1,30 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
-  qmake,
-  qtwebengine,
+  libsForQt5,
   gitUpdater,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gitqlient";
   version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "francescmm";
     repo = "gitqlient";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-gfWky5KTSj+5FC++QIVTJbrDOYi/dirTzs6LvTnO74A=";
   };
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtwebengine
+    libsForQt5.qtwebengine
   ];
 
   qmakeFlags = [
@@ -35,12 +35,12 @@ mkDerivation rec {
     rev-prefix = "v";
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/francescmm/GitQlient";
     description = "Multi-platform Git client written with Qt";
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.lgpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ romildo ];
     mainProgram = "gitqlient";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9917b580922..997ad375de49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3067,7 +3067,7 @@ with pkgs;
 
   gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { };
 
-  gitqlient = libsForQt5.callPackage ../applications/version-management/gitqlient { };
+  gitqlient = callPackage ../applications/version-management/gitqlient { };
 
   glogg = libsForQt5.callPackage ../tools/text/glogg { };
 

From 3b5c14a2c70c086effd0da24f7365924f8fbf2a4 Mon Sep 17 00:00:00 2001
From: awwpotato <awwpotato@voidq.com>
Date: Mon, 23 Jun 2025 18:16:25 -0700
Subject: [PATCH 2/2] gitqlient: move to by-name

---
 .../gitqlient/default.nix => by-name/gi/gitqlient/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/version-management/gitqlient/default.nix => by-name/gi/gitqlient/package.nix} (100%)

diff --git a/pkgs/applications/version-management/gitqlient/default.nix b/pkgs/by-name/gi/gitqlient/package.nix
similarity index 100%
rename from pkgs/applications/version-management/gitqlient/default.nix
rename to pkgs/by-name/gi/gitqlient/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 997ad375de49..03fb17ebc456 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3067,8 +3067,6 @@ with pkgs;
 
   gitlab-workhorse = callPackage ../by-name/gi/gitlab/gitlab-workhorse { };
 
-  gitqlient = callPackage ../applications/version-management/gitqlient { };
-
   glogg = libsForQt5.callPackage ../tools/text/glogg { };
 
   gmrender-resurrect = callPackage ../tools/networking/gmrender-resurrect {