summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorBjørn Forsman <bjorn.forsman@gmail.com>2015-02-20 21:43:09 +0100
committerBjørn Forsman <bjorn.forsman@gmail.com>2015-02-20 22:30:51 +0100
commit97875ac1757ceb10177b78b4479776fba64e47b2 (patch)
tree51bc6752e687365d8a1b10cf9a30299f054181f7 /nixos
parentd67ba6c5aba1157ec24154ed3a722aef43463843 (diff)
downloadnixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar
nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.gz
nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.bz2
nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.lz
nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.xz
nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.tar.zst
nixpkgs-97875ac1757ceb10177b78b4479776fba64e47b2.zip
bridge-utils: align attrname with pkgname
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/virtualisation/libvirtd.nix2
-rw-r--r--nixos/modules/virtualisation/nova.nix4
-rw-r--r--nixos/modules/virtualisation/xen-dom0.nix4
3 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix
index 2d03f0544b6..7410609e064 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 8795b5b52d5..21e060cf266 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 566059472c9..f3a24c5cf25 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 ];
 
   };