From 7304454f86fcffb959f34769c6d5859965b0c81a Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 19 Mar 2019 20:55:53 -0400 Subject: [PATCH 1/5] monitoring-plugins: add mysql support --- pkgs/servers/monitoring/plugins/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 3e6eaa4766e8..26bcaf519dd3 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,5 +1,6 @@ -{ stdenv, fetchFromGitHub, autoreconfHook +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl +, mysql, zlib , runtimeShell }: with stdenv.lib; @@ -20,6 +21,14 @@ in stdenv.mkDerivation rec { 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. # Anyway the check that configure performs to figure out the ping # 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 - buildInputs = [ net_snmp openssh openssl perl ]; + buildInputs = [ mysql net_snmp openssh openssl perl zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 96003801d25f31500be2a0ed620ff57594d9a905 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 19 Mar 2019 21:00:23 -0400 Subject: [PATCH 2/5] monitoring-plugins: add ldap support --- pkgs/servers/monitoring/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 26bcaf519dd3..54180c576045 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, mysql, zlib +, mysql, zlib, openldap , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ mysql net_snmp openssh openssl perl zlib ]; + buildInputs = [ mysql net_snmp openldap openssh openssl perl zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 894b7e9f217f0088370c7518b511e393fec3e1bc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Tue, 19 Mar 2019 21:21:35 -0400 Subject: [PATCH 3/5] monitoring-plugins: add dig support --- pkgs/servers/monitoring/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index 54180c576045..f3796eaf134a 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, mysql, zlib, openldap +, dnsutils, mysql, zlib, openldap , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ mysql net_snmp openldap openssh openssl perl zlib ]; + buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 88e830894f66d5b2a067f321a98db915a12328e4 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 20 Mar 2019 08:13:36 -0400 Subject: [PATCH 4/5] monitoring-plugins: add procs support --- pkgs/servers/monitoring/plugins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index f3796eaf134a..d0ab2b823113 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, dnsutils, mysql, zlib, openldap +, dnsutils, mysql, zlib, openldap, procps , runtimeShell }: with stdenv.lib; @@ -9,7 +9,7 @@ let majorVersion = "2.2"; 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 { name = "monitoring-plugins-${majorVersion}${minorVersion}"; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl zlib ]; + buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ]; From 7b78ced1c5ee0861d7a73bf3509b10aa78a51f88 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Wed, 20 Mar 2019 08:31:46 -0400 Subject: [PATCH 5/5] monitoring-plugins: add dbi support --- pkgs/servers/monitoring/plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/plugins/default.nix b/pkgs/servers/monitoring/plugins/default.nix index d0ab2b823113..cb12fe819a95 100644 --- a/pkgs/servers/monitoring/plugins/default.nix +++ b/pkgs/servers/monitoring/plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchpatch, autoreconfHook , coreutils, gnugrep, gnused, lm_sensors, net_snmp, openssh, openssl, perl -, dnsutils, mysql, zlib, openldap, procps +, dnsutils, libdbi, mysql, zlib, openldap, procps , runtimeShell }: with stdenv.lib; @@ -48,7 +48,7 @@ in stdenv.mkDerivation rec { ''; # !!! make openssh a runtime dependency only - buildInputs = [ dnsutils mysql net_snmp openldap openssh openssl perl procps zlib ]; + buildInputs = [ dnsutils libdbi mysql net_snmp openldap openssh openssl perl procps zlib ]; nativeBuildInputs = [ autoreconfHook ];