From a36cf528f76468419d6e7df22ad652607b21e195 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 4 Nov 2024 17:07:37 +0800
Subject: [PATCH 1/4] git-fast-export: move to by-name

---
 .../default.nix => by-name/gi/git-fast-export/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/version-management/fast-export/default.nix => by-name/gi/git-fast-export/package.nix} (100%)

diff --git a/pkgs/applications/version-management/fast-export/default.nix b/pkgs/by-name/gi/git-fast-export/package.nix
similarity index 100%
rename from pkgs/applications/version-management/fast-export/default.nix
rename to pkgs/by-name/gi/git-fast-export/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3756a72b7c3f..299f943cb2d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2227,8 +2227,6 @@ with pkgs;
 
   git-fame = callPackage ../applications/version-management/git-fame { };
 
-  git-fast-export = callPackage ../applications/version-management/fast-export { };
-
   git-fire = callPackage ../applications/version-management/git-fire { };
 
   git-ftp = callPackage ../applications/version-management/git-ftp { };

From 2ff0c93a65b60a40f12a326f3a98133d1e026be8 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 4 Nov 2024 17:07:55 +0800
Subject: [PATCH 2/4] git-fast-export: nixfmt

---
 pkgs/by-name/gi/git-fast-export/package.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/git-fast-export/package.nix b/pkgs/by-name/gi/git-fast-export/package.nix
index a4d9c030c9b4..d62298e39007 100644
--- a/pkgs/by-name/gi/git-fast-export/package.nix
+++ b/pkgs/by-name/gi/git-fast-export/package.nix
@@ -1,4 +1,11 @@
-{lib, stdenv, fetchFromGitHub, git, mercurial, makeWrapper}:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  git,
+  mercurial,
+  makeWrapper,
+}:
 
 stdenv.mkDerivation rec {
   pname = "fast-export";
@@ -12,7 +19,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [mercurial.python mercurial];
+  buildInputs = [
+    mercurial.python
+    mercurial
+  ];
 
   installPhase = ''
     binPath=$out/bin

From 6e66b546a1e0c6e93426ff7b44afbc2f4705293d Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 4 Nov 2024 17:09:21 +0800
Subject: [PATCH 3/4] git-fast-export: add passthru.updateScript

---
 pkgs/by-name/gi/git-fast-export/package.nix | 23 ++++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gi/git-fast-export/package.nix b/pkgs/by-name/gi/git-fast-export/package.nix
index d62298e39007..73328bc9e52f 100644
--- a/pkgs/by-name/gi/git-fast-export/package.nix
+++ b/pkgs/by-name/gi/git-fast-export/package.nix
@@ -5,17 +5,18 @@
   git,
   mercurial,
   makeWrapper,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs:{
   pname = "fast-export";
   version = "221024";
 
   src = fetchFromGitHub {
     owner = "frej";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM=";
+    repo = "fast-export";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
@@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     binPath=$out/bin
-    libexecPath=$out/libexec/${pname}
+    libexecPath=$out/libexec/fast-export
     sitepackagesPath=$out/${mercurial.python.sitePackages}
     mkdir -p $binPath $libexecPath $sitepackagesPath
 
@@ -67,11 +68,13 @@ stdenv.mkDerivation rec {
     popd
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Import mercurial into git";
     homepage = "https://repo.or.cz/w/fast-export.git";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.koral ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.koral ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From 5dee69a240e48f250918fd57e91e4a66910909d2 Mon Sep 17 00:00:00 2001
From: wxt <3264117476@qq.com>
Date: Mon, 4 Nov 2024 17:10:37 +0800
Subject: [PATCH 4/4] git-fast-export: 221024 -> 231118

---
 pkgs/by-name/gi/git-fast-export/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-fast-export/package.nix b/pkgs/by-name/gi/git-fast-export/package.nix
index 73328bc9e52f..f94bf3a3e580 100644
--- a/pkgs/by-name/gi/git-fast-export/package.nix
+++ b/pkgs/by-name/gi/git-fast-export/package.nix
@@ -6,19 +6,27 @@
   mercurial,
   makeWrapper,
   nix-update-script,
+  fetchpatch,
 }:
 
-stdenv.mkDerivation (finalAttrs:{
+stdenv.mkDerivation (finalAttrs: {
   pname = "fast-export";
-  version = "221024";
+  version = "231118";
 
   src = fetchFromGitHub {
     owner = "frej";
     repo = "fast-export";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-re8iXM8s+TD35UGKalq2kVn8fx68fsnUC7Yo+/DQ9SM=";
+    hash = "sha256-JUy0t2yzd4bI7WPGG1E8L1topLfR5leV/WTU+u0bCyM=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/frej/fast-export/commit/a3d0562737e1e711659e03264e45cb47a5a2f46d.patch?full_index=1";
+      hash = "sha256-vZOHnb5lXO22ElCK4oWQKCcPIqRyZV5axWfZqa84V1Y=";
+    })
+  ];
+
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
     mercurial.python