git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #115153 from helsinki-systems/upd/dovecot

dovecot: 2.3.13 -> 2.3.14, dovecot_pigeonhole: 0.5.13 -> 0.5.14

commit7a44b04738dc4a10bb9009fc25b1a67587820304 authorAndreas Rammhold <andreas@rammhold.de> dateMon 8 Mar 2021, 17:11 (6 years ago) parent91056dcc543f4d
2 files changed+10−9
pkgs/servers/mail/dovecot/default.nix+4−4 pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix+6−5
pkgs/servers/mail/dovecot/default.nix+4−4
@@ -10,7 +10,7 @@
1010
1111stdenv.mkDerivation rec {
1212 pname = "dovecot";
13− version = "2.3.13";
13+ version = "2.3.14";
1414
1515 nativeBuildInputs = [ perl pkg-config ];
1616 buildInputs =
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
2121 ++ lib.optional withSQLite sqlite;
2222
2323 src = fetchurl {
24− url = "https://dovecot.org/releases/2.3/${pname}-${version}.tar.gz";
25− sha256 = "1i7ijss79a23v7b6lycfzaa8r5rh01k0h0b9h0j4a6n11sw7by53";
24+ url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
25+ sha256 = "0jm3p52z619v7ajh533g2g7d790k82fk0w7ry0zqlm8ymzrxgcy8";
2626 };
2727
2828 enableParallelBuilding = true;
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
8484 meta = {
8585 homepage = "https://dovecot.org/";
8686 description = "Open source IMAP and POP3 email server written with security primarily in mind";
87− maintainers = with lib.maintainers; [ peti fpletz globin ];
87+ maintainers = with lib.maintainers; [ peti fpletz globin ajs124 ];
8888 platforms = lib.platforms.unix;
8989 };
9090 passthru.tests = {
pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix+6−5
@@ -1,12 +1,13 @@
11{ lib, stdenv, fetchurl, dovecot, openssl }:
2−
3−stdenv.mkDerivation rec {
2+let
3+ dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
4+in stdenv.mkDerivation rec {
45 pname = "dovecot-pigeonhole";
5− version = "0.5.13";
6+ version = "0.5.14";
67
78 src = fetchurl {
8− url = "https://pigeonhole.dovecot.org/releases/2.3/dovecot-2.3-pigeonhole-${version}.tar.gz";
9− sha256 = "05xz2d82ck6lmv94nbc3qff09j8b60a5640i3fmqwqsvv9kfa7wi";
9+ url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
10+ sha256 = "1lmjzz4kd90wbdslacybizd1dks4bhwmrx39lj8b19naldw0zjk8";
1011 };
1112
1213 buildInputs = [ dovecot openssl ];