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

Merge pull request #12373 from roberth/fix-pre-commit

Browse source 
pre-commit/check-merge-conflicts-2: fix use outside dev shell
This commit is contained in:
mergify[bot] 2025-02-07 11:07:12 +00:00 • committed by GitHub
commit aa383a0b85
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 4 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 = {

0
tests/functional/git-hashing/fixed.sh Normal file → Executable file
View file

2
tests/functional/git-hashing/simple.sh Normal file → Executable file
View file

@ -1,3 +1,5 @@
#!/usr/bin/env bash
source common.sh source common.sh
repo="$TEST_ROOT/scratch" repo="$TEST_ROOT/scratch"

4
tests/functional/help.sh
View file

@ -25,7 +25,7 @@ done
# FIXME: we don't know whether we built the manpages, so we can't # FIXME: we don't know whether we built the manpages, so we can't
# reliably test them here. # reliably test them here.
if false; then skipTest "we don't know whether we built the manpages, so we can't reliably test them here."
# test help output # test help output
@ -74,5 +74,3 @@ nix-daemon --help
nix-hash --help nix-hash --help
nix-instantiate --help nix-instantiate --help
nix-prefetch-url --help nix-prefetch-url --help
fi