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 12:42:06 -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
pkgs/tools/networking/openvpn/default.nix
+2 -2
View File
@@ -9,7 +9,7 @@
, pam
, useSystemd ? stdenv.isLinux
, systemd ? null
, utillinux ? null
, util-linux ? null
, pkcs11Support ? false
, pkcs11helper ? null
}:
@@ -63,7 +63,7 @@ let
'' + optionalString useSystemd ''
install -Dm555 ${update-resolved} $out/libexec/update-systemd-resolved
wrapProgram $out/libexec/update-systemd-resolved \
--prefix PATH : ${makeBinPath [ runtimeShell iproute systemd utillinux ]}
--prefix PATH : ${makeBinPath [ runtimeShell iproute systemd util-linux ]}
'';
enableParallelBuilding = true;
pkgs/tools/networking/openvpn/openvpn_learnaddress.nix
+3 -3
View File
@@ -1,4 +1,4 @@
{ stdenv, fetchgit, makeWrapper, coreutils, gawk, utillinux }:
{ stdenv, fetchgit, makeWrapper, coreutils, gawk, util-linux }:
stdenv.mkDerivation {
name = "openvpn-learnaddress-19b03c3";
@@ -9,13 +9,13 @@ stdenv.mkDerivation {
sha256 = "16pcyvyhwsx34i0cjkkx906lmrwdd9gvznvqdwlad4ha8l8f8z42";
};
buildInputs = [ makeWrapper coreutils gawk utillinux ];
buildInputs = [ makeWrapper coreutils gawk util-linux ];
installPhase = ''
install -Dm555 ovpn-learnaddress $out/libexec/openvpn/openvpn-learnaddress
wrapProgram $out/libexec/openvpn/openvpn-learnaddress \
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk utillinux ]}
--prefix PATH : ${stdenv.lib.makeBinPath [ coreutils gawk util-linux ]}
'';
meta = {
pkgs/tools/networking/openvpn/update-systemd-resolved.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, makeWrapper
, iproute, systemd, coreutils, utillinux }:
, iproute, systemd, coreutils, util-linux }:
stdenv.mkDerivation rec {
pname = "update-systemd-resolved";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
installPhase = ''
wrapProgram $out/libexec/openvpn/update-systemd-resolved \
--prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils utillinux ]}
--prefix PATH : ${lib.makeBinPath [ iproute systemd coreutils util-linux ]}
'';
meta = with stdenv.lib; {