From 17efdfbbcafad4d63fb692ac7629064669054df6 Mon Sep 17 00:00:00 2001 From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> Date: Tue, 13 Apr 2021 11:07:39 +0200 Subject: [PATCH] nixos/tests/kernel-generic: make attributes derivations, not functions Pass the args from kernel-generic.nix's top-level to the individual tests. Makes `nix-build -A nixosTests.kernel-generic.` and `nix-build nixos/tests/kernel-generic.nix -A ` work as expected. --- nixos/tests/kernel-generic.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix index fbead1dc23b7..17089141e9e4 100644 --- a/nixos/tests/kernel-generic.nix +++ b/nixos/tests/kernel-generic.nix @@ -1,7 +1,7 @@ { system ? builtins.currentSystem , config ? { } , pkgs ? import ../.. { inherit system config; } -}: +}@args: with pkgs.lib; @@ -22,7 +22,7 @@ let assert "Linux" in machine.succeed("uname -s") assert "${linuxPackages.kernel.modDirVersion}" in machine.succeed("uname -a") ''; - })); + }) args); in with pkgs; { linux_4_4 = makeKernelTest "4.4" linuxPackages_4_4;