diff options
author | Wout Mertens <Wout.Mertens@gmail.com> | 2014-05-04 09:51:10 +0200 |
---|---|---|
committer | Wout Mertens <Wout.Mertens@gmail.com> | 2014-05-04 09:53:26 +0200 |
commit | 6ab576b702e9dbe64e7c1472a5d1386a34cc128c (patch) | |
tree | 1d6c58aac056c00c19c987090029bfc27720faf6 /pkgs/tools/system/monit | |
parent | e017139e7092d9ef1ec9b0eaf5ed5bd32006d9c3 (diff) |
Monit: Bump to 5.8
- Use callPackage etc - Make PAM optional
Diffstat (limited to 'pkgs/tools/system/monit')
-rw-r--r-- | pkgs/tools/system/monit/default.nix | 40 | ||||
-rw-r--r-- | pkgs/tools/system/monit/src-for-default.nix | 9 | ||||
-rw-r--r-- | pkgs/tools/system/monit/src-info-for-default.nix | 4 |
3 files changed, 16 insertions, 37 deletions
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix index b8b2e2cbcdcf3..cbd9c20389ced 100644 --- a/pkgs/tools/system/monit/default.nix +++ b/pkgs/tools/system/monit/default.nix @@ -1,30 +1,22 @@ -a : -let - s = import ./src-for-default.nix; - buildInputs = with a; [ - bison flex openssl - ]; -in -rec { - src = a.fetchUrlFromSrcInfo s; +{stdenv, fetchurl, openssl, bison, flex, pam, usePAM ? stdenv.isLinux }: - inherit (s) name; - inherit buildInputs; +stdenv.mkDerivation rec { + 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 ]; + + configureFlags = stdenv.lib.optionals (! usePAM) [ "--without-pam" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["preConfigure" "doConfigure" "doMakeInstall"]; - configureFlags = [ - "--with-ssl-incl-dir=${a.openssl}/include" - "--with-ssl-lib-dir=${a.openssl}/lib" - ]; - preConfigure = a.fullDepEntry ('' - sed -e 's@/bin/@@' -i Makefile.in - '') ["doUnpack" "minInit"]; - meta = { + homepage = http://mmonit.com/monit/; description = "Monitoring system"; - maintainers = [ - a.lib.maintainers.raskin - ]; + license = stdenv.lib.licenses.agpl3; + maintainer = with stdenv.lib.maintainers; [ raskin wmertens ]; }; } diff --git a/pkgs/tools/system/monit/src-for-default.nix b/pkgs/tools/system/monit/src-for-default.nix deleted file mode 100644 index b74958ae19a02..0000000000000 --- a/pkgs/tools/system/monit/src-for-default.nix +++ /dev/null @@ -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"; - - -} diff --git a/pkgs/tools/system/monit/src-info-for-default.nix b/pkgs/tools/system/monit/src-info-for-default.nix deleted file mode 100644 index 691984a9fd5e7..0000000000000 --- a/pkgs/tools/system/monit/src-info-for-default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ - downloadPage = "http://mmonit.com/monit/download/"; - baseName = "monit"; -} |