utillinux: rename to util-linux

This commit is contained in:
Graham Christensen
2020-11-24 10:29:28 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions

View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
, pyudev, six, libselinux, multipath-tools, lsof, utillinux
, pyudev, six, libselinux, multipath-tools, lsof, util-linux
}:
buildPythonPackage rec {
@@ -19,11 +19,11 @@ buildPythonPackage rec {
-e '/^def set_friendly_names/a \ return False' \
blivet/devicelibs/mpath.py
sed -i -e '/"wipefs"/ {
s|wipefs|${utillinux}/sbin/wipefs|
s|wipefs|${util-linux}/sbin/wipefs|
s/-f/--force/
}' blivet/formats/__init__.py
sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py
sed -i -r -e 's|"(u?mount)"|"${utillinux}/bin/\1"|' blivet/util.py
sed -i -r -e 's|"(u?mount)"|"${util-linux}/bin/\1"|' blivet/util.py
'';
propagatedBuildInputs = [