wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 14:51:16 +02:00
Code Activity

pre-commit/check-merge-conflicts-2: fix use outside dev shell

Browse source 
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.
This commit is contained in:
Robert Hensing 2025-01-24 16:37:09 +01:00
parent fc83c6ccb3
commit 73060b4972
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
maintainers/flake-module.nix
View file

@ -35,7 +35,6 @@
echo "ERROR: found merge/patch conflicts in files" echo "ERROR: found merge/patch conflicts in files"
exit 1 exit 1
fi fi
touch $out
''}"; ''}";
}; };
nixfmt-rfc-style = { nixfmt-rfc-style = {