Merge pull request #276091 from symphorien/monitoring-plugins-2.3.5

monitoring-plugins: 2.3.0 -> 2.3.5

authored by Guillaume Girol and committed by GitHub bb7d124c db0f76e8

+19 -17
+19 -17
pkgs/servers/monitoring/plugins/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , writeShellScript 4 + , fetchpatch 5 5 , autoreconfHook 6 6 , pkg-config 7 7 , runCommand ··· 40 40 mkdir -p $out/bin 41 41 ln -s /run/wrappers/bin/sendmail $out/bin/mailq 42 42 ''; 43 - 44 - # For unknown reasons the installer tries executing $out/share and fails so 45 - # we create it and remove it again later. 46 - share = writeShellScript "share" '' 47 - exit 0 48 - ''; 49 - 50 43 in 51 44 stdenv.mkDerivation rec { 52 45 pname = "monitoring-plugins"; 53 - version = "2.3.0"; 46 + version = "2.3.5"; 54 47 55 48 src = fetchFromGitHub { 56 49 owner = "monitoring-plugins"; 57 50 repo = "monitoring-plugins"; 58 - rev = "v" + lib.versions.majorMinor version; 59 - sha256 = "sha256-yLhHOSrPFRjW701aOL8LPe4OnuJxL6f+dTxNqm0evIg="; 51 + rev = "v${version}"; 52 + sha256 = "sha256-J9fzlxIpujoG7diSRscFhmEV9HpBOxFTJSmGGFjAzcM="; 60 53 }; 61 54 55 + patches = [ 56 + # fix build (makefile cannot produce -lcrypto) 57 + # remove on next release 58 + (fetchpatch { 59 + url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/bad156676894a2755c8b76519a11cdd2037e5cd6.patch"; 60 + hash = "sha256-aI/sX04KXe968SwdS8ZamNtgdNbHtho5cDsDaA+cjZY="; 61 + }) 62 + # fix check_smtp with --starttls https://github.com/monitoring-plugins/monitoring-plugins/pull/1952 63 + # remove on next release 64 + (fetchpatch { 65 + url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/2eea6bb2a04bbfb169bac5f0f7c319f998e8ab87.patch"; 66 + hash = "sha256-CyVD340+zOxuxRRPmtowD3DFFRB1Q7+AANzul9HqwBI="; 67 + }) 68 + ]; 69 + 62 70 # TODO: Awful hack. Grrr... 63 71 # Anyway the check that configure performs to figure out the ping 64 72 # syntax is totally impure, because it runs an actual ping to ··· 78 86 --with-ping-command='${lib.getBin unixtools.ping}/bin/ping -4 -n -U -w %d -c %d %s' 79 87 --with-ping6-command='${lib.getBin unixtools.ping}/bin/ping -6 -n -U -w %d -c %d %s' 80 88 ) 81 - 82 - install -Dm555 ${share} $out/share 83 89 ''; 84 90 85 91 configureFlags = [ ··· 106 112 nativeBuildInputs = [ autoreconfHook pkg-config ]; 107 113 108 114 enableParallelBuilding = true; 109 - 110 - postInstall = '' 111 - rm $out/share 112 - ''; 113 115 114 116 meta = with lib; { 115 117 description = "Official monitoring plugins for Nagios/Icinga/Sensu and others";