From 436da3c2d47fcdd133d1f039339e085645bfa92e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 14:11:28 +0000
Subject: [PATCH 1/2] git-machete: 3.36.3 -> 3.36.4

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

diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix
index 37a38164b949..39ebcc178cc3 100644
--- a/pkgs/by-name/gi/git-machete/package.nix
+++ b/pkgs/by-name/gi/git-machete/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "git-machete";
-  version = "3.36.3";
+  version = "3.36.4";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = "git-machete";
     rev = "v${version}";
-    hash = "sha256-WjyRTtUDgw+luSzHvsJLPCkxWQldqA8idYrbLwWHScQ=";
+    hash = "sha256-9xJCwu2TeWsxut6y4VJV6Qou4G81kXcGPHJPrOrsGuc=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 300c2f6d29d7262e0bd60abb7f578ccfeac11b5e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 13 Aug 2025 18:36:27 +0200
Subject: [PATCH 2/2] git-machete: refactor

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

diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix
index 39ebcc178cc3..6d254d10c57a 100644
--- a/pkgs/by-name/gi/git-machete/package.nix
+++ b/pkgs/by-name/gi/git-machete/package.nix
@@ -10,12 +10,12 @@
 python3.pkgs.buildPythonApplication rec {
   pname = "git-machete";
   version = "3.36.4";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "virtuslab";
     repo = "git-machete";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-9xJCwu2TeWsxut6y4VJV6Qou4G81kXcGPHJPrOrsGuc=";
   };
 
@@ -54,7 +54,7 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     homepage = "https://github.com/VirtusLab/git-machete";
     description = "Git repository organizer and rebase/merge workflow automation tool";
-    changelog = "https://github.com/VirtusLab/git-machete/releases/tag/v${version}";
+    changelog = "https://github.com/VirtusLab/git-machete/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ blitz ];
     mainProgram = "git-machete";