Merge pull request #168698 from justinas/rspamd3_2

This commit is contained in:
Franz Pletz 2022-04-15 13:22:06 +02:00 committed by GitHub
commit 1cf1b56dc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchFromGitHub, cmake, perl
, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu
, glib, luajit, openssl, pcre2, pkg-config, sqlite, ragel, icu
, hyperscan, jemalloc, blas, lapack, lua, libsodium
, withBlas ? true
, withHyperscan ? stdenv.isx86_64
@ -11,19 +11,19 @@ assert withHyperscan -> stdenv.isx86_64;
stdenv.mkDerivation rec {
pname = "rspamd";
version = "3.1";
version = "3.2";
src = fetchFromGitHub {
owner = "rspamd";
repo = "rspamd";
rev = version;
sha256 = "sha256-w3pvjU6b4IAl27QvY16UdBi1v1iJnnkLRUC54eXdH9I=";
sha256 = "122d5m1nfxxz93bhsk8lm4dazvdknzphb0a1188m7bsa4iynbfv2";
};
hardeningEnable = [ "pie" ];
nativeBuildInputs = [ cmake pkg-config perl ];
buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ]
buildInputs = [ glib openssl pcre2 sqlite ragel icu jemalloc libsodium ]
++ lib.optional withHyperscan hyperscan
++ lib.optionals withBlas [ blas lapack ]
++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua;