Merge "Revert "libfetchers: make attribute / URL query handling consistent"" into main

2024-06-25 10:19:52 +00:00
parent d5637ee790 3e151d4d77
commit c097ebe66b
10 changed files with 96 additions and 235 deletions
@@ -204,13 +204,7 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment(
        std::string fragment;
        std::swap(fragment, parsedURL.fragment);

-        // This has a special meaning for flakes and must not be passed to libfetchers.
-        // Of course this means that libfetchers cannot have fetchers
-        // expecting an argument `dir` 🫠
-        ParsedURL urlForFetchers(parsedURL);
-        urlForFetchers.query.erase("dir");
-
-        auto input = Input::fromURL(urlForFetchers, isFlake);
+        auto input = Input::fromURL(parsedURL, isFlake);
        input.parent = baseDir;

        return std::make_pair(