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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 30ea02a6ad87
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5f01d21fbbc4
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 12, 2020

  1. libvirtd: fix path to ebtables 

    With the bump of iptables (#75026) ebtables was renamed from `ebtables`
to `ebtables-legacy`. libvirtd requires this binary to be availabe to
configure the host networking.

fixes #75878
    @andir
    andir committed Jan 12, 2020
    Copy the full SHA
    22388a5 View commit details

Commits on Jan 13, 2020

  1. Merge pull request #77582 from andir/fix-libvirtd 

    libvirtd: fix path to ebtables
    @fpletz
    fpletz authored Jan 13, 2020
    Copy the full SHA
    5f01d21 View commit details
Showing with 1 addition and 0 deletions.
  1. +1 −0 pkgs/development/libraries/libvirt/default.nix
1 change: 1 addition & 0 deletions pkgs/development/libraries/libvirt/default.nix
View file
Original file line number Diff line number Diff line change
@@ -102,6 +102,7 @@ in stdenv.mkDerivation rec {
] ++ optionals stdenv.isLinux [
"QEMU_BRIDGE_HELPER=/run/wrappers/bin/qemu-bridge-helper"
"QEMU_PR_HELPER=/run/libvirt/nix-helpers/qemu-pr-helper"
"EBTABLES_PATH=${ebtables}/bin/ebtables-legacy"
"--with-attr"
"--with-apparmor"
"--with-secdriver-apparmor"