diff options
author | Fabián Heredia Montiel <303897+fabianhjr@users.noreply.github.com> | 2023-11-14 21:24:05 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-14 21:24:05 -0600 |
commit | 486911d06452f5c3c174bac3686ce79840f7eac4 (patch) | |
tree | 4e669a128b16bf3ba4ff47cc31b49d99b2cd595d | |
parent | 3e9437c1bf97d7d3e9deb05052b82549d8d1b90c (diff) | |
parent | c47c50fd8c75f930ad3c52e144cffe91855caa0a (diff) | |
download | nixpkgs-486911d06452f5c3c174bac3686ce79840f7eac4.tar nixpkgs-486911d06452f5c3c174bac3686ce79840f7eac4.tar.gz nixpkgs-486911d06452f5c3c174bac3686ce79840f7eac4.tar.bz2 nixpkgs-486911d06452f5c3c174bac3686ce79840f7eac4.tar.lz nixpkgs-486911d06452f5c3c174bac3686ce79840f7eac4.tar.xz nixpkgs-486911d06452f5c3c174bac3686ce79840f7eac4.tar.zst nixpkgs-486911d06452f5c3c174bac3686ce79840f7eac4.zip |
Merge pull request #265641 from vifino/opensmtpd-7.4.0p0
opensmtpd: 6.8.0p2 -> 7.4.0p0
-rw-r--r-- | pkgs/servers/mail/opensmtpd/default.nix | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 3bac9e0c6ef..f93bc857116 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -1,30 +1,40 @@ -{ lib, stdenv, fetchurl, autoconf, automake, libtool, bison -, libasr, libevent, zlib, libressl, db, pam, libxcrypt, nixosTests +{ lib +, stdenv +, fetchurl +, autoreconfHook +, autoconf-archive +, pkgconf +, libtool +, bison +, libasr +, libevent +, zlib +, libressl +, db +, pam +, libxcrypt +, nixosTests }: stdenv.mkDerivation rec { pname = "opensmtpd"; - version = "6.8.0p2"; + version = "7.4.0p0"; - nativeBuildInputs = [ autoconf automake libtool bison ]; - buildInputs = [ libasr libevent zlib libressl db pam libxcrypt ]; + nativeBuildInputs = [ autoreconfHook autoconf-archive pkgconf libtool bison ]; + buildInputs = [ libevent zlib libressl db pam libxcrypt ]; src = fetchurl { url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz"; - sha256 = "05sd7bmq29ibnqbl2z53hiyprfxzf0qydfdaixs68rz55wqhbgsi"; + hash = "sha256-wYHMw0NKEeWDYZ4AAoUg1Ff+Bi403AO+6jWAeCIM43Q="; }; patches = [ ./proc_path.diff # TODO: upstream to OpenSMTPD, see https://github.com/NixOS/nixpkgs/issues/54045 - ./cross_fix.diff # TODO: remove when https://github.com/OpenSMTPD/OpenSMTPD/pull/1177 will have made it into a release ]; - # See https://github.com/OpenSMTPD/OpenSMTPD/issues/885 for the `sh bootstrap` - # requirement postPatch = '' substituteInPlace mk/smtpctl/Makefile.am --replace "chgrp" "true" substituteInPlace mk/smtpctl/Makefile.am --replace "chmod 2555" "chmod 0555" - sh bootstrap ''; configureFlags = [ @@ -43,9 +53,6 @@ stdenv.mkDerivation rec { "--with-table-db" ]; - # See https://github.com/OpenSMTPD/OpenSMTPD/pull/884 - makeFlags = [ "CFLAGS=-ffunction-sections" "LDFLAGS=-Wl,--gc-sections" ]; - installFlags = [ "sysconfdir=\${out}/etc" "localstatedir=\${TMPDIR}" @@ -59,7 +66,7 @@ stdenv.mkDerivation rec { ''; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ obadz ekleog ]; + maintainers = with maintainers; [ obadz ekleog vifino ]; }; passthru.tests = { basic-functionality-and-dovecot-interaction = nixosTests.opensmtpd; |