From 39ef171e001bae6ba14b6aa9b6df2f36139a44ee Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 16 Aug 2024 01:06:25 +0200 Subject: chore(tvix): Retain original passthru in Rust builds When using the runTests feature of crate2nix the derivation that runs the tests is put into passthru.test but all default.nix files for Rust crates in Tvix threw that away. This commit retains passthru so that you can get access to the test derivation. Change-Id: I8b7b7db57a49069348f08c12c00a3b1a41a0c05b Reviewed-on: https://cl.tvl.fyi/c/depot/+/12215 Reviewed-by: flokli Tested-by: BuildkiteCI --- tvix/glue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tvix/glue/default.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 ''; - }; + }); }) -- cgit 1.4.1