From 4f17832abfdd15cd05fab04b3eec607896fe1e18 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 26 Apr 2020 01:08:31 +0200
Subject: [PATCH] msmtp: 1.8.8 -> 1.8.10 (#86027)

This update contains the full fix for the unfortunate and very annoying
msmtpq regression [0]. #YAY
This successfully reduces the amount of spam my setup generates :)
(Note: SCNR)

Relevant patches:
- https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071
- https://github.com/marlam/msmtp-mirror/commit/dfb39595a5cdf048db4dfc438333a2b8948c5296

[0]: https://marlam.de/msmtp/news/
---
 pkgs/applications/networking/msmtp/default.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 0117ab978cc..9e990dcdf33 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fetchpatch, autoreconfHook, pkgconfig, texinfo
+{ stdenv, lib, fetchurl, autoreconfHook, pkgconfig, texinfo
 , netcat-gnu, gnutls, gsasl, libidn2, Security
 , withKeyring ? true, libsecret ? null
 , systemd ? null }:
@@ -9,20 +9,15 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "msmtp";
-  version = "1.8.8";
+  version = "1.8.10";
 
   src = fetchurl {
     url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz";
-    sha256 = "1rarck61mz3mwg0l30vjj6j9fq6gc7gic0r1c1ppwpq2izj57jzc";
+    sha256 = "041g921rdjiv8bapp61gp4rylq8cckfkcwzyh8bs7xwxs4wpzfna";
   };
 
-  # the 2nd patch should go when 1.8.9 is released
   patches = [
     ./paths.patch
-    (fetchpatch {
-      url = "https://github.com/marlam/msmtp-mirror/commit/c78f24347ec996c7a3830b48403bf3736afca071.patch";
-      sha256 = "0d4sc2f5838jriv65wahpgvwckkzqhdk3hs660fyg80si2i0l1bx";
-    })
   ];
 
   buildInputs = [ gnutls gsasl libidn2 ]