From 73060b49720ce165bd7d0a087ecae98ad104e25a Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 24 Jan 2025 16:37:09 +0100
Subject: [PATCH] pre-commit/check-merge-conflicts-2: fix use outside dev shell

Note that this is just a script that is meant to run outside a
derivation (but also can be called by a derivation builder).
`touch $out` does not belong in it.

`touch $out` worked accidentally in the derivation-based check,
and also in the dev shell, but if pre-commit is invoked without
the dev shell it would fail.
---
 maintainers/flake-module.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
index c44e5134c..208296194 100644
--- a/maintainers/flake-module.nix
+++ b/maintainers/flake-module.nix
@@ -35,7 +35,6 @@
                 echo "ERROR: found merge/patch conflicts in files"
                 exit 1
               fi
-              touch $out
             ''}";
           };
           nixfmt-rfc-style = {