utillinux: rename to util-linux

This commit is contained in:
Graham Christensen
2020-11-24 12:42:06 -05:00
parent 79086e5d55
commit bc49a0815a
265 changed files with 574 additions and 571 deletions
+2 -2
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, coreutils, bash, btrfs-progs, openssh, perl, perlPackages
, utillinux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
, util-linux, asciidoc, asciidoctor, mbuffer, makeWrapper }:
stdenv.mkDerivation rec {
pname = "btrbk";
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
# Fix SSH filter script
sed -i '/^export PATH/d' ssh_filter_btrbk.sh
substituteInPlace ssh_filter_btrbk.sh --replace logger ${utillinux}/bin/logger
substituteInPlace ssh_filter_btrbk.sh --replace logger ${util-linux}/bin/logger
'';
preFixup = ''
+2 -2
View File
@@ -7,7 +7,7 @@
, gnupg
, gnutar
, par2cmdline
, utillinux
, util-linux
, rsync
, backblaze-b2
, makeWrapper
@@ -72,7 +72,7 @@ pythonPackages.buildPythonApplication rec {
librsync # Add 'rdiff' to PATH.
par2cmdline # Add 'par2' to PATH.
] ++ stdenv.lib.optionals stdenv.isLinux [
utillinux # Add 'setsid' to PATH.
util-linux # Add 'setsid' to PATH.
] ++ (with pythonPackages; [
lockfile
mock
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, boost, pkgconfig, scons, utillinux, fuse, libevent, openssl, zlib }:
{ stdenv, fetchurl, boost, pkgconfig, scons, util-linux, fuse, libevent, openssl, zlib }:
stdenv.mkDerivation {
version = "0.8.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
};
buildInputs = [
boost pkgconfig scons utillinux fuse libevent openssl zlib
boost pkgconfig scons util-linux fuse libevent openssl zlib
];
buildPhase = ''