From e3a68e76f6d3bdaa534b6f814893345381a0a5d0 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 3 Dec 2025 00:23:41 +0000
Subject: [PATCH 1/4] gita: 0.16.6.1 -> 0.16.8.2

Diff: https://github.com/nosarthur/gita/compare/v0.16.6.1...v0.16.8.2
Release: https://github.com/nosarthur/gita/releases/tag/v0.16.8.2
---
 pkgs/by-name/gi/gita/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gi/gita/package.nix b/pkgs/by-name/gi/gita/package.nix
index e62487aff2b0..145455e1efbf 100644
--- a/pkgs/by-name/gi/gita/package.nix
+++ b/pkgs/by-name/gi/gita/package.nix
@@ -6,19 +6,19 @@
 }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.16.6.1";
+  version = "0.16.8.2";
   format = "setuptools";
   pname = "gita";
 
   src = fetchFromGitHub {
-    sha256 = "sha256-kPyk13yd4rc63Nh73opuHsCTj4DgYAVfro8To96tteA=";
+    sha256 = "sha256-JzfGj17YCYXmpGV2jSsGLsG1oqO5ynj7r3u/mkSBRBg=";
     rev = "v${version}";
     repo = "gita";
     owner = "nosarthur";
   };
 
   dependencies = with python3Packages; [
-    pyyaml
+    argcomplete
     setuptools
   ];
 
@@ -28,8 +28,8 @@ python3Packages.buildPythonApplication rec {
   doCheck = false;
 
   postInstall = ''
-    installShellCompletion --bash --name gita ${src}/.gita-completion.bash
-    installShellCompletion --zsh --name gita ${src}/.gita-completion.zsh
+    installShellCompletion --bash --name gita auto-completion/bash/.gita-completion.bash
+    installShellCompletion --zsh --name gita auto-completion/zsh/.gita-completion.zsh
   '';
 
   meta = {

From 3e80bf1733beb55bc9a0b6cbc64028392e73299b Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 3 Dec 2025 00:26:51 +0000
Subject: [PATCH 2/4] gita: add fish auto-completion

---
 pkgs/by-name/gi/gita/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gi/gita/package.nix b/pkgs/by-name/gi/gita/package.nix
index 145455e1efbf..a09eeab5dac4 100644
--- a/pkgs/by-name/gi/gita/package.nix
+++ b/pkgs/by-name/gi/gita/package.nix
@@ -29,6 +29,7 @@ python3Packages.buildPythonApplication rec {
 
   postInstall = ''
     installShellCompletion --bash --name gita auto-completion/bash/.gita-completion.bash
+    installShellCompletion --fish --name gita auto-completion/fish/gita.fish
     installShellCompletion --zsh --name gita auto-completion/zsh/.gita-completion.zsh
   '';
 

From f1119aa1ed83369edbc8800ce34059b361dadfe3 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 3 Dec 2025 00:47:43 +0000
Subject: [PATCH 3/4] gita: modernise

---
 pkgs/by-name/gi/gita/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gi/gita/package.nix b/pkgs/by-name/gi/gita/package.nix
index a09eeab5dac4..93541b631a26 100644
--- a/pkgs/by-name/gi/gita/package.nix
+++ b/pkgs/by-name/gi/gita/package.nix
@@ -6,21 +6,20 @@
 }:
 
 python3Packages.buildPythonApplication rec {
-  version = "0.16.8.2";
-  format = "setuptools";
   pname = "gita";
+  version = "0.16.8.2";
+  pyproject = true;
 
   src = fetchFromGitHub {
-    sha256 = "sha256-JzfGj17YCYXmpGV2jSsGLsG1oqO5ynj7r3u/mkSBRBg=";
-    rev = "v${version}";
     repo = "gita";
     owner = "nosarthur";
+    tag = "v${version}";
+    hash = "sha256-JzfGj17YCYXmpGV2jSsGLsG1oqO5ynj7r3u/mkSBRBg=";
   };
 
-  dependencies = with python3Packages; [
-    argcomplete
-    setuptools
-  ];
+  build-system = [ python3Packages.setuptools ];
+
+  dependencies = [ python3Packages.argcomplete ];
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -36,6 +35,7 @@ python3Packages.buildPythonApplication rec {
   meta = {
     description = "Command-line tool to manage multiple git repos";
     homepage = "https://github.com/nosarthur/gita";
+    changelog = "https://github.com/nosarthur/gita/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ seqizz ];
     mainProgram = "gita";

From 677ed6ce93acd65d71d81ba06e30c004e421861a Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 3 Dec 2025 02:45:17 +0000
Subject: [PATCH 4/4] gita: enabled tests

---
 pkgs/by-name/gi/gita/package.nix | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gita/package.nix b/pkgs/by-name/gi/gita/package.nix
index 93541b631a26..61df50f3d319 100644
--- a/pkgs/by-name/gi/gita/package.nix
+++ b/pkgs/by-name/gi/gita/package.nix
@@ -1,8 +1,10 @@
 {
   lib,
+  git,
   python3Packages,
   fetchFromGitHub,
   installShellFiles,
+  writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -23,8 +25,28 @@ python3Packages.buildPythonApplication rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  # 3 of the tests are failing
-  doCheck = false;
+  nativeCheckInputs = [
+    git
+    python3Packages.pytestCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  enabledTestPaths = [
+    "${src}/tests"
+  ];
+
+  disabledTests = [
+    # This test fails as it tries to write to the Nix store.
+    "test_set_first_time"
+  ];
+
+  # The test suite assumes that it is ran from a directory called "gita" that is
+  # a git repository.
+  preCheck = ''
+    mkdir $TMPDIR/gita
+    git init $TMPDIR/gita
+    cd $TMPDIR/gita
+  '';
 
   postInstall = ''
     installShellCompletion --bash --name gita auto-completion/bash/.gita-completion.bash