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 = { diff --git a/tests/functional/git-hashing/fixed.sh b/tests/functional/git-hashing/fixed.sh old mode 100644 new mode 100755 diff --git a/tests/functional/git-hashing/simple.sh b/tests/functional/git-hashing/simple.sh old mode 100644 new mode 100755 index f43168eb2..e02d8b297 --- a/tests/functional/git-hashing/simple.sh +++ b/tests/functional/git-hashing/simple.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + source common.sh repo="$TEST_ROOT/scratch" diff --git a/tests/functional/help.sh b/tests/functional/help.sh index efacaba59..e1ef75c41 100755 --- a/tests/functional/help.sh +++ b/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