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: f7d5b76e03f4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: adb5b610bd11
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 9, 2018

  1. opensmtpd-extras: 5.7.1 -> 6.4.0 

    Also use `enable*` flags instead of the impossible-to-discover trick of
setting to `null` the dependencies.
    @Ekleog
    Ekleog committed Nov 9, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    DuCanhGH Ngô Đức Anh
    GPG key ID: B5269D3A0E6B6D11
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c9034d2 View commit details

Commits on Nov 12, 2018

  1. Merge pull request #50022 from Ekleog/opensmtpd-extras-6.4.0 

    opensmtpd-extras: 5.7.1 -> 6.4.0
    @gebner
    gebner authored Nov 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    DuCanhGH Ngô Đức Anh
    GPG key ID: B5269D3A0E6B6D11
    Verified
    Learn about vigilant mode
    Copy the full SHA
    adb5b61 View commit details
Showing with 24 additions and 13 deletions.
  1. +24 −13 pkgs/servers/mail/opensmtpd/extras.nix
37 changes: 24 additions & 13 deletions pkgs/servers/mail/opensmtpd/extras.nix
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
{ stdenv, fetchurl, openssl, libevent, libasr,
python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis }:
python2, pkgconfig, lua5, perl, mysql, postgresql, sqlite, hiredis,
enablePython ? true,
enableLua ? true,
enablePerl ? true,
enableMysql ? true,
enablePostgres ? true,
enableSqlite ? true,
enableRedis ? true,
}:

stdenv.mkDerivation rec {
name = "opensmtpd-extras-${version}";
version = "5.7.1";
version = "6.4.0";

src = fetchurl {
url = "https://www.opensmtpd.org/archives/${name}.tar.gz";
sha256 = "1kld4hxgz792s0cb2gl7m2n618ikzqkj88w5dhaxdrxg4x2c4vdm";
sha256 = "09k25l7zy5ch3fk6qphni2h0rxdp8wacmfag1whi608dgimrhrnb";
};

nativeBuildInputs = [ pkgconfig ];
@@ -40,42 +48,45 @@ stdenv.mkDerivation rec {
"--with-scheduler-ram"
"--with-scheduler-stub"

] ++ stdenv.lib.optional (python2 != null) [
] ++ stdenv.lib.optional enablePython [
"--with-python=${python2}"
"--with-filter-python"
"--with-queue-python"
"--with-table-python"
"--with-scheduler-python"

] ++ stdenv.lib.optional (lua5 != null) [
] ++ stdenv.lib.optional enableLua [
"--with-lua=${pkgconfig}"
"--with-filter-lua"

] ++ stdenv.lib.optional (perl != null) [
] ++ stdenv.lib.optional enablePerl [
"--with-perl=${perl}"
"--with-filter-perl"

] ++ stdenv.lib.optional (mysql != null) [
] ++ stdenv.lib.optional enableMysql [
"--with-table-mysql"

] ++ stdenv.lib.optional (postgresql != null) [
] ++ stdenv.lib.optional enablePostgres [
"--with-table-postgres"

] ++ stdenv.lib.optional (sqlite != null) [
] ++ stdenv.lib.optional enableSqlite [
"--with-table-sqlite"

] ++ stdenv.lib.optional (hiredis != null) [
] ++ stdenv.lib.optional enableRedis [
"--with-table-redis"
];

NIX_CFLAGS_COMPILE = stdenv.lib.optional (hiredis != null) "-I${hiredis}/include/hiredis" ++
stdenv.lib.optional (mysql != null) "-L${mysql.connector-c}/lib/mysql";
NIX_CFLAGS_COMPILE =
stdenv.lib.optional enableRedis
"-I${hiredis}/include/hiredis -lhiredis"
++ stdenv.lib.optional enableMysql
"-L${mysql.connector-c}/lib/mysql";

meta = with stdenv.lib; {
homepage = https://www.opensmtpd.org/;
description = "Extra plugins for the OpenSMTPD mail server";
license = licenses.isc;
platforms = platforms.linux;
maintainers = with maintainers; [ gebner ];
maintainers = with maintainers; [ gebner ekleog ];
};
}