Commit c73fe023 authored by Alvar Penning's avatar Alvar Penning Committed by Anthony Roussel
Browse files

monitoring-plugins: 2.3.5 -> 2.4.0 

https://github.com/monitoring-plugins/monitoring-plugins/releases/tag/v2.4.0

All patches are now included in this release and could been removed.

As upstream removed the translations, the Makefile does not need to be
patched anymore[0].

The license was fixed, as it is GPL-3.0-or-later, take a look at the "or
(at your option) any later version" part in each license header[1].

[0]: https://github.com/monitoring-plugins/monitoring-plugins/commit/40370b8ff0332692c1d8d47c24ebda02b7a18823
[1]: https://github.com/monitoring-plugins/monitoring-plugins/commit/fa4efcdf6df1096ff1f6740c7f44b213b47dc9d3
parent 27e731b0

pkgs/servers/monitoring/plugins/default.nix

+3 −22
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, fetchpatch

, autoreconfHook

, pkg-config

, runCommand
@@ -43,30 +42,15 @@ let 
in

stdenv.mkDerivation rec {

  pname = "monitoring-plugins";

  version = "2.3.5";

  version = "2.4.0";



  src = fetchFromGitHub {

    owner = "monitoring-plugins";

    repo = "monitoring-plugins";

    rev = "v${version}";

    sha256 = "sha256-J9fzlxIpujoG7diSRscFhmEV9HpBOxFTJSmGGFjAzcM=";

    hash = "sha256-T37t0shhC+8k7CN/hIOxsskuuCi0LwQui8xyRTC+pjQ=";

  };



  patches = [

    # fix build (makefile cannot produce -lcrypto)

    # remove on next release

    (fetchpatch {

      url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/bad156676894a2755c8b76519a11cdd2037e5cd6.patch";

      hash = "sha256-aI/sX04KXe968SwdS8ZamNtgdNbHtho5cDsDaA+cjZY=";

    })

    # fix check_smtp with --starttls https://github.com/monitoring-plugins/monitoring-plugins/pull/1952

    # remove on next release

    (fetchpatch {

      url = "https://github.com/monitoring-plugins/monitoring-plugins/commit/2eea6bb2a04bbfb169bac5f0f7c319f998e8ab87.patch";

      hash = "sha256-CyVD340+zOxuxRRPmtowD3DFFRB1Q7+AANzul9HqwBI=";

    })

  ];



  # TODO: Awful hack. Grrr...

  # Anyway the check that configure performs to figure out the ping

  # syntax is totally impure, because it runs an actual ping to
@@ -76,9 +60,6 @@ stdenv.mkDerivation rec { 
  # --with-ping-command needs to be done here instead of in

  # configureFlags due to the spaces in the argument

  postPatch = ''

    substituteInPlace po/Makefile.in.in \

      --replace /bin/sh ${runtimeShell}



    sed -i configure.ac \

      -e 's|^DEFAULT_PATH=.*|DEFAULT_PATH=\"${binPath}\"|'
@@ -116,7 +97,7 @@ stdenv.mkDerivation rec { 
  meta = with lib; {

    description = "Official monitoring plugins for Nagios/Icinga/Sensu and others";

    homepage = "https://www.monitoring-plugins.org";

    license = licenses.gpl3Only;

    license = licenses.gpl3Plus;

    maintainers = with maintainers; [ thoughtpolice relrod ];

    platforms = platforms.linux;

  };