diff options
| -rw-r--r-- | pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix (renamed from pkgs/servers/mail/dovecot-pigeonhole/default.nix) | 23 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 16 insertions, 11 deletions
diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix index 3ee73520d7ad..385cf7d35ba8 100644 --- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix +++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix @@ -1,15 +1,15 @@ -{stdenv, fetchurl, dovecot22, openssl}: +{ stdenv, fetchurl, dovecot, openssl }: stdenv.mkDerivation rec { name = "dovecot-pigeonhole-${version}"; - version = "0.4.3"; + version = "0.4.10"; src = fetchurl { 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 = '' substituteInPlace src/managesieve/managesieve-settings.c --replace \ @@ -18,18 +18,21 @@ stdenv.mkDerivation rec { substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \ ".executable = \"managesieve-login\"" \ ".executable = \"$out/libexec/dovecot/managesieve-login\"" - ''; + ''; - configureFlags = [ - "--with-dovecot=${dovecot22}/lib/dovecot" + configureFlags = [ + "--with-dovecot=${dovecot}/lib/dovecot" "--without-dovecot-install-dirs" "--with-moduledir=$(out)/lib/dovecot" - ]; + ]; + + enableParallelBuilding = true; meta = with stdenv.lib; { homepage = http://pigeonhole.dovecot.org/; description = "A sieve plugin for the Dovecot IMAP server"; license = licenses.lgpl21; maintainers = [ maintainers.rickynils ]; - }; + platforms = platforms.linux; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f686ce754324..a4abd6a54a28 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9234,7 +9234,9 @@ let 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 { inherit (perlPackages) NetSMTP; |