cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #207260 from LeSuisse/dovecot-2.3.20

Browse source
This commit is contained in:
Franz Pletz 2022-12-27 08:31:54 +01:00 committed by GitHub
commit b4eb020143
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkgs/servers/mail/dovecot/default.nix
View file

@ -12,7 +12,7 @@
stdenv.mkDerivation rec {
pname = "dovecot";
version = "2.3.19.1";
version = "2.3.20";
nativeBuildInputs = [ perl pkg-config ];
buildInputs =
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "https://dovecot.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz";
hash = "sha256-21q82H1zCWWeprRbLLbunF+XSGsrcZpd0Fp1nh9qXFE=";
hash = "sha256-yqgy65aBSKvfNe6dD1NLd5+nMsDOSpE9mrjDRpshhVI=";
};
enableParallelBuilding = true;
@ -58,11 +58,6 @@ stdenv.mkDerivation rec {
# so we can symlink plugins from several packages there.
# The symlinking needs to be done in NixOS.
./2.3.x-module_dir.patch
# fix CVE-2022-30550
(fetchpatch {
url = "https://github.com/dovecot/core/compare/7bad6a24%5E..a1022072.patch";
hash = "sha256-aSyRcQreyA9j8QwkODHqPpRuS3vzouVatEWCqhh+r+8=";
})
# fix openssl 3.0 compatibility
(fetchpatch {
url = "https://salsa.debian.org/debian/dovecot/-/raw/debian/1%252.3.19.1+dfsg1-2/debian/patches/Support-openssl-3.0.patch";

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

@ -3,11 +3,11 @@ let
dovecotMajorMinor = lib.versions.majorMinor dovecot.version;
in stdenv.mkDerivation rec {
pname = "dovecot-pigeonhole";
version = "0.5.19";
version = "0.5.20";
src = fetchurl {
url = "https://pigeonhole.dovecot.org/releases/${dovecotMajorMinor}/dovecot-${dovecotMajorMinor}-pigeonhole-${version}.tar.gz";
hash = "sha256:033kkhby9k9yrmgvlfmyzp8fccsw5bhq1dyvxj94sg3grkpj7f8h";
hash = "sha256-rjK9SHDqLBMorgm6IG6ewSEoBG1q/KUvu8nvf3VhfJg=";
};
buildInputs = [ dovecot openssl ];