diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2018-07-02 22:03:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-02 22:03:26 +0000 |
commit | 366cd2ad8ceae82e5c412ba13e351491aace3d4f (patch) | |
tree | 2dc1f48643f92ad01e3468b6cccbc517cdba5086 | |
parent | 5b4becadf4e4c9de8c02d1fbd207598dfb6ab1d9 (diff) | |
parent | f2e1998c1380acb3c0b02e70e4bd047950dbb153 (diff) |
Merge pull request #42858 from oxij/pkg/update-rspamd
rspamd: 1.6.6 -> 1.7.4
-rw-r--r-- | pkgs/servers/mail/rspamd/default.nix | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix index 3e31327980683..4de63d694667b 100644 --- a/pkgs/servers/mail/rspamd/default.nix +++ b/pkgs/servers/mail/rspamd/default.nix @@ -6,29 +6,25 @@ in stdenv.mkDerivation rec { name = "rspamd-${version}"; - version = "1.6.6"; + version = "1.7.3"; src = fetchFromGitHub { owner = "vstakhov"; repo = "rspamd"; rev = version; - sha256 = "04jqrki7rlxywdig264kavy1h5882rspi2drkbdzrk35jjq8rh3h"; + sha256 = "1gb4zg8i1nj337f65s434h299ad19c0d7jyawb2glvv3n4cshm97"; }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann]; + buildInputs = [ glib gmime libevent libmagic luajit openssl pcre sqlite ragel icu libfann ]; - postPatch = '' - substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local" "/etc/rspamd/rspamd.conf.local" - substituteInPlace conf/common.conf --replace "\$CONFDIR/rspamd.conf.local.override" "/etc/rspamd/rspamd.conf.local.override" - ''; - - cmakeFlags = '' - -DDEBIAN_BUILD=ON - -DRUNDIR=/var/run/rspamd - -DDBDIR=/var/lib/rspamd - -DLOGDIR=/var/log/rspamd - ''; + cmakeFlags = [ + "-DDEBIAN_BUILD=ON" + "-DRUNDIR=/var/run/rspamd" + "-DDBDIR=/var/lib/rspamd" + "-DLOGDIR=/var/log/rspamd" + "-DLOCAL_CONFDIR=/etc/rspamd" + ]; meta = with stdenv.lib; { homepage = https://github.com/vstakhov/rspamd; |