diff options
author | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-02-13 13:28:04 +0000 |
---|---|---|
committer | Pascal Wittmann <PascalWittmann@gmx.net> | 2015-02-13 13:28:04 +0000 |
commit | d7b01c8526a7c7ee4cb489f124429297d19ccd04 (patch) | |
tree | 15a4aa3777571b8a422fad308ebef1eba4041bdd | |
parent | c6252250d88adaf4ece1b2fd7019eddd56cb2d3d (diff) | |
parent | 3bc7dfdf22c643b531acfbce4b0ad6b46a5bc796 (diff) | |
download | nixpkgs-d7b01c8526a7c7ee4cb489f124429297d19ccd04.tar nixpkgs-d7b01c8526a7c7ee4cb489f124429297d19ccd04.tar.gz nixpkgs-d7b01c8526a7c7ee4cb489f124429297d19ccd04.tar.bz2 nixpkgs-d7b01c8526a7c7ee4cb489f124429297d19ccd04.tar.lz nixpkgs-d7b01c8526a7c7ee4cb489f124429297d19ccd04.tar.xz nixpkgs-d7b01c8526a7c7ee4cb489f124429297d19ccd04.tar.zst nixpkgs-d7b01c8526a7c7ee4cb489f124429297d19ccd04.zip |
Merge pull request #6325 from k0ral/opensmtpd
opensmtpd: 5.4.2p1 -> 5.4.4p1
-rw-r--r-- | pkgs/development/libraries/libasr/default.nix | 20 | ||||
-rw-r--r-- | pkgs/servers/mail/opensmtpd/default.nix | 14 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
3 files changed, 29 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libasr/default.nix b/pkgs/development/libraries/libasr/default.nix new file mode 100644 index 00000000000..f4c9cc8c5e0 --- /dev/null +++ b/pkgs/development/libraries/libasr/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, libevent, openssl }: + +stdenv.mkDerivation rec { + name = "libasr-${version}"; + version= "1.0.1"; + + src = fetchurl { + url = "https://www.opensmtpd.org/archives/${name}.tar.gz"; + sha256 = "10h1c9b58msbggns8k2m0857zmbldb0x8ghk3aay88yn2bip2916"; + }; + + buildInputs = [ libevent openssl ]; + + meta = with stdenv.lib; { + homepage = https://github.com/OpenSMTPD/libasr; + description = "Free, simple and portable asynchronous resolver library."; + license = licenses.isc; + maintainers = [ maintainers.koral ]; + }; +} diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 8cabb8cac94..d2c19a2a00b 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, libevent, zlib, openssl, db, bison, pam }: +{ stdenv, fetchurl, libasr, libevent, zlib, openssl, db, bison, pam }: stdenv.mkDerivation rec { name = "opensmtpd-${version}"; - version = "5.4.2p1"; + version = "5.4.4p1"; - buildInputs = [ libevent zlib openssl db bison pam ]; + buildInputs = [ libasr libevent zlib openssl db bison pam ]; src = fetchurl { url = "http://www.opensmtpd.org/archives/${name}.tar.gz"; - sha256 = "18nrzfjhv9znb5dbhc5k3fi31a3vr1r8j36q3fzghkh47n6z9yjg"; - }; + sha256 = "1gcfdmpkk892wnnhwc2nb559bwl3k892w7saj4q8m6jfll53660i"; + }; - configureFlags = [ + configureFlags = [ "--with-mantype=doc" "--with-pam" "--without-bsd-auth" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--with-privsep-user=smtpd" "--with-queue-user=smtpq" "--with-ca-file=/etc/ssl/certs/ca-bundle.crt" - ]; + ]; meta = { homepage = https://www.opensmtpd.org/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ca3bfbeb5f9..a40f943f99d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5966,6 +5966,8 @@ let libarchive = callPackage ../development/libraries/libarchive { }; + libasr = callPackage ../development/libraries/libasr { }; + libass = callPackage ../development/libraries/libass { }; libassuan1 = callPackage ../development/libraries/libassuan1 { }; |