summary refs log tree commit diff
path: root/nixos/tests/avahi.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@nix.build>2020-10-20 17:33:45 +0200
committeraszlig <aszlig@nix.build>2020-10-20 17:38:20 +0200
commit8ea168db1f0e0f04a613b9f46e5087f8d15654f0 (patch)
tree487f0d6bdb8d7bf4a148f3ba0886028b4218b47c /nixos/tests/avahi.nix
parentc4237e2be1f24ee12721f8e1549fced17bbbd567 (diff)
downloadnixpkgs-8ea168db1f0e0f04a613b9f46e5087f8d15654f0.tar
nixpkgs-8ea168db1f0e0f04a613b9f46e5087f8d15654f0.tar.gz
nixpkgs-8ea168db1f0e0f04a613b9f46e5087f8d15654f0.tar.bz2
nixpkgs-8ea168db1f0e0f04a613b9f46e5087f8d15654f0.tar.lz
nixpkgs-8ea168db1f0e0f04a613b9f46e5087f8d15654f0.tar.xz
nixpkgs-8ea168db1f0e0f04a613b9f46e5087f8d15654f0.tar.zst
nixpkgs-8ea168db1f0e0f04a613b9f46e5087f8d15654f0.zip
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: <testdrv>
  After:  newattrs: attrs: <testdrv>

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 <aszlig@nix.build>
Cc: @flokli, @doronbehar
Diffstat (limited to 'nixos/tests/avahi.nix')
-rw-r--r--nixos/tests/avahi.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 66cff3009f7..c1a9114a40f 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