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

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

maintainers/flake-module.nix

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

tests/functional/git-hashing/simple.sh

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

tests/functional/help.sh

@@ -25,7 +25,7 @@ done
 
 # FIXME: we don't know whether we built the manpages, so we can't
 # 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
 
@@ -74,5 +74,3 @@ nix-daemon --help
 nix-hash --help
 nix-instantiate --help
 nix-prefetch-url --help
-
-fi