public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rspamd: 1.9.4 -> 2.2

Browse Source
This commit is contained in:
Franz Pletz 2020-02-01 13:55:57 +01:00
parent 80c99eedef
commit e8b8e8c615
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/doc/manual/release-notes/rl-2003.xml
View File

@ -555,6 +555,15 @@ auth required pam_succeed_if.so uid >= 1000 quiet
needed. needed.
</para> </para>
</listitem> </listitem>
<listitem>
<para>
Rspamd was updated to version 2.2. Read
<link xlink:href="https://rspamd.com/doc/migration.html#migration-to-rspamd-20">
the upstream migration notes</link> carefully. Please be especially
aware that some modules were removed and the default Bayes backend is
now Redis.
</para>
</listitem>
</itemizedlist> </itemizedlist>
</section> </section>

22
pkgs/servers/mail/rspamd/default.nix
View File

@ -1,8 +1,6 @@
{ stdenv, lib, fetchFromGitHub, cmake, perl { stdenv, lib, fetchFromGitHub, cmake, perl
, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu , glib, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
, hyperscan, libfann, gd, jemalloc, openblas, lua , hyperscan, jemalloc, openblas, lua, libsodium
, withFann ? true
, withGd ? false
, withBlas ? true , withBlas ? true
, withHyperscan ? stdenv.isx86_64 , withHyperscan ? stdenv.isx86_64
, withLuaJIT ? stdenv.isx86_64 , withLuaJIT ? stdenv.isx86_64
@ -10,24 +8,19 @@
assert withHyperscan -> stdenv.isx86_64; assert withHyperscan -> stdenv.isx86_64;
let libmagic = file; # libmagic provided by file package ATM
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rspamd"; pname = "rspamd";
version = "1.9.4"; version = "2.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rspamd"; owner = "rspamd";
repo = "rspamd"; repo = "rspamd";
rev = version; rev = version;
sha256 = "0b8n7xazmzjb6jf8sk0jg0x861nf1ayzxsvjaymw1qjgpn371r51"; sha256 = "0rqiz4xm20w80q8p4grcgqcrg14yiddsay0aw00f0v82h4apw7k8";
}; };
nativeBuildInputs = [ cmake pkgconfig perl ]; nativeBuildInputs = [ cmake pkgconfig perl ];
buildInputs = [ glib libevent libmagic openssl pcre sqlite ragel icu jemalloc ] buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ]
++ lib.optional withFann libfann
++ lib.optional withGd gd
++ lib.optional withHyperscan hyperscan ++ lib.optional withHyperscan hyperscan
++ lib.optional withBlas openblas ++ lib.optional withBlas openblas
++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua;
@ -39,10 +32,7 @@ stdenv.mkDerivation rec {
"-DLOGDIR=/var/log/rspamd" "-DLOGDIR=/var/log/rspamd"
"-DLOCAL_CONFDIR=/etc/rspamd" "-DLOCAL_CONFDIR=/etc/rspamd"
"-DENABLE_JEMALLOC=ON" "-DENABLE_JEMALLOC=ON"
] ++ lib.optional withFann "-DENABLE_FANN=ON" ] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON";
++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
++ lib.optional withGd "-DENABLE_GD=ON"
++ lib.optional (!withLuaJIT) "-DENABLE_TORCH=OFF";
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = "https://rspamd.com"; homepage = "https://rspamd.com";