From dbf76b7c1befc9702c8ba81ef3f5448ba4642b1e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:55:50 +0800
Subject: [PATCH] fetchgit: pass tag directly and make overridable

---
 pkgs/build-support/fetchgit/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 80d56ff501ca..9b6085f1c7fd 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -42,9 +42,6 @@ lib.makeOverridable (
     constructDrv = stdenvNoCC.mkDerivation;
 
     excludeDrvArgNames = [
-      # Passed via `passthru`
-      "tag"
-
       # Additional stdenv.mkDerivation arguments from derived fetchers.
       "derivationArgs"
 
@@ -65,7 +62,7 @@ lib.makeOverridable (
           rev ? null,
           name ? urlToName {
             inherit url;
-            rev = lib.revOrTag rev tag;
+            rev = lib.revOrTag rev finalAttrs.tag;
             # when rootDir is specified, avoid invalidating the result when rev changes
             append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
           },
@@ -176,7 +173,11 @@ lib.makeOverridable (
               rootDir
               gitConfigFile
               ;
-            rev = getRevWithTag { inherit tag rev; };
+            inherit tag;
+            rev = getRevWithTag {
+              inherit (finalAttrs) tag;
+              inherit rev;
+            };
 
             postHook =
               if netrcPhase == null then
@@ -216,7 +217,6 @@ lib.makeOverridable (
 
             passthru = {
               gitRepoUrl = url;
-              inherit tag;
             }
             // passthru;
           }