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

flakes: search up to git or filesystem boundary

Browse source 
While parsing a flakeref, upon not finding a flake.nix, search upwards
until git or filesystem boundary.
This commit is contained in:
Tom Bereknyei 2021-12-03 10:53:41 -05:00
parent 2e606e87c4
commit b6cc0a704d
4 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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