Merge branch 'monit-5.8' of github.com:wmertens/nixpkgs
This commit is contained in:
commit
168fe56f3b
|
@ -92,6 +92,7 @@
|
||||||
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
|
vlstill = "Vladimír Štill <xstill@fi.muni.cz>";
|
||||||
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
|
winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
|
||||||
wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
|
wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
|
||||||
|
wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
|
||||||
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
|
z77z = "Marco Maggesi <maggesi@math.unifi.it>";
|
||||||
zef = "Zef Hemel <zef@zef.me>";
|
zef = "Zef Hemel <zef@zef.me>";
|
||||||
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
|
zimbatm = "zimbatm <zimbatm@zimbatm.com>";
|
||||||
|
|
|
@ -1,30 +1,25 @@
|
||||||
a :
|
{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }:
|
||||||
let
|
|
||||||
s = import ./src-for-default.nix;
|
|
||||||
buildInputs = with a; [
|
|
||||||
bison flex openssl
|
|
||||||
];
|
|
||||||
in
|
|
||||||
rec {
|
|
||||||
src = a.fetchUrlFromSrcInfo s;
|
|
||||||
|
|
||||||
inherit (s) name;
|
stdenv.mkDerivation rec {
|
||||||
inherit buildInputs;
|
name = "monit-5.8";
|
||||||
|
|
||||||
|
src = fetchurl {
|
||||||
|
url = "${meta.homepage}dist/${name}.tar.gz";
|
||||||
|
sha256 = "1xa7i29ma81jjxac0qc29wcxxvbv58n3jbwmllscamh1phz5f00c";
|
||||||
|
};
|
||||||
|
|
||||||
|
nativeBuildInputs = [ bison flex ];
|
||||||
|
buildInputs = [ openssl ] ++ stdenv.lib.optionals usePAM [ pam ];
|
||||||
|
|
||||||
/* doConfigure should be removed if not needed */
|
|
||||||
phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"];
|
|
||||||
configureFlags = [
|
configureFlags = [
|
||||||
"--with-ssl-incl-dir=${a.openssl}/include"
|
"--with-ssl-incl-dir=${openssl}/include"
|
||||||
"--with-ssl-lib-dir=${a.openssl}/lib"
|
"--with-ssl-lib-dir=${openssl}/lib"
|
||||||
];
|
] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ];
|
||||||
preConfigure = a.fullDepEntry (''
|
|
||||||
sed -e 's@/bin/@@' -i Makefile.in
|
|
||||||
'') ["doUnpack" "minInit"];
|
|
||||||
|
|
||||||
meta = {
|
meta = {
|
||||||
|
homepage = http://mmonit.com/monit/;
|
||||||
description = "Monitoring system";
|
description = "Monitoring system";
|
||||||
maintainers = [
|
license = stdenv.lib.licenses.agpl3;
|
||||||
a.lib.maintainers.raskin
|
maintainer = with stdenv.lib.maintainers; [ raskin wmertens ];
|
||||||
];
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
rec {
|
|
||||||
version="5.5";
|
|
||||||
name="monit-5.5";
|
|
||||||
hash="0lvw9llsnaj72dp6di74sc4sxpa4q3g23m28jwy4brphndhb0xl2";
|
|
||||||
url="http://mmonit.com/monit/download/../dist/monit-${version}.tar.gz";
|
|
||||||
advertisedUrl="http://mmonit.com/monit/download/../dist/monit-5.5.tar.gz";
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
|
@ -1,4 +0,0 @@
|
||||||
{
|
|
||||||
downloadPage = "http://mmonit.com/monit/download/";
|
|
||||||
baseName = "monit";
|
|
||||||
}
|
|
|
@ -1468,9 +1468,7 @@ let
|
||||||
|
|
||||||
modemmanager = callPackage ../tools/networking/modemmanager {};
|
modemmanager = callPackage ../tools/networking/modemmanager {};
|
||||||
|
|
||||||
monit = builderDefsPackage ../tools/system/monit {
|
monit = callPackage ../tools/system/monit { };
|
||||||
inherit openssl flex bison;
|
|
||||||
};
|
|
||||||
|
|
||||||
mosh = callPackage ../tools/networking/mosh {
|
mosh = callPackage ../tools/networking/mosh {
|
||||||
boost = boostHeaders;
|
boost = boostHeaders;
|
||||||
|
|
Loading…
Reference in a new issue