From bc0997489b0dba52d0c23bf7f9ea6ceb74c7f666 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 18 Jun 2021 14:16:27 +0200 Subject: [PATCH] nixos/test-driver: Fix passing passthru attribute Apparently this looks like it was forgotten when doing commit 3884ff70badca0c93c717e6190946a9a2846e948, which refactored the test runner and driver a bit. The passthru argument actually was correctly reintroduced in setupDriverForTest, but the actual makeTest function didn't use it. This fixes the nixpkgs tarball job, which previously failed with: attribute 'elkPackages' missing, at /build/source/pkgs/tools/misc/logstash/6.x.nix:58:30 Signed-off-by: aszlig Acked-by: David Arnold Fixes: https://github.com/NixOS/nixpkgs/issues/127274 Merges: https://github.com/NixOS/nixpkgs/pull/127346 --- nixos/lib/testing-python.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index f5780123d6b0..dbff6b98f0d6 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -217,13 +217,13 @@ rec { ); driver = setupDriverForTest { - inherit testScript enableOCR skipLint; + inherit testScript enableOCR skipLint passthru; testName = name; qemu_pkg = pkgs.qemu_test; nodes = nodes pkgs.qemu_test; }; driverInteractive = setupDriverForTest { - inherit testScript enableOCR skipLint; + inherit testScript enableOCR skipLint passthru; testName = name; qemu_pkg = pkgs.qemu; nodes = nodes pkgs.qemu;