public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

utillinux: rename to util-linux

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/servers/apcupsd/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, systemd, utillinux, coreutils, wall, hostname, man
{ stdenv, fetchurl, pkgconfig, systemd, util-linux, coreutils, wall, hostname, man
, enableCgiScripts ? true, gd
}:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ utillinux man ] ++ stdenv.lib.optional enableCgiScripts gd;
buildInputs = [ util-linux man ] ++ stdenv.lib.optional enableCgiScripts gd;
prePatch = ''
sed -e "s,\$(INSTALL_PROGRAM) \$(STRIP),\$(INSTALL_PROGRAM)," \

4
pkgs/servers/asterisk/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, lib, fetchurl, fetchsvn,
jansson, libedit, libxml2, libxslt, ncurses, openssl, sqlite,
utillinux, dmidecode, libuuid, newt,
util-linux, dmidecode, libuuid, newt,
lua, speex,
srtp, wget, curl, iksemel, pkgconfig
}:
@@ -14,7 +14,7 @@ let
dmidecode libuuid newt
lua speex
srtp wget curl iksemel ];
nativeBuildInputs = [ utillinux pkgconfig ];
nativeBuildInputs = [ util-linux pkgconfig ];
patches = [
# We want the Makefile to install the default /var skeleton

4
pkgs/servers/computing/torque/default.nix
View File

@@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, util-linux
, coreutils, file, libtool, which, boost, autoreconfHook
}:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ];
buildInputs = [
openssl groff libxml2 utillinux libtool
openssl groff libxml2 util-linux libtool
which boost
];

4
pkgs/servers/hylafaxplus/default.nix
View File

@@ -15,7 +15,7 @@
, libtiff
, psmisc
, sharutils
, utillinux
, util-linux
, zlib
## optional packages (using `null` disables some functionality)
, jbigkit ? null
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
libtiff
psmisc # for `fuser` command
sharutils # for `uuencode` command
utillinux # for `agetty` command
util-linux # for `agetty` command
zlib
jbigkit # optional
lcms2 # optional

2
pkgs/servers/matrix-appservice-discord/node-composition.nix
View File

@@ -6,7 +6,7 @@
let
nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};

2
pkgs/servers/matrix-synapse/matrix-appservice-slack/node-composition.nix
View File

@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};

6
pkgs/servers/search/elasticsearch/6.x.nix
View File

@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
, utillinux, gnugrep, coreutils
, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -35,7 +35,7 @@ stdenv.mkDerivation (rec {
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
buildInputs = [ makeWrapper jre_headless utillinux ]
buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
@@ -45,7 +45,7 @@ stdenv.mkDerivation (rec {
chmod -x $out/bin/*.*
wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${makeBinPath [ utillinux gnugrep coreutils ]}" \
--prefix PATH : "${makeBinPath [ util-linux gnugrep coreutils ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"

6
pkgs/servers/search/elasticsearch/7.x.nix
View File

@@ -4,7 +4,7 @@
, fetchurl
, makeWrapper
, jre_headless
, utillinux, gnugrep, coreutils
, util-linux, gnugrep, coreutils
, autoPatchelfHook
, zlib
}:
@@ -46,7 +46,7 @@ stdenv.mkDerivation (rec {
"ES_CLASSPATH=\"\$ES_CLASSPATH:$out/\$additional_classpath_directory/*\""
'';
buildInputs = [ makeWrapper jre_headless utillinux ]
buildInputs = [ makeWrapper jre_headless util-linux ]
++ optional enableUnfree zlib;
installPhase = ''
@@ -56,7 +56,7 @@ stdenv.mkDerivation (rec {
chmod +x $out/bin/*
wrapProgram $out/bin/elasticsearch \
--prefix PATH : "${makeBinPath [ utillinux coreutils gnugrep ]}" \
--prefix PATH : "${makeBinPath [ util-linux coreutils gnugrep ]}" \
--set JAVA_HOME "${jre_headless}"
wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre_headless}"

2
pkgs/servers/web-apps/cryptpad/node-packages.nix generated
View File

@@ -6,7 +6,7 @@
let
nodeEnv = import ../../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};

4
pkgs/servers/xmpp/ejabberd/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp
, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, utillinux, procps, gd
, erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
, flock
, withMysql ? false
, withPgsql ? false
@@ -21,7 +21,7 @@ let
fi
'';
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils utillinux procps ];
ctlpath = lib.makeBinPath [ bash gnused gnugrep coreutils util-linux procps ];
in stdenv.mkDerivation rec {
version = "20.03";

2
pkgs/servers/zigbee2mqtt/node.nix
View File

@@ -6,7 +6,7 @@
let
nodeEnv = import ../../development/node-packages/node-env.nix {
inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile;
inherit (pkgs) stdenv python2 util-linux runCommand writeTextFile;
inherit nodejs;
libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
};

4
pkgs/servers/zoneminder/default.nix
View File

@@ -1,6 +1,6 @@
{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig
, curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages
, polkit, utillinuxMinimal, x264, zlib
, polkit, util-linuxMinimal, x264, zlib
, coreutils, procps, psmisc, nixosTests }:
# NOTES:
@@ -148,7 +148,7 @@ in stdenv.mkDerivation rec {
buildInputs = [
curl ffmpeg_3 glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib
utillinuxMinimal # for libmount
util-linuxMinimal # for libmount
] ++ (with perlPackages; [
# build-time dependencies
DateManip DBI DBDmysql LWP SysMmap