From 8ea168db1f0e0f04a613b9f46e5087f8d15654f0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 20 Oct 2020 17:33:45 +0200 Subject: nixos/tests/avahi: Fix evaluation In commit a61ca0373b63225e3aa00556c8fc1fb36abcbe3e (#100267), the avahi test expression got an additional attribute, but instead of wrapping the function, the attributes were introduced by nesting the function one level deeper. To illustrate this: Before: attrs: After: newattrs: attrs: So when instantiating tests.avahi.x86_64-linux from nixos/release.nix we get "value is a function while a set was expected" instead of the derivation. I simply re-passed the attributes to make-test-python.nix, since the function already allows (via "...") arbitrary attributes to be passed. The reason why I'm pushing this directly to master is because evaluation for the test is already broken and the worst that could happen here is that things are *still* broken. Signed-off-by: aszlig Cc: @flokli, @doronbehar --- nixos/tests/avahi.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'nixos') diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix index 66cff3009f7d..c1a9114a40f6 100644 --- a/nixos/tests/avahi.nix +++ b/nixos/tests/avahi.nix @@ -2,10 +2,11 @@ , config ? {} , pkgs ? import ../.. { inherit system config; } # bool: whether to use networkd in the tests -, networkd ? false }: +, networkd ? false +} @ args: # Test whether `avahi-daemon' and `libnss-mdns' work as expected. -import ./make-test-python.nix ({ ... } : { +import ./make-test-python.nix { name = "avahi"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco ]; @@ -75,4 +76,4 @@ import ./make-test-python.nix ({ ... } : { two.succeed("avahi-browse -r -t _ssh._tcp | tee out >&2") two.succeed("test `wc -l < out` -gt 0") ''; -}) +} args -- cgit v1.2.3