From 41723ef2905210e5e2d7960f3f3393e6c26655da Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 10 Jan 2018 02:03:48 +0100
Subject: [PATCH 1/3] notmuch: 0.25.3 -> 0.26

---
 .../applications/networking/mailreaders/notmuch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 079e1b7927c..2e394c4eb4f 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -12,7 +12,7 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "0.25.3";
+  version = "0.26";
   name = "notmuch-${version}";
 
   passthru = {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://notmuchmail.org/releases/${name}.tar.gz";
-    sha256 = "1fyx20rjpwbf2j1v5fpa5s0rjnwhcgvijzh2qyinp8rlbh1qxmab";
+    sha256 = "1pvn1n7giv8n3xlazi3wpscdqhd2yak0fgv68aj23myr5bnr9s6k";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
         "{}" ";"
 
     for src in \
-      crypto.c \
+      util/crypto.c \
       notmuch-config.c \
       emacs/notmuch-crypto.el
     do

From bb319eded6b3632f322317a1740fdd62fd96d708 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 10 Jan 2018 02:15:50 +0100
Subject: [PATCH 2/3] notmuch: stop trying to patch gpg paths in
 emacs/notmuch-crypto.el
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was fixed upstream in f0d06c8ca3fce15c9e264445485bd93a6de8d25e, by
using epg-gpg-program instead of `(call-process epg-gpg-program …)` as
before.
---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 2e394c4eb4f..7c074ffbbf9 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -47,8 +47,7 @@ stdenv.mkDerivation rec {
 
     for src in \
       util/crypto.c \
-      notmuch-config.c \
-      emacs/notmuch-crypto.el
+      notmuch-config.c
     do
       substituteInPlace "$src" \
         --replace \"gpg\" \"${gnupg}/bin/gpg\"

From 32d33177ea5b9791b7ec2c1264327aacfd0f0a4f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 10 Jan 2018 02:19:06 +0100
Subject: [PATCH 3/3] notmuch: add myself as maintainer

---
 pkgs/applications/networking/mailreaders/notmuch/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 7c074ffbbf9..0c0f55e6337 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -96,7 +96,7 @@ stdenv.mkDerivation rec {
     description = "Mail indexer";
     homepage    = https://notmuchmail.org/;
     license     = licenses.gpl3;
-    maintainers = with maintainers; [ chaoflow garbas the-kenny ];
+    maintainers = with maintainers; [ chaoflow flokli garbas the-kenny ];
     platforms   = platforms.unix;
   };
 }