diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2023-08-01 16:07:20 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2023-08-01 16:07:20 +0200 |
| commit | d9e7758f4756c10592407b3fe99dc253ef56eac9 (patch) | |
| tree | 960315c30ed9cbc7dd182c391aba64f212dba183 /src/libexpr/flake/flakeref.cc | |
| parent | dcdd5fed74445c526a361202a9e6c8459a38726b (diff) | |
Don't require .tar/.zip extension for tarball flakerefs
Special-casing the file name is rather ugly, so we shouldn't do
that. So now any {file,http,https} URL is handled by
TarballInputScheme, except for non-flake inputs (i.e. inputs that have
the attribute `flake = false`).
Diffstat (limited to 'src/libexpr/flake/flakeref.cc')
| -rw-r--r-- | src/libexpr/flake/flakeref.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc index 08adbe0c9..d3fa1d557 100644 --- a/src/libexpr/flake/flakeref.cc +++ b/src/libexpr/flake/flakeref.cc @@ -105,7 +105,7 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment( }; return std::make_pair( - FlakeRef(Input::fromURL(parsedURL), ""), + FlakeRef(Input::fromURL(parsedURL, isFlake), ""), percentDecode(match.str(6))); } @@ -176,7 +176,7 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment( parsedURL.query.insert_or_assign("shallow", "1"); return std::make_pair( - FlakeRef(Input::fromURL(parsedURL), getOr(parsedURL.query, "dir", "")), + FlakeRef(Input::fromURL(parsedURL, isFlake), getOr(parsedURL.query, "dir", "")), fragment); } @@ -204,7 +204,7 @@ std::pair<FlakeRef, std::string> parseFlakeRefWithFragment( std::string fragment; std::swap(fragment, parsedURL.fragment); - auto input = Input::fromURL(parsedURL); + auto input = Input::fromURL(parsedURL, isFlake); input.parent = baseDir; return std::make_pair( |