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

Merge pull request #116335 from SuperSandro2000/move-aliases.nix

Browse Source
This commit is contained in:
Sandro
2021-04-05 04:07:15 +02:00
committed by GitHub
parent 7ffdeb358b f9bcee4ed5
commit 7c932296e0
237 changed files with 1074 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/servers/monitoring/fusion-inventory/default.nix
+4 -4
View File
@@ -1,4 +1,4 @@
{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute, nettools
{ lib, perlPackages, nix, dmidecode, pciutils, usbutils, iproute2, nettools
, fetchFromGitHub, makeWrapper
}:
@@ -18,9 +18,9 @@ perlPackages.buildPerlPackage rec {
patchShebangs bin
substituteInPlace "lib/FusionInventory/Agent/Tools/Linux.pm" \
--replace /sbin/ip ${iproute}/sbin/ip
--replace /sbin/ip ${iproute2}/sbin/ip
substituteInPlace "lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm" \
--replace /sbin/ip ${iproute}/sbin/ip
--replace /sbin/ip ${iproute2}/sbin/ip
'';
buildTools = [];
@@ -67,7 +67,7 @@ perlPackages.buildPerlPackage rec {
for cur in $out/bin/*; do
if [ -x "$cur" ]; then
sed -e "s|./lib|$out/lib|" -i "$cur"
wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute]}
wrapProgram "$cur" --prefix PATH : ${lib.makeBinPath [nix dmidecode pciutils usbutils nettools iproute2]}
fi
done
'';
pkgs/servers/monitoring/mackerel-agent/default.nix
+2 -2
View File
@@ -1,4 +1,4 @@
{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute, nettools }:
{ stdenv, lib, buildGoModule, fetchFromGitHub, makeWrapper, iproute2, nettools }:
buildGoModule rec {
pname = "mackerel-agent";
@@ -13,7 +13,7 @@ buildGoModule rec {
nativeBuildInputs = [ makeWrapper ];
checkInputs = lib.optionals (!stdenv.isDarwin) [ nettools ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute ];
buildInputs = lib.optionals (!stdenv.isDarwin) [ iproute2 ];
vendorSha256 = "sha256-yomxALecP+PycelOmwrteK/LoW7wsst7os+jcbF46Bs=";