nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-08 13:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108404 from andir/dovecot

Browse Source 
dovecot: 2.3.11.3 -> 2.3.13
This commit is contained in:
ajs124 2021-01-04 19:01:18 +01:00 committed by GitHub
commit 59d08b1e69
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nixos/tests/dovecot.nix
View File

@ -4,8 +4,11 @@ import ./make-test-python.nix {
machine = { pkgs, ... }: { machine = { pkgs, ... }: {
imports = [ common/user-account.nix ]; imports = [ common/user-account.nix ];
services.postfix.enable = true; services.postfix.enable = true;
services.dovecot2.enable = true; services.dovecot2 = {
services.dovecot2.protocols = [ "imap" "pop3" ]; enable = true;
protocols = [ "imap" "pop3" ];
modules = [ pkgs.dovecot_pigeonhole ];
};
environment.systemPackages = let environment.systemPackages = let
sendTestMail = pkgs.writeScriptBin "send-testmail" '' sendTestMail = pkgs.writeScriptBin "send-testmail" ''
#!${pkgs.runtimeShell} #!${pkgs.runtimeShell}

5
pkgs/servers/mail/dovecot/default.nix
View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dovecot"; pname = "dovecot";
version = "2.3.11.3"; version = "2.3.13";
nativeBuildInputs = [ perl pkgconfig ]; nativeBuildInputs = [ perl pkgconfig ];
buildInputs = buildInputs =
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz";
sha256 = "1p5gp8jbavcsaara5mfn5cbrnlxssajnchczbgmmfzr7228fmnfk"; sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -89,5 +89,6 @@ stdenv.mkDerivation rec {
}; };
passthru.tests = { passthru.tests = {
opensmtpd-interaction = nixosTests.opensmtpd; opensmtpd-interaction = nixosTests.opensmtpd;
inherit (nixosTests) dovecot;
}; };
} }

4
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole"; pname = "dovecot-pigeonhole";
version = "0.5.11"; version = "0.5.13";
src = fetchurl { src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz"; url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
sha256 = "1w5mryv6izh1gv7davnl94rb0pvh5bxl2bydzbfla1b83x22m5qb"; sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi";
}; };
buildInputs = [ dovecot openssl ]; buildInputs = [ dovecot openssl ];