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: 6622ba5b25ce
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: cfd599e1177f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Aug 18, 2020

  1. nixos/test-instrumentation: properly import options for qemu-check 

    If `qemu-vm.nix` is imported, the option `virtualisation.qemu.consoles`
should be set to make sure that the machine's output isn't rendered on
the graphical window of QEMU.

This is needed when interactively running a NixOS test or in conjunction
with `nixos-build-vms(8)`.

The patch 2578557 tries to only do this
if the option actually exists, however this condition used to be always
false since `options` wasn't imported in the module and pointed to
`lib.options` due to the `with lib;`-clause.
    @Ma27
    Ma27 committed Aug 18, 2020
    Copy the full SHA
    2fbddb0 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #95743 from Ma27/qemu-test-out 

    nixos/test-instrumentation: properly import `options` for `qemu`-check
    @infinisil
    infinisil committed Aug 18, 2020
    Copy the full SHA
    cfd599e View commit details
    Browse the repository at this point in the history