In Nix < 2.20 compat mode, keep the 'dir' attr in URLs

edolstra · edolstra · commit 9d45626ef2b1 · 2025-11-26T14:40:48.000+01:00
diff --git a/src/libflake/flakeref.cc b/src/libflake/flakeref.cc
@@ -61,7 +61,8 @@ static std::pair<FlakeRef, std::string>
 fromParsedURL(const fetchers::Settings & fetchSettings, ParsedURL && parsedURL, bool isFlake)
 {
     auto dir = getOr(parsedURL.query, "dir", "");
-    parsedURL.query.erase("dir");
+    if (!fetchSettings.nix219Compat)
+        parsedURL.query.erase("dir");
 
     std::string fragment;
     std::swap(fragment, parsedURL.fragment);

Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,8 @@ static std::pair<FlakeRef, std::string>`
`61`	`61`	`fromParsedURL(const fetchers::Settings & fetchSettings, ParsedURL && parsedURL, bool isFlake)`
`62`	`62`	`{`
`63`	`63`	`auto dir = getOr(parsedURL.query, "dir", "");`
`64`		`- parsedURL.query.erase("dir");`
	`64`	`+ if (!fetchSettings.nix219Compat)`
	`65`	`+ parsedURL.query.erase("dir");`
`65`	`66`
`66`	`67`	`std::string fragment;`
`67`	`68`	`std::swap(fragment, parsedURL.fragment);`