wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-29 06:21:14 +02:00
Code Activity

Merge pull request #12280 from DeterminateSystems/fix-2.25-build

Browse source 
Don't absolutize 'git+file:' in parseURLFlakeRef()
This commit is contained in:
Eelco Dolstra 2025-01-17 13:45:37 +01:00 • committed by GitHub
commit daf101d487
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libflake/flake/flakeref.cc
View file

@ -233,7 +233,7 @@ std::optional<std::pair<FlakeRef, std::string>> parseURLFlakeRef(
try { try {
auto parsed = parseURL(url); auto parsed = parseURL(url);
if (baseDir if (baseDir
&& (parsed.scheme == "path" || parsed.scheme == "git+file") && parsed.scheme == "path"
&& !isAbsolute(parsed.path)) && !isAbsolute(parsed.path))
parsed.path = absPath(parsed.path, *baseDir); parsed.path = absPath(parsed.path, *baseDir);
return fromParsedURL(fetchSettings, std::move(parsed), isFlake); return fromParsedURL(fetchSettings, std::move(parsed), isFlake);

1
tests/functional/flakes/flakes.sh
View file

@ -224,7 +224,6 @@ nix build -o "$TEST_ROOT/result" "$flake1Dir"
nix build -o "$TEST_ROOT/result" "git+file://$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" ".")
(cd "$flake1Dir" && nix build -o "$TEST_ROOT/result" "path:.") (cd "$flake1Dir" && nix build -o "$TEST_ROOT/result" "path:.")
(cd "$flake1Dir" && nix build -o "$TEST_ROOT/result" "git+file:.")
# Test explicit packages.default. # Test explicit packages.default.
nix build -o "$TEST_ROOT/result" "$flake1Dir#default" nix build -o "$TEST_ROOT/result" "$flake1Dir#default"