mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
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
This commit is contained in:
parent
1942f3c8f8
commit
5aca804758
1 changed files with 6 additions and 14 deletions
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, lib, fetchpatch, fetchurl, autoreconfHook, pkgconfig
|
{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig
|
||||||
, openssl, netcat-gnu, gnutls, gsasl, libidn, Security
|
, netcat-gnu, gnutls, gsasl, libidn2, Security
|
||||||
, withKeyring ? true, libsecret ? null
|
, withKeyring ? true, libsecret ? null
|
||||||
, systemd ? null }:
|
, systemd ? null }:
|
||||||
|
|
||||||
|
@ -10,26 +10,18 @@ let
|
||||||
in stdenv.mkDerivation rec {
|
in stdenv.mkDerivation rec {
|
||||||
pname = "msmtp";
|
pname = "msmtp";
|
||||||
name = "${pname}-${version}";
|
name = "${pname}-${version}";
|
||||||
version = "1.6.8";
|
version = "1.8.1";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://marlam.de/msmtp/releases/${name}.tar.xz";
|
url = "https://marlam.de/msmtp/releases/${name}.tar.xz";
|
||||||
sha256 = "1ysrnshvwhzwmvb2walw5i9jdzlvmckj7inr0xnvb26q0jirbzsm";
|
sha256 = "1nm4vizrnrrnknc4mc8nr7grz9q76m1vraa0hsl5rfm34gnsg8ph";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./paths.patch
|
./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 stdenv.isDarwin Security
|
||||||
++ stdenv.lib.optional withKeyring libsecret;
|
++ stdenv.lib.optional withKeyring libsecret;
|
||||||
|
|
||||||
|
@ -61,7 +53,7 @@ in stdenv.mkDerivation rec {
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
|
description = "Simple and easy to use SMTP client with excellent sendmail compatibility";
|
||||||
homepage = https://marlam.de/msmtp/;
|
homepage = https://marlam.de/msmtp/;
|
||||||
license = licenses.gpl3;
|
license = licenses.gpl3Plus;
|
||||||
maintainers = with maintainers; [ garbas peterhoeg ];
|
maintainers = with maintainers; [ garbas peterhoeg ];
|
||||||
platforms = platforms.unix;
|
platforms = platforms.unix;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue