1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-11 23:24:35 +00:00
nixpkgs/nixos
aszlig 8ea168db1f
nixos/tests/avahi: Fix evaluation
In commit a61ca0373b (#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
2020-10-20 17:38:20 +02:00
..
doc nixos/doc: fix itemization in the 20.09 release notes 2020-10-19 07:11:48 -03:00
lib nixos/{containers,cri-o,podman}: move copyFile to nixos/lib/utils 2020-09-24 10:01:47 +10:00
maintainers Merge pull request #89116 from wagdav/fix-args-create-amis 2020-08-22 16:47:54 +02:00
modules nixos/vagrant-virtualbox-image: init (#101120) 2020-10-20 11:09:46 +02:00
tests nixos/tests/avahi: Fix evaluation 2020-10-20 17:38:20 +02:00
COPYING
default.nix
README
release-combined.nix nixosTests: Disable networking.networkd.macvlan 2020-08-30 17:43:34 -07:00
release-small.nix
release.nix

*** NixOS ***

NixOS is a Linux distribution based on the purely functional package
management system Nix.  More information can be found at
https://nixos.org/nixos and in the manual in doc/manual.