dovecot_pigeonhole: 0.4.3 -> 0.4.10

This commit is contained in:
Nikolay Amiantov 2016-01-03 05:55:19 +03:00
parent cf1883f106
commit c956bc774b
2 changed files with 16 additions and 11 deletions

View file

@ -1,15 +1,15 @@
{stdenv, fetchurl, dovecot22, openssl}: { stdenv, fetchurl, dovecot, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dovecot-pigeonhole-${version}"; name = "dovecot-pigeonhole-${version}";
version = "0.4.3"; version = "0.4.10";
src = fetchurl { src = fetchurl {
url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz"; url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn"; sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9";
}; };
buildInputs = [ dovecot22 openssl ]; buildInputs = [ dovecot openssl ];
preConfigure = '' preConfigure = ''
substituteInPlace src/managesieve/managesieve-settings.c --replace \ substituteInPlace src/managesieve/managesieve-settings.c --replace \
@ -18,18 +18,21 @@ stdenv.mkDerivation rec {
substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \ substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
".executable = \"managesieve-login\"" \ ".executable = \"managesieve-login\"" \
".executable = \"$out/libexec/dovecot/managesieve-login\"" ".executable = \"$out/libexec/dovecot/managesieve-login\""
''; '';
configureFlags = [ configureFlags = [
"--with-dovecot=${dovecot22}/lib/dovecot" "--with-dovecot=${dovecot}/lib/dovecot"
"--without-dovecot-install-dirs" "--without-dovecot-install-dirs"
"--with-moduledir=$(out)/lib/dovecot" "--with-moduledir=$(out)/lib/dovecot"
]; ];
enableParallelBuilding = true;
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://pigeonhole.dovecot.org/; homepage = http://pigeonhole.dovecot.org/;
description = "A sieve plugin for the Dovecot IMAP server"; description = "A sieve plugin for the Dovecot IMAP server";
license = licenses.lgpl21; license = licenses.lgpl21;
maintainers = [ maintainers.rickynils ]; maintainers = [ maintainers.rickynils ];
}; platforms = platforms.linux;
};
} }

View file

@ -9234,7 +9234,9 @@ let
dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { }; dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole {
dovecot = dovecot22;
};
dspam = callPackage ../servers/mail/dspam { dspam = callPackage ../servers/mail/dspam {
inherit (perlPackages) NetSMTP; inherit (perlPackages) NetSMTP;