From a6abec9c660eaaf8a9885c235dda1eaeaa466286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Wed, 16 Jan 2019 13:13:27 +0100 Subject: [PATCH] mailutils: use system-sendmail instead of sendmailPath system-sendmail allows all sendmail's to be auto-detected, including on non-NixOS systems. This is, to me, a better UX than having to manually override the sendmailPath argument. In exchange, it is a breach of retro-compatibility. Given right now I can't see any uses for sendmailPath other than what is supported by system-sendmail, I didn't keep it, but it'd be possible to allow sendmailPath to override the choice of sendmail from system-sendmail. --- nixos/doc/manual/release-notes/rl-1903.xml | 8 ++++++++ pkgs/tools/networking/mailutils/default.nix | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml index daa47ad0595..428f9bef5fb 100644 --- a/nixos/doc/manual/release-notes/rl-1903.xml +++ b/nixos/doc/manual/release-notes/rl-1903.xml @@ -387,6 +387,14 @@ root CA (for example Let's Encrypt). + + + mailutils now works by default when + sendmail is not in a setuid wrapper. As a consequence, + the sendmailPath argument, having lost its main use, has + been removed. + + diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index d6c67005295..f507e4dc287 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchpatch, autoreconfHook, dejagnu, gettext, pkgconfig , gdbm, pam, readline, ncurses, gnutls, guile, texinfo, gnum4, sasl, fribidi, nettools -, python, gss, mysql, sendmailPath ? "/run/wrappers/bin/sendmail" }: +, python, gss, mysql, system-sendmail }: stdenv.mkDerivation rec { name = "${project}-${version}"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { "--with-gssapi" "--with-gsasl" "--with-mysql" - "--with-path-sendmail=${sendmailPath}" + "--with-path-sendmail=${system-sendmail}/bin/sendmail" ]; readmsg-tests = let