mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge pull request #57973 from aanderse/monitoring-plugins
monitoring-plugins: compile missing mysql, ldap, dig, procs, and dbi executables
This commit is contained in:
commit
5e0a6863c8
|
@ -1,5 +1,6 @@
|
||||||
{ stdenv, fetchFromGitHub, autoreconfHook
|
{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook
|
||||||
, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
|
, coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl
|
||||||
|
, dnsutils, libdbi, mysql, zlib, openldap, procps
|
||||||
, runtimeShell }:
|
, runtimeShell }:
|
||||||
|
|
||||||
with stdenv.lib;
|
with stdenv.lib;
|
||||||
|
@ -8,7 +9,7 @@ let
|
||||||
majorVersion = "2.2";
|
majorVersion = "2.2";
|
||||||
minorVersion = ".0";
|
minorVersion = ".0";
|
||||||
|
|
||||||
binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp ];
|
binPath = makeBinPath [ coreutils gnugrep gnused lm_sensors net_snmp procps ];
|
||||||
|
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
name = "monitoring-plugins-${majorVersion}${minorVersion}";
|
name = "monitoring-plugins-${majorVersion}${minorVersion}";
|
||||||
|
@ -20,6 +21,14 @@ in stdenv.mkDerivation rec {
|
||||||
sha256 = "1pw7i6d2cnb5nxi2lbkwps2qzz04j9zd86fzpv9ka896b4aqrwv1";
|
sha256 = "1pw7i6d2cnb5nxi2lbkwps2qzz04j9zd86fzpv9ka896b4aqrwv1";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# https://github.com/monitoring-plugins/monitoring-plugins/issues/1508
|
||||||
|
(fetchpatch {
|
||||||
|
url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/ac0437ff896ba9ce2549b2d2ec3de146a886f08a.patch";
|
||||||
|
sha256 = "0jf6fqkyzag66rid92m7asnr2dp8rr8kn4zjvhqg0mqvf8imppky";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
# !!! Awful hack. Grrr... this of course only works on NixOS.
|
# !!! Awful hack. Grrr... this of course only works on NixOS.
|
||||||
# Anyway the check that configure performs to figure out the ping
|
# Anyway the check that configure performs to figure out the ping
|
||||||
# syntax is totally impure, because it runs an actual ping to
|
# syntax is totally impure, because it runs an actual ping to
|
||||||
|
@ -39,7 +48,7 @@ in stdenv.mkDerivation rec {
|
||||||
'';
|
'';
|
||||||
|
|
||||||
# !!! make openssh a runtime dependency only
|
# !!! make openssh a runtime dependency only
|
||||||
buildInputs = [ net_snmp openssh openssl perl ];
|
buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ];
|
||||||
|
|
||||||
nativeBuildInputs = [ autoreconfHook ];
|
nativeBuildInputs = [ autoreconfHook ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue