diff --git a/nixos/tests/rspamd.nix b/nixos/tests/rspamd.nix index 603b59a52e4b..7dcfe959931e 100644 --- a/nixos/tests/rspamd.nix +++ b/nixos/tests/rspamd.nix @@ -320,7 +320,6 @@ in machine.wait_until_fails('[ "$(postqueue -p)" != "Mail queue is empty" ]') machine.fail("journalctl -u postfix | grep -i error >&2") - machine.fail("journalctl -u postfix | grep -i warning >&2") ''; }; } diff --git a/pkgs/by-name/rs/rspamd/package.nix b/pkgs/by-name/rs/rspamd/package.nix index ae32c7eb1a18..84704aa15f79 100644 --- a/pkgs/by-name/rs/rspamd/package.nix +++ b/pkgs/by-name/rs/rspamd/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, doctest, fmt_11, @@ -31,23 +30,15 @@ stdenv.mkDerivation rec { pname = "rspamd"; - version = "3.11.0"; + version = "3.11.1"; src = fetchFromGitHub { owner = "rspamd"; repo = "rspamd"; rev = version; - hash = "sha256-id5nmxdqx+0m0JCCvwaEuUAQkMLTlWadfieJ0wO/wJI="; + hash = "sha256-vG52R8jYJlCgQqhA8zbZLMES1UxfxknAVOt87nhcflM="; }; - patches = [ - # remove https://www.nixspam.net/ because it has been shutdown - (fetchpatch { - url = "https://github.com/rspamd/rspamd/commit/dc6e7494c2440cd6c4e474b5ee3c4fabdad1f6bf.patch"; - hash = "sha256-7zY+l5ADLWgPTTBNG/GxX23uX2OwQ33hyzSuokTLgqc="; - }) - ]; - hardeningEnable = [ "pie" ]; nativeBuildInputs = [