summary refs log tree commit diff
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2021-04-13 11:07:39 +0200
committersterni <sternenseemann@systemli.org>2021-04-13 16:13:11 +0200
commit17efdfbbcafad4d63fb692ac7629064669054df6 (patch)
treec74115577f4d65cacf72d43aff894baf5d69c6bd
parent42e029e48f00943d103ca662572fd38ad6e1c4c3 (diff)
downloadnixpkgs-17efdfbbcafad4d63fb692ac7629064669054df6.tar
nixpkgs-17efdfbbcafad4d63fb692ac7629064669054df6.tar.gz
nixpkgs-17efdfbbcafad4d63fb692ac7629064669054df6.tar.bz2
nixpkgs-17efdfbbcafad4d63fb692ac7629064669054df6.tar.lz
nixpkgs-17efdfbbcafad4d63fb692ac7629064669054df6.tar.xz
nixpkgs-17efdfbbcafad4d63fb692ac7629064669054df6.tar.zst
nixpkgs-17efdfbbcafad4d63fb692ac7629064669054df6.zip
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.<attr>` and
`nix-build nixos/tests/kernel-generic.nix -A <attr>` work as expected.
-rw-r--r--nixos/tests/kernel-generic.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/tests/kernel-generic.nix b/nixos/tests/kernel-generic.nix
index fbead1dc23b..17089141e9e 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;