wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-02 13:31:48 +02:00
Code Activity

Remove parent hackery from the path fetcher

Browse source 
Relative paths of subflakes are now handled in lockFlake().
This commit is contained in:
Eelco Dolstra 2022-07-22 15:24:41 +02:00
parent 3d27ce36d0
commit f97489e7ab
3 changed files with 2 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -204,11 +204,8 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
std::string fragment;
std::swap(fragment, parsedURL.fragment);
auto input = Input::fromURL(parsedURL);
input.parent = baseDir;
return std::make_pair(
FlakeRef(std::move(input), getOr(parsedURL.query, "dir", "")),
FlakeRef(Input::fromURL(parsedURL), getOr(parsedURL.query, "dir", "")),
fragment);
}
}