diff options
-rw-r--r-- | tvix/build/default.nix | 4 | ||||
-rw-r--r-- | tvix/cli/default.nix | 2 | ||||
-rw-r--r-- | tvix/eval/default.nix | 4 | ||||
-rw-r--r-- | tvix/glue/default.nix | 4 | ||||
-rw-r--r-- | tvix/nar-bridge/default.nix | 2 | ||||
-rw-r--r-- | tvix/nix-compat/default.nix | 4 | ||||
-rw-r--r-- | tvix/store/default.nix | 2 | ||||
-rw-r--r-- | tvix/tracing/default.nix | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/tvix/build/default.nix b/tvix/build/default.nix index aafab92fd525..17b52354bbeb 100644 --- a/tvix/build/default.nix +++ b/tvix/build/default.nix @@ -4,8 +4,8 @@ runTests = true; }).overrideAttrs (old: rec { meta.ci.targets = lib.filter (x: lib.hasPrefix "with-features" x || x == "no-features") (lib.attrNames passthru); - passthru = depot.tvix.utils.mkFeaturePowerset { + passthru = old.passthru // (depot.tvix.utils.mkFeaturePowerset { inherit (old) crateName; features = [ "tonic-reflection" ]; - }; + }); }) diff --git a/tvix/cli/default.nix b/tvix/cli/default.nix index 90394f6d28c7..64dca0ab4bec 100644 --- a/tvix/cli/default.nix +++ b/tvix/cli/default.nix @@ -94,5 +94,5 @@ in }; # Expose benchmarks and evalTests as standard CI targets. - passthru = benchmarks // evalTests; + passthru = previousAttrs.passthru // benchmarks // evalTests; }) diff --git a/tvix/eval/default.nix b/tvix/eval/default.nix index 9dd5875f85a5..9370c81ced1c 100644 --- a/tvix/eval/default.nix +++ b/tvix/eval/default.nix @@ -8,9 +8,9 @@ testInputs = [ pkgs.nix ]; }).overrideAttrs (old: rec { meta.ci.targets = lib.filter (x: lib.hasPrefix "with-features" x || x == "no-features") (lib.attrNames passthru); - passthru = depot.tvix.utils.mkFeaturePowerset { + passthru = old.passthru // (depot.tvix.utils.mkFeaturePowerset { inherit (old) crateName; features = [ "nix_tests" ]; override.testInputs = [ pkgs.nix ]; - }; + }); }) diff --git a/tvix/glue/default.nix b/tvix/glue/default.nix index e2b36e94b87f..0ead94a504c3 100644 --- a/tvix/glue/default.nix +++ b/tvix/glue/default.nix @@ -7,11 +7,11 @@ ''; }).overrideAttrs (old: rec { meta.ci.targets = lib.filter (x: lib.hasPrefix "with-features" x || x == "no-features") (lib.attrNames passthru); - passthru = depot.tvix.utils.mkFeaturePowerset { + passthru = old.passthru // (depot.tvix.utils.mkFeaturePowerset { inherit (old) crateName; features = [ "nix_tests" ]; override.testPreRun = '' export SSL_CERT_FILE=/dev/null ''; - }; + }); }) diff --git a/tvix/nar-bridge/default.nix b/tvix/nar-bridge/default.nix index 3e116a1fc02b..2f1384e8211f 100644 --- a/tvix/nar-bridge/default.nix +++ b/tvix/nar-bridge/default.nix @@ -4,7 +4,7 @@ runTests = true; }).overrideAttrs (old: rec { meta.ci.targets = lib.filter (x: lib.hasPrefix "with-features" x || x == "no-features") (lib.attrNames passthru); - passthru = (depot.tvix.utils.mkFeaturePowerset { + passthru = old.passthru // (depot.tvix.utils.mkFeaturePowerset { inherit (old) crateName; features = [ "otlp" ]; }); diff --git a/tvix/nix-compat/default.nix b/tvix/nix-compat/default.nix index 08b053b77dd1..34938e3d6428 100644 --- a/tvix/nix-compat/default.nix +++ b/tvix/nix-compat/default.nix @@ -4,8 +4,8 @@ runTests = true; }).overrideAttrs (old: rec { meta.ci.targets = lib.filter (x: lib.hasPrefix "with-features" x || x == "no-features") (lib.attrNames passthru); - passthru = depot.tvix.utils.mkFeaturePowerset { + passthru = old.passthru // (depot.tvix.utils.mkFeaturePowerset { inherit (old) crateName; features = [ "async" "wire" ]; - }; + }); }) diff --git a/tvix/store/default.nix b/tvix/store/default.nix index b8541d072224..863ddb6de23f 100644 --- a/tvix/store/default.nix +++ b/tvix/store/default.nix @@ -35,7 +35,7 @@ in targets = [ "integration-tests" ] ++ lib.filter (x: lib.hasPrefix "with-features" x || x == "no-features") (lib.attrNames passthru); extraSteps.import-docs = (mkImportCheck "tvix/docs/src/store" ../docs/src/store); }; - passthru = (depot.tvix.utils.mkFeaturePowerset { + passthru = old.passthru // (depot.tvix.utils.mkFeaturePowerset { inherit (old) crateName; features = ([ "cloud" "fuse" "otlp" "tonic-reflection" "xp-store-composition" ] # virtiofs feature currently fails to build on Darwin diff --git a/tvix/tracing/default.nix b/tvix/tracing/default.nix index ef1985cb47fb..b519d0ffc0b3 100644 --- a/tvix/tracing/default.nix +++ b/tvix/tracing/default.nix @@ -4,8 +4,8 @@ runTests = true; }).overrideAttrs (old: rec { meta.ci.targets = lib.filter (x: lib.hasPrefix "with-features" x || x == "no-features") (lib.attrNames passthru); - passthru = depot.tvix.utils.mkFeaturePowerset { + passthru = old.passthru // (depot.tvix.utils.mkFeaturePowerset { inherit (old) crateName; features = [ "otlp" "tracy" "tonic" "reqwest" "axum" ]; - }; + }); }) |