multipath_tools: Rename to multipath-tools
See http://nixos.org/nixpkgs/manual/#sec-package-naming I've added an alias for multipath_tools to make sure that we don't break existing configurations referencing the old name. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
05fed13de3
commit
c92d7481a5
|
@ -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
|
||||
];
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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"/ {
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue