diff options
| -rw-r--r-- | nixos/modules/virtualisation/nova.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/virtualization/xen/generic.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/python-modules/blivet/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix index f356445abe46..c2837d0e2e24 100644 --- a/nixos/modules/virtualisation/nova.nix +++ b/nixos/modules/virtualisation/nova.nix @@ -146,7 +146,7 @@ in path = [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm - pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute + pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute pkgs.bridge-utils ]; diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix index 71c26c5f99c9..6774675266c4 100644 --- a/pkgs/applications/virtualization/xen/generic.nix +++ b/pkgs/applications/virtualization/xen/generic.nix @@ -5,7 +5,7 @@ , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice , spice_protocol, usbredir, alsaLib, quilt -, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools +, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools , inetutils, iptables, openvswitch, nbd, drbd, xenConfig , xenserverPatched ? false, ... }: @@ -51,7 +51,7 @@ let ]; scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin") - [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools + [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools iproute inetutils iptables bridge-utils openvswitch nbd drbd ])); in diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix index 240fe6388348..a55e1993ac37 100644 --- a/pkgs/development/python-modules/blivet/default.nix +++ b/pkgs/development/python-modules/blivet/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock -, pyudev, six, libselinux, cryptsetup, multipath_tools, lsof, utillinux +, pyudev, six, libselinux, cryptsetup, multipath-tools, lsof, utillinux }: let @@ -19,7 +19,7 @@ in buildPythonPackage rec { postPatch = '' sed -i \ - -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \ + -e 's|"multipath"|"${multipath-tools}/sbin/multipath"|' \ -e '/^def set_friendly_names/a \ return False' \ blivet/devicelibs/mpath.py sed -i -e '/"wipefs"/ { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f98465f45f4f..1c283e4acb10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10384,7 +10384,7 @@ let inherit modules; }; - multipath_tools = callPackage ../os-specific/linux/multipath-tools { }; + multipath-tools = callPackage ../os-specific/linux/multipath-tools { }; musl = callPackage ../os-specific/linux/musl { }; @@ -15880,6 +15880,7 @@ aliases = with self; rec { lttngUst = lttng-ust; # added 2014-07-31 midoriWrapper = midori; # added 2015-01 mlt-qt5 = qt5.mlt; # added 2015-12-19 + multipath_tools = multipath-tools; # added 2016-01-21 nfsUtils = nfs-utils; # added 2014-12-06 phonon_qt5 = qt5.phonon; # added 2015-12-19 phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer; # added 2015-12-19 |