diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index 0bc2fca142ba..a79513d9de7f 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -7,17 +7,18 @@
   testers,
   git-town,
   makeWrapper,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule rec {
   pname = "git-town";
-  version = "17.1.1";
+  version = "18.0.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
-    rev = "v${version}";
-    hash = "sha256-q9k9x3e20oPjladE1tUSqSVQ8kKbmSu9kbU13lJsVU8=";
+    tag = "v${version}";
+    hash = "sha256-vn0Cq53gqe0HGrtYMUHCFsE13CpaBJqC4LxrkJSel1Y=";
   };
 
   vendorHash = null;
@@ -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
   '';
@@ -55,6 +57,7 @@ buildGoModule rec {
       skippedTests = [
         "TestGodog"
         "TestMockingRunner/MockCommand"
+        "TestMockingRunner/MockCommitMessage"
         "TestMockingRunner/QueryWith"
         "TestTestCommands/CreateChildFeatureBranch"
       ];
@@ -76,11 +79,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
       gabyx
     ];