From 593a8d9c81021348dd6594ca55e2b0a65998d8e0 Mon Sep 17 00:00:00 2001
From: archer-65 <mario.liguori.056@gmail.com>
Date: Tue, 11 Apr 2023 12:37:02 +0200
Subject: [PATCH 1/2] lieer: 1.3 -> 1.4

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

diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix
index a9bf177128d5..b0b8a709a05e 100644
--- a/pkgs/applications/networking/lieer/default.nix
+++ b/pkgs/applications/networking/lieer/default.nix
@@ -2,17 +2,17 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "lieer";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "gauteh";
     repo = "lieer";
     rev = "v${version}";
-    sha256 = "12sl7d381l1gjaam419xc8gxmsprxf0hgksz1f974qmmijvr02bh";
+    sha256 = "sha256-2LujfvsxMHHmYjYOnLJaLdSlzDeej+ehUr4YfVe903U=";
   };
 
   propagatedBuildInputs = with python3Packages; [
-    notmuch
+    notmuch2
     oauth2client
     google-api-python-client
     tqdm

From 9e111b2820c3b6ec887999401fb826a82deacf8f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 30 Jun 2023 11:10:19 +0200
Subject: [PATCH 2/2] lieer: add format

- equalize content
---
 pkgs/applications/networking/lieer/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/lieer/default.nix b/pkgs/applications/networking/lieer/default.nix
index b0b8a709a05e..a8a0e5e302a4 100644
--- a/pkgs/applications/networking/lieer/default.nix
+++ b/pkgs/applications/networking/lieer/default.nix
@@ -1,13 +1,17 @@
-{ lib, fetchFromGitHub, python3Packages }:
+{ lib
+, fetchFromGitHub
+, python3Packages
+}:
 
 python3Packages.buildPythonApplication rec {
   pname = "lieer";
   version = "1.4";
+  format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "gauteh";
     repo = "lieer";
-    rev = "v${version}";
+    rev = "refs/tags/v${version}";
     sha256 = "sha256-2LujfvsxMHHmYjYOnLJaLdSlzDeej+ehUr4YfVe903U=";
   };
 
@@ -21,7 +25,10 @@ python3Packages.buildPythonApplication rec {
 
   # no tests
   doCheck = false;
-  pythonImportsCheck = [ "lieer" ];
+
+  pythonImportsCheck = [
+    "lieer"
+  ];
 
   meta = with lib; {
     description = "Fast email-fetching and two-way tag synchronization between notmuch and GMail";