From d24e487a395d5fc1a61587b91007dd9cbb22b3e1 Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 22 Feb 2025 10:12:37 +0800
Subject: [PATCH 1/2] git-town: refactor

---
 pkgs/by-name/gi/git-town/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index 623f81ed61d4..99179340b05d 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -7,6 +7,7 @@
   testers,
   git-town,
   makeWrapper,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule rec {
@@ -16,7 +17,7 @@ buildGoModule rec {
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-q9k9x3e20oPjladE1tUSqSVQ8kKbmSu9kbU13lJsVU8=";
   };
 
@@ -40,11 +41,12 @@ buildGoModule rec {
       "-X ${modulePath}/src/cmd.buildDate=nix"
     ];
 
-  nativeCheckInputs = [ git ];
+  nativeCheckInputs = [
+    git
+    writableTmpDirAsHomeHook
+  ];
 
   preCheck = ''
-    HOME=$(mktemp -d)
-
     # this runs tests requiring local operations
     rm main_test.go
   '';
@@ -76,11 +78,11 @@ buildGoModule rec {
     inherit version;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Generic, high-level git support for git-flow workflows";
     homepage = "https://www.git-town.com/";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       allonsy
       blaggacao
       gabyx

From 3c9ea5061dcb51feb77cf0d62d9c4a5cf452d17a Mon Sep 17 00:00:00 2001
From: emaryn <emaryn@users.noreply.github.com>
Date: Sat, 22 Feb 2025 10:20:10 +0800
Subject: [PATCH 2/2] git-town: 17.1.1 -> 18.0.0

---
 pkgs/by-name/gi/git-town/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index 99179340b05d..441af89dad78 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "git-town";
-  version = "17.1.1";
+  version = "18.0.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-q9k9x3e20oPjladE1tUSqSVQ8kKbmSu9kbU13lJsVU8=";
+    hash = "sha256-vn0Cq53gqe0HGrtYMUHCFsE13CpaBJqC4LxrkJSel1Y=";
   };
 
   vendorHash = null;
@@ -57,6 +57,7 @@ buildGoModule rec {
       skippedTests = [
         "TestGodog"
         "TestMockingRunner/MockCommand"
+        "TestMockingRunner/MockCommitMessage"
         "TestMockingRunner/QueryWith"
         "TestTestCommands/CreateChildFeatureBranch"
       ];