From 64fe5d3cd03d0fe66a2eac54cdc371acd0bcacc2 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:26:56 +0000
Subject: [PATCH] gittyup: migrate to pkgs/by-name

---
 ...Fix-incorrect-order-of-argument-to-calloc-345.patch |  0
 .../default.nix => by-name/gi/gittyup/package.nix}     | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/version-management => by-name/gi}/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch (100%)
 rename pkgs/{applications/version-management/gittyup/default.nix => by-name/gi/gittyup/package.nix} (95%)

diff --git a/pkgs/applications/version-management/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch b/pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
similarity index 100%
rename from pkgs/applications/version-management/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
rename to pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/by-name/gi/gittyup/package.nix
similarity index 95%
rename from pkgs/applications/version-management/gittyup/default.nix
rename to pkgs/by-name/gi/gittyup/package.nix
index 25e65657ce8d..0f125293276b 100644
--- a/pkgs/applications/version-management/gittyup/default.nix
+++ b/pkgs/by-name/gi/gittyup/package.nix
@@ -11,9 +11,7 @@
   ninja,
   openssl,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
     cmark
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -66,8 +64,8 @@ stdenv.mkDerivation rec {
     libssh2
     lua5_4
     openssl
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
   ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f035f5a359f2..0ee5969112b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1246,8 +1246,6 @@ with pkgs;
 
   gitRepo = git-repo;
 
-  gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
-
   merge-fmt = callPackage ../applications/version-management/merge-fmt {
     inherit (ocamlPackages)
       buildDunePackage