Don't absolutize 'git+file:' in parseURLFlakeRef()

#12273 (comment)
NixOS · Jan 16, 2025 · 938f0f4 · 938f0f4
1 parent 40bb5ec
commit 938f0f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/libflake/flake/flakeref.cc b/src/libflake/flake/flakeref.cc
@@ -233,7 +233,7 @@ std::optional<std::pair<FlakeRef, std::string>> parseURLFlakeRef(
     try {
         auto parsed = parseURL(url);
         if (baseDir
-            && (parsed.scheme == "path" || parsed.scheme == "git+file")
+            && parsed.scheme == "path"
             && !isAbsolute(parsed.path))
             parsed.path = absPath(parsed.path, *baseDir);
         return fromParsedURL(fetchSettings, std::move(parsed), isFlake);

diff --git a/tests/functional/flakes/flakes.sh b/tests/functional/flakes/flakes.sh
@@ -224,7 +224,6 @@ nix build -o "$TEST_ROOT/result" "$flake1Dir"
 nix build -o "$TEST_ROOT/result" "git+file://$flake1Dir"
 (cd "$flake1Dir" && nix build -o "$TEST_ROOT/result" ".")
 (cd "$flake1Dir" && nix build -o "$TEST_ROOT/result" "path:.")
-(cd "$flake1Dir" && nix build -o "$TEST_ROOT/result" "git+file:.")
 
 # Test explicit packages.default.
 nix build -o "$TEST_ROOT/result" "$flake1Dir#default"