From a371ed99e11d8afe5c144a5182af04120ed65a61 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 16 May 2025 18:38:29 +0100
Subject: [PATCH] nixfmt-tree: remove `tree-root-file` default

This isn't needed since treefmt 2.3.1, as it can now determine the tree
root by asking `git`.
---
 pkgs/by-name/ni/nixfmt-tree/package.nix | 98 ++++++++++++++-----------
 1 file changed, 54 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix
index f9a7991544ef..a36a449b3449 100644
--- a/pkgs/by-name/ni/nixfmt-tree/package.nix
+++ b/pkgs/by-name/ni/nixfmt-tree/package.nix
@@ -4,6 +4,8 @@
   treefmt,
   nixfmt-rfc-style,
   nixfmt-tree,
+  git,
+  writableTmpDirAsHomeHook,
 
   settings ? { },
   runtimeInputs ? [ ],
@@ -30,9 +32,6 @@ let
         # The default is warn, which would be too annoying for people who just care about Nix
         on-unmatched = lib.mkOptionDefault "info";
 
-        # Assume the tree is a Git repository, will fail if it's not
-        tree-root-file = lib.mkOptionDefault ".git/index";
-
         # NOTE: The `mkIf` condition should not be needed once `runtimePackages` is removed.
         formatter.nixfmt = lib.mkIf (lib.any isNixfmt allRuntimeInputs) {
           command = "nixfmt";
@@ -102,9 +101,6 @@ treefmtWithConfig.overrideAttrs {
           # Log level for files treefmt won't format
           on-unmatched = "info";
 
-          # Assume the tree is a Git repository, will fail if it's not
-          tree-root-file = ".git/index";
-
           # Configure nixfmt for .nix files
           formatter.nixfmt = {
             command = "nixfmt";
@@ -122,49 +118,63 @@ treefmtWithConfig.overrideAttrs {
     platforms = lib.platforms.all;
   };
 
-  passthru.tests.simple = runCommand "nixfmt-tree-test-simple" { } ''
-    export XDG_CACHE_HOME=$(mktemp -d)
-    cat > unformatted.nix <<EOF
-    let to = "be formatted"; in to
-    EOF
+  passthru.tests.simple =
+    runCommand "nixfmt-tree-test-simple"
+      {
+        nativeBuildInputs = [
+          git
+          nixfmt-tree
+          writableTmpDirAsHomeHook
+        ];
+      }
+      ''
+        git config --global user.email "nix-builder@nixos.org"
+        git config --global user.name "Nix Builder"
 
-    cat > formatted.nix <<EOF
-    let
-      to = "be formatted";
-    in
-    to
-    EOF
+        cat > unformatted.nix <<EOF
+        let to = "be formatted"; in to
+        EOF
 
-    mkdir -p repo
-    (
-      cd repo
-      mkdir .git dir
-      touch .git/index
-      cp ../unformatted.nix a.nix
-      cp ../unformatted.nix dir/b.nix
+        cat > formatted.nix <<EOF
+        let
+          to = "be formatted";
+        in
+        to
+        EOF
 
-      ${lib.getExe nixfmt-tree} dir
-      if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
-        echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
-        exit 1
-      elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
-        echo "File a.nix was formatted when only dir was requested to be formatted"
-        exit 1
-      fi
+        mkdir -p repo
+        (
+          cd repo
+          mkdir dir
+          cp ../unformatted.nix a.nix
+          cp ../unformatted.nix dir/b.nix
 
-      (
-        cd dir
-        ${lib.getExe nixfmt-tree}
-      )
+          git init
+          git add .
+          git commit -m "Initial commit"
 
-      if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
-        echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
-        exit 1
-      fi
-    )
+          treefmt dir
+          if [[ "$(<dir/b.nix)" != "$(<../formatted.nix)" ]]; then
+            echo "File dir/b.nix was not formatted properly after dir was requested to be formatted"
+            exit 1
+          elif [[ "$(<a.nix)" != "$(<../unformatted.nix)" ]]; then
+            echo "File a.nix was formatted when only dir was requested to be formatted"
+            exit 1
+          fi
 
-    echo "Success!"
+          (
+            cd dir
+            treefmt
+          )
 
-    touch $out
-  '';
+          if [[ "$(<a.nix)" != "$(<../formatted.nix)" ]]; then
+            echo "File a.nix was not formatted properly after running treefmt without arguments in dir"
+            exit 1
+          fi
+        )
+
+        echo "Success!"
+
+        touch $out
+      '';
 }