From da2a5558ab0416ba1c2ddb1c454cdcfc3c05af60 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Tue, 22 Mar 2022 11:20:58 +0100
Subject: [PATCH 1/2] alot: fix ModuleNotFoundError of '_notmuch_config'

---
 pkgs/applications/networking/mailreaders/alot/notmuch.nix  | 6 ++++++
 .../networking/mailreaders/notmuch/default.nix             | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/mailreaders/alot/notmuch.nix b/pkgs/applications/networking/mailreaders/alot/notmuch.nix
index bd195b52d44e..5d74270a58c2 100644
--- a/pkgs/applications/networking/mailreaders/alot/notmuch.nix
+++ b/pkgs/applications/networking/mailreaders/alot/notmuch.nix
@@ -14,6 +14,12 @@ buildPythonPackage {
 
   buildInputs = [ python notmuch cffi ];
 
+  # since notmuch 0.35, this package expects _notmuch_config.py that is
+  # generated by notmuch's configure script
+  postPatch = ''
+    cp ${notmuch.bindingconfig}/_notmuch_config.py .
+  '';
+
   # no tests
   doCheck = false;
   pythonImportsCheck = [ "notmuch2" ];
diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix
index 184804a87888..e89216802e50 100644
--- a/pkgs/applications/networking/mailreaders/notmuch/default.nix
+++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix
@@ -62,7 +62,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   makeFlags = [ "V=1" ];
 
-  outputs = [ "out" "man" "info" ]
+  postConfigure = ''
+    mkdir ${placeholder "bindingconfig"}
+    cp bindings/python-cffi/_notmuch_config.py ${placeholder "bindingconfig"}/
+  '';
+
+  outputs = [ "out" "man" "info" "bindingconfig" ]
     ++ lib.optional withEmacs "emacs"
     ++ lib.optional withRuby "ruby";
 

From 3d635629bece87df5088b3dc698b5dc6fe494cf0 Mon Sep 17 00:00:00 2001
From: Rien Maertens <rien.maertens@posteo.be>
Date: Wed, 23 Mar 2022 11:04:27 +0100
Subject: [PATCH 2/2] python3Packages.notmuch2: init at 0.35

---
 pkgs/applications/networking/mailreaders/alot/default.nix | 8 +-------
 .../python-modules/notmuch2/default.nix}                  | 0
 pkgs/top-level/python-packages.nix                        | 4 ++++
 3 files changed, 5 insertions(+), 7 deletions(-)
 rename pkgs/{applications/networking/mailreaders/alot/notmuch.nix => development/python-modules/notmuch2/default.nix} (100%)

diff --git a/pkgs/applications/networking/mailreaders/alot/default.nix b/pkgs/applications/networking/mailreaders/alot/default.nix
index 3d09711fb3cc..cb49829dce07 100644
--- a/pkgs/applications/networking/mailreaders/alot/default.nix
+++ b/pkgs/applications/networking/mailreaders/alot/default.nix
@@ -9,13 +9,7 @@
 , withManpage ? false
 }:
 
-with python3.pkgs;
-let
-  notmuch2 = callPackage ./notmuch.nix {
-    inherit notmuch;
-  };
-in
-buildPythonApplication rec {
+with python3.pkgs; buildPythonApplication rec {
   pname = "alot";
   version = "0.10";
 
diff --git a/pkgs/applications/networking/mailreaders/alot/notmuch.nix b/pkgs/development/python-modules/notmuch2/default.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/alot/notmuch.nix
rename to pkgs/development/python-modules/notmuch2/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5d436ccd528..f688567d415e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5606,6 +5606,10 @@ in {
     inherit (pkgs) notmuch;
   };
 
+  notmuch2 = callPackage ../development/python-modules/notmuch2 {
+    inherit (pkgs) notmuch;
+  };
+
   nototools = callPackage ../data/fonts/noto-fonts/tools.nix { };
 
   notus-scanner = callPackage ../development/python-modules/notus-scanner { };