From bc5b10227cc682dc813a9b2369f075ddcce90aa4 Mon Sep 17 00:00:00 2001 From: default <216188+jdx@users.noreply.github.com> Date: Thu, 30 Jul 2026 15:53:44 +0000 Subject: [PATCH 1/2] fix(aqua): preserve locked HTTP override metadata --- src/backend/aqua.rs | 58 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/src/backend/aqua.rs b/src/backend/aqua.rs index 18dbbe28eaa..d10992f3e20 100644 --- a/src/backend/aqua.rs +++ b/src/backend/aqua.rs @@ -451,11 +451,10 @@ impl Backend for AquaBackend { let mut v = tag.clone().unwrap_or_else(|| tv.version.clone()); let mut v_prefixed = (tag.is_none() && !tv.version.starts_with('v')).then(|| format!("v{v}")); - let versions = match &v_prefixed { - Some(v_prefixed) => vec![v.as_str(), v_prefixed.as_str()], - None => vec![v.as_str()], - }; - let pkg = self.package_with_options(&tv, &versions).await?; + let pkg = AQUA_REGISTRY.package(&self.id).await?; + let versions = install_package_version_candidates(&tv.version, tag.as_deref(), &pkg); + let versions = versions.iter().map(|v| v.as_ref()).collect_vec(); + let pkg = Self::package_with_options_for_pkg(&tv, pkg, &versions)?; if let Some(prefix) = &pkg.version_prefix && !v.starts_with(prefix) { @@ -989,15 +988,6 @@ impl Backend for AquaBackend { } impl AquaBackend { - async fn package_with_options( - &self, - tv: &ToolVersion, - versions: &[&str], - ) -> Result { - let pkg = AQUA_REGISTRY.package(&self.id).await?; - Self::package_with_options_for_pkg(tv, pkg, versions) - } - fn package_with_options_for_pkg( tv: &ToolVersion, pkg: AquaPackage, @@ -3289,6 +3279,21 @@ fn package_version_candidates<'a>(version: &'a str, pkg: &AquaPackage) -> Vec( + version: &'a str, + tag: Option<&'a str>, + pkg: &AquaPackage, +) -> Vec> { + if let Some(tag) = tag { + vec![Cow::Borrowed(tag)] + } else { + // Locked HTTP package URLs do not contain a GitHub release tag. Include the + // registry's prefixes so prefix-scoped overrides still provide metadata such + // as the archive format. + package_version_candidates(version, pkg) + } +} + fn github_release_tag_from_url(url: &str) -> Option { let url = Url::parse(url).ok()?; if url.host_str()? != "github.com" { @@ -3682,6 +3687,31 @@ packages: assert_eq!(pkg.files[0].name, "lychee"); } + #[test] + fn test_package_version_candidates_apply_inherited_prefix_format_override() { + let registry = ParsedRegistry::parse_yaml( + r#" +packages: + - type: http + repo_owner: haskell + repo_name: cabal + version_prefix: cabal-install-v + version_constraint: "false" + version_overrides: + - version_constraint: "true" + format: tar.xz +"#, + ) + .unwrap(); + let pkg = registry.package("haskell/cabal").unwrap(); + let versions = install_package_version_candidates("3.16.1.0", None, &pkg); + let versions = versions.iter().map(|v| v.as_ref()).collect_vec(); + let pkg = pkg.with_version(&versions, "linux", "amd64"); + + assert_eq!(pkg.version_prefix.as_deref(), Some("cabal-install-v")); + assert_eq!(pkg.format, "tar.xz"); + } + #[test] fn test_candidate_bin_paths_use_v_prefixed_package_override() { let registry = ParsedRegistry::parse_yaml( From 4708fe78a99fa461bf6e3b44e4a59ea7043e40fc Mon Sep 17 00:00:00 2001 From: default <216188+jdx@users.noreply.github.com> Date: Thu, 30 Jul 2026 16:14:13 +0000 Subject: [PATCH 2/2] test(aqua): cover locked HTTP install options --- src/backend/aqua.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/backend/aqua.rs b/src/backend/aqua.rs index d10992f3e20..85e72cc6816 100644 --- a/src/backend/aqua.rs +++ b/src/backend/aqua.rs @@ -3704,9 +3704,16 @@ packages: ) .unwrap(); let pkg = registry.package("haskell/cabal").unwrap(); + let backend = Arc::new(BackendArg::new( + "cabal".to_string(), + Some("aqua:haskell/cabal/cabal-install".to_string()), + )); + let request = + ToolRequest::new(backend, "3.16.1.0", crate::toolset::ToolSource::Unknown).unwrap(); + let tv = ToolVersion::new(request, "3.16.1.0".to_string()); let versions = install_package_version_candidates("3.16.1.0", None, &pkg); let versions = versions.iter().map(|v| v.as_ref()).collect_vec(); - let pkg = pkg.with_version(&versions, "linux", "amd64"); + let pkg = AquaBackend::package_with_options_for_pkg(&tv, pkg, &versions).unwrap(); assert_eq!(pkg.version_prefix.as_deref(), Some("cabal-install-v")); assert_eq!(pkg.format, "tar.xz");