From da2e58d348bbcf534852ae2d552461638c73c46a Mon Sep 17 00:00:00 2001
From: Vinny Meller <vinnymeller@proton.me>
Date: Wed, 11 Sep 2024 20:28:15 -0400
Subject: [PATCH] git-spice: 0.4.0 -> 0.5.2

---
 pkgs/by-name/gi/git-spice/package.nix | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index e820781045d3..041fb9ff08e9 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -1,23 +1,32 @@
 {
   lib,
-  buildGoModule,
+  fetchpatch,
+  buildGo123Module,
   fetchFromGitHub,
   git,
   nix-update-script,
 }:
 
-buildGoModule rec {
+buildGo123Module rec {
   pname = "git-spice";
-  version = "0.4.0";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     rev = "refs/tags/v${version}";
-    hash = "sha256-D+kwH7fBRvi+H0/L7Gezn1FMBk3AkL9MbLULAwvrzrg=";
+    hash = "sha256-ftNLe/3akvk6nUrseBqpbJQSiUPEJO6cTEc7uEBKX3k=";
   };
 
-  vendorHash = "sha256-24jtlvp8xSMzNejyzqt+MiQHRKprps132Q+rP9wlA30=";
+  vendorHash = "sha256-f7bjlTVwCFoQrgbeyAvsVAS6vy5uE/AvMGKEutE1lfs=";
+
+  # Fixes flaky test. Remove next release.
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/abhinav/git-spice/commit/92c28474bab81881443129e4a8e9bfc3f1564931.patch";
+      hash = "sha256-6v++jG7Wm6awqHRiNzwjX25BB8X9yGYhSzcUDNQKJ7k=";
+    })
+  ];
 
   subPackages = [ "." ];