philipp
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

msmtp: 1.6.8 -> 1.8.1 (#51693) 

* msmtp: 1.6.8 -> 1.8.0

https://marlam.de/msmtp/news/msmtp-1-8-0/

Uses libidn2 now instead of libidn.

* msmtp: 1.8.0 -> 1.8.1

* msmtp: drop openssl per upstream recommendation

... and reviewer request :)

See:
https://github.com/NixOS/nixpkgs/pull/51693#pullrequestreview-182938553
gstqt5
Will Dietz 2018-12-16 12:06:23 -06:00 committed by Renaud
parent 1942f3c8f8
commit 5aca804758
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/applications/networking/msmtp/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, lib, fetchpatch, fetchurl, autoreconfHook, pkgconfig
, openssl, netcat-gnu, gnutls, gsasl, libidn, Security
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
, netcat-gnu, gnutls, gsasl, libidn2, Security
, withKeyring ? true, libsecret ? null
, systemd ? null }:
@ -10,26 +10,18 @@ let
in stdenv.mkDerivation rec {
pname = "msmtp";
name = "${pname}-${version}";
version = "1.6.8";
version = "1.8.1";
src = fetchurl {
url = "https://marlam.de/msmtp/releases/${name}.tar.xz";
sha256 = "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm";
sha256 = "1nm4vizrnrrnknc4mc8nr7grz9q76m1vraa0hsl5rfm34gnsg8ph";
};
patches = [
./paths.patch
# To support passwordeval commands that do not print a final
# newline.
(fetchpatch {
name = "passwordeval-without-nl.patch";
url = "https://gitlab.marlam.de/marlam/msmtp/commit/df22dccf9d1af06fcd09dfdd0d6a38e1372dd5e8.patch";
sha256 = "06gbhvzi46zqigmmsin2aard7b9v3ihx62hbz5ljmfbj9rfs1x5y";
})
];
buildInputs = [ openssl gnutls gsasl libidn ]
buildInputs = [ gnutls gsasl libidn2 ]
++ stdenv.lib.optional stdenv.isDarwin Security
++ stdenv.lib.optional withKeyring libsecret;
@ -61,7 +53,7 @@ in stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
homepage = https://marlam.de/msmtp/;
license = licenses.gpl3;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ garbas peterhoeg ];
platforms = platforms.unix;
};