cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Add more tests for flake upward searching

Browse source
This commit is contained in:
Alexander Bantyev 2022-01-14 17:15:45 +03:00
parent 2dead20924
commit e3690ab393
No known key found for this signature in database
GPG key ID: E081FF12ADCB4AD5
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/libexpr/flake/flakeref.cc
View file

@ -122,27 +122,28 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
if (isFlake) { if (isFlake) {
if (!allowMissing && !pathExists(path + "/flake.nix")){ if (!allowMissing && !pathExists(path + "/flake.nix")){
notice("path '%s' does not contain a 'flake.nix', searching up",path); notice("path '%s' does not contain a 'flake.nix', searching up",path);
// Save device to detect filesystem boundary // Save device to detect filesystem boundary
dev_t device = lstat(path).st_dev; dev_t device = lstat(path).st_dev;
bool found = false; bool found = false;
while (path != "/") { while (path != "/") {
if (pathExists(path + "/flake.nix")) { if (pathExists(path + "/flake.nix")) {
found = true; found = true;
break; break;
} else if (pathExists(path + "/.git")) } else if (pathExists(path + "/.git"))
throw Error("unable to find a flake before encountering git boundary at '%s'", path); throw Error("path '%s' is not part of a flake (neither it nor its parent directories contain a 'flake.nix' file)", path);
else { else {
if (lstat(path).st_dev != device) if (lstat(path).st_dev != device)
throw Error("path '%s' is not part of a flake (neither it nor its parent directories contain a 'flake.nix' file)", origPath); throw Error("unable to find a flake before encountering filesystem boundary at '%s'", path);
}
path = dirOf(path);
} }
path = dirOf(path); if (!found)
throw BadURL("could not find a flake.nix file");
} }
if (!found)
throw BadURL("could not find a flake.nix file");
}
if (!S_ISDIR(lstat(path).st_mode)) if (!S_ISDIR(lstat(path).st_mode))
throw BadURL("path '%s' is not a flake (because it's not a directory)", path); throw BadURL("path '%s' is not a flake (because it's not a directory)", path);

14
tests/flake-searching.sh
View file

@ -4,8 +4,11 @@ clearStore
cp ./simple.nix ./simple.builder.sh ./config.nix $TEST_HOME cp ./simple.nix ./simple.builder.sh ./config.nix $TEST_HOME
cd $TEST_HOME cd $TEST_HOME
mkdir -p foo/subdir
echo '{ outputs = _: {}; }' > foo/flake.nix
cat <<EOF > flake.nix cat <<EOF > flake.nix
{ {
inputs.foo.url = "$PWD/foo";
outputs = a: { outputs = a: {
defaultPackage.$system = import ./simple.nix; defaultPackage.$system = import ./simple.nix;
packages.$system.test = import ./simple.nix; packages.$system.test = import ./simple.nix;
@ -13,12 +16,19 @@ cat <<EOF > flake.nix
} }
EOF EOF
mkdir subdir mkdir subdir
cd subdir pushd subdir
for i in "" . "$PWD" .# .#test; do for i in "" . .# .#test ../subdir ../subdir#test "$PWD"; do
nix build $i || fail "flake should be found by searching up directories" nix build $i || fail "flake should be found by searching up directories"
done done
for i in "path:$PWD"; do for i in "path:$PWD"; do
! nix build $i || fail "flake should not search up directories when using 'path:'" ! nix build $i || fail "flake should not search up directories when using 'path:'"
done done
popd
nix build --override-input foo . || fail "flake should search up directories when not an installable"
sed "s,$PWD/foo,$PWD/foo/subdir,g" -i flake.nix
! nix build || fail "flake should not search upwards when part of inputs"