From 8181817e53f4c0da5d7dfa1a56e296fefd929bcb Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 22 Apr 2024 20:05:49 +0300 Subject: feat(tvix/glue/fetchers): support file:// URLs Nix supports file:// - URLs for `fetchurl` and `fetchTarball`. Convert the enums and function arguments to hold a URL type. reqwest::Url is a re-export of the url crate, but they don't re-export the parsing errors, and as we want to hold these in our Error types, add it to Cargo.toml explicitly. The Fetcher::download function now checks on the scheme, and either opens the file locally, or does do a HTTP request as before. Fetch gets its custom debug impl, removing potentially sensitive username and password out of URLs. Change-Id: I777db1fe487370e822cbfec4624034aca5e08045 Reviewed-on: https://cl.tvl.fyi/c/depot/+/11504 Autosubmit: flokli Reviewed-by: raitobezarius Tested-by: BuildkiteCI --- tvix/Cargo.nix | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tvix/Cargo.nix') diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index 25e5dccfd7cf..51d47b05e34f 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -14174,6 +14174,10 @@ rec { packageId = "tvix-store"; usesDefaultFeatures = false; } + { + name = "url"; + packageId = "url"; + } { name = "walkdir"; packageId = "walkdir"; -- cgit 1.4.1