Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b77f0d0bc14c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 655d913b1a3f
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 16, 2020

  1. rspamd: fix builds on non-x86_64-linux platforms 

    LuaJIT is built in rspamd only on x86_64-linux, and LuaJIT support
became enabled by default in 2.6, breaking builds without it. This
commit explicitly disables LuaJIT support on non-x86_64 architectures.
    @vikanezrimaya
    vikanezrimaya committed Nov 16, 2020

    Unverified

    This user has not yet uploaded their public signing key.
    GPG key ID: A0E01EF44C27BF00
    Learn about vigilant mode
    Copy the full SHA
    71998dd View commit details

  2. Merge pull request #103973 from kisik21/fix-rspamd-non-x86_64-linux 

    rspamd: fix builds on non-x86_64-linux platforms
    @timokau
    timokau authored Nov 16, 2020
    Copy the full SHA
    655d913 View commit details
Showing with 2 additions and 1 deletion.
  1. +2 −1 pkgs/servers/mail/rspamd/default.nix
3 changes: 2 additions & 1 deletion pkgs/servers/mail/rspamd/default.nix
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,8 @@ stdenv.mkDerivation rec {
"-DLOGDIR=/var/log/rspamd"
"-DLOCAL_CONFDIR=/etc/rspamd"
"-DENABLE_JEMALLOC=ON"
] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON";
] ++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
++ lib.optional (!withLuaJIT) "-DENABLE_LUAJIT=OFF";

passthru.tests.rspamd = nixosTests.rspamd;