From 97875ac1757ceb10177b78b4479776fba64e47b2 Mon Sep 17 00:00:00 2001 From: Bjørn Forsman Date: Fri, 20 Feb 2015 21:43:09 +0100 Subject: bridge-utils: align attrname with pkgname --- nixos/modules/virtualisation/libvirtd.nix | 2 +- nixos/modules/virtualisation/nova.nix | 4 ++-- nixos/modules/virtualisation/xen-dom0.nix | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'nixos/modules/virtualisation') diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 2d03f0544b67..7410609e0642 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -92,7 +92,7 @@ in ++ optional vswitch.enable "vswitchd.service"; path = [ - pkgs.bridge_utils + pkgs.bridge-utils pkgs.dmidecode pkgs.dnsmasq pkgs.ebtables diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix index 8795b5b52d5a..21e060cf2663 100644 --- a/nixos/modules/virtualisation/nova.nix +++ b/nixos/modules/virtualisation/nova.nix @@ -147,7 +147,7 @@ in path = [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute - pkgs.bridge_utils + pkgs.bridge-utils ]; exec = "${nova}/bin/nova-compute --flagfile=${novaConf}"; @@ -163,7 +163,7 @@ in path = [ pkgs.sudo pkgs.vlan pkgs.dnsmasq pkgs.nettools pkgs.iptables - pkgs.iproute pkgs.bridge_utils pkgs.radvd + pkgs.iproute pkgs.bridge-utils pkgs.radvd ]; exec = "${nova}/bin/nova-network --flagfile=${novaConf}"; diff --git a/nixos/modules/virtualisation/xen-dom0.nix b/nixos/modules/virtualisation/xen-dom0.nix index 566059472c9f..f3a24c5cf25b 100644 --- a/nixos/modules/virtualisation/xen-dom0.nix +++ b/nixos/modules/virtualisation/xen-dom0.nix @@ -112,7 +112,7 @@ in startOn = "stopped udevtrigger"; path = - [ pkgs.bridge_utils pkgs.gawk pkgs.iproute pkgs.nettools + [ pkgs.bridge-utils pkgs.gawk pkgs.iproute pkgs.nettools pkgs.utillinux pkgs.bash xen pkgs.pciutils pkgs.procps ]; @@ -172,7 +172,7 @@ in # Xen provides udev rules. services.udev.packages = [ xen ]; - services.udev.path = [ pkgs.bridge_utils pkgs.iproute ]; + services.udev.path = [ pkgs.bridge-utils pkgs.iproute ]; }; -- cgit 1.4.1