Merge pull request #115153 from helsinki-systems/upd/dovecot

dovecot: 2.3.13 -> 2.3.14, dovecot_pigeonhole: 0.5.13 -> 0.5.14
This commit is contained in:
Andreas Rammhold 2021-03-08 17:11:28 +01:00 committed by GitHub
commit 7a44b04738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 9 deletions

View File

@ -10,7 +10,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dovecot"; pname = "dovecot";
version = "2.3.13"; version = "2.3.14";
nativeBuildInputs = [ perl pkg-config ]; nativeBuildInputs = [ perl pkg-config ];
buildInputs = buildInputs =
@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
++ lib.optional withSQLite sqlite; ++ lib.optional withSQLite sqlite;
src = fetchurl { src = fetchurl {
url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz"; url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53"; sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
homepage = "https://dovecot.org/"; homepage = "https://dovecot.org/";
description = "Open source IMAP and POP3 email server written with security primarily in mind"; description = "Open source IMAP and POP3 email server written with security primarily in mind";
maintainers = with lib.maintainers; [ peti fpletz globin ]; maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ];
platforms = lib.platforms.unix; platforms = lib.platforms.unix;
}; };
passthru.tests = { passthru.tests = {

View File

@ -1,12 +1,13 @@
{ lib, stdenv, fetchurl, dovecot, openssl }: { lib, stdenv, fetchurl, dovecot, openssl }:
let
stdenv.mkDerivation rec { dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
in stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole"; pname = "dovecot-pigeonhole";
version = "0.5.13"; version = "0.5.14";
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/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi"; sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8";
}; };
buildInputs = [ dovecot openssl ]; buildInputs = [ dovecot openssl ];