nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-08 19:46:02 +01:00
Code Activity

refactor(libstore): withCurlS3 -> withAWS

Browse source 
Now that the legacy S3 implementation is gone, we can go back to calling
things `NIX_WITH_S3_SUPPORT`.
This commit is contained in:
Bernardo Meurer Costa 2025-10-14 23:58:48 +00:00
parent 9295c14a35
commit 1f710300c9
No known key found for this signature in database
19 changed files with 42 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ci/gha/tests/default.nix
View file

@ -12,7 +12,7 @@
componentTestsPrefix ? "",
withSanitizers ? false,
withCoverage ? false,
withCurlS3 ? null,
withAWS ? null,
...
}:
@ -58,9 +58,7 @@ rec {
nix-expr = prev.nix-expr.override { enableGC = !withSanitizers; };
# Override AWS configuration if specified
nix-store = prev.nix-store.override (
lib.optionalAttrs (withCurlS3 != null) { inherit withCurlS3; }
);
nix-store = prev.nix-store.override (lib.optionalAttrs (withAWS != null) { inherit withAWS; });
mesonComponentOverrides = lib.composeManyExtensions componentOverrides;
# Unclear how to make Perl bindings work with a dynamically linked ASAN.
@ -229,7 +227,7 @@ rec {
vmTests = {
}
// lib.optionalAttrs (withCurlS3 == true) {
// lib.optionalAttrs (withAWS == true) {
# S3 binary cache store test using curl implementation
inherit (nixosTests) curl-s3-binary-cache-store;
}