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,4 +1,4 @@
{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, utillinux }:
{ stdenv, fetchFromGitHub, boost, cmake, cpp-hocon, curl, leatherman, libwhereami, libyamlcpp, openssl, ruby, util-linux }:
stdenv.mkDerivation rec {
pname = "facter";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error";
nativeBuildInputs = [ cmake ];
buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby utillinux ];
buildInputs = [ boost cpp-hocon curl leatherman libwhereami libyamlcpp openssl ruby util-linux ];
enableParallelBuilding = true;
+2 -2
View File
@@ -1,7 +1,7 @@
{ lib, stdenv, fetchFromGitHub, perl, perlPackages, makeWrapper
, ps, dnsutils # dig is recommended for multiple categories
, withRecommends ? false # Install (almost) all recommended tools (see --recommends)
, withRecommendedSystemPrograms ? withRecommends, utillinuxMinimal, dmidecode
, withRecommendedSystemPrograms ? withRecommends, util-linuxMinimal, dmidecode
, file, hddtemp, iproute, ipmitool, usbutils, kmod, lm_sensors, smartmontools
, binutils, tree, upower
, withRecommendedDisplayInformationPrograms ? withRecommends, glxinfo, xorg
@@ -11,7 +11,7 @@ let
prefixPath = programs:
"--prefix PATH ':' '${stdenv.lib.makeBinPath programs}'";
recommendedSystemPrograms = lib.optionals withRecommendedSystemPrograms [
utillinuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
util-linuxMinimal dmidecode file hddtemp iproute ipmitool usbutils kmod
lm_sensors smartmontools binutils tree upower
];
recommendedDisplayInformationPrograms = lib.optionals
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, utillinux, gawk, makeWrapper
{ stdenv, fetchFromGitHub, rofi, systemd, coreutils, util-linux, gawk, makeWrapper
}:
stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
wrapperPath = with stdenv.lib; makeBinPath [
rofi
coreutils
utillinux
util-linux
gawk
systemd
];