Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: c4237e2be1f2
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 8ea168db1f0e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Oct 20, 2020

  1. nixos/tests/avahi: Fix evaluation 

    In commit a61ca03 (#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
    @aszlig
    aszlig committed Oct 20, 2020
    Copy the full SHA
    8ea168d View commit details
    Browse the repository at this point in the history