From 3ba85eaedcf6dc321dce390b93de61a89616fa0a Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 2 Oct 2024 19:47:17 +0200
Subject: [PATCH 1/2] neomutt: 20240425 -> 20241002

---
 .../networking/mailreaders/neomutt/default.nix           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index 5a94137ea2f3..d5cfad3eae60 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -35,15 +35,17 @@
   withContrib ? true,
 }:
 
+assert lib.warnIf (enableMixmaster) "Support for mixmaster has been removed from neomutt since the 20241002 release" true;
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "neomutt";
-  version = "20240425";
+  version = "20241002";
 
   src = fetchFromGitHub {
     owner = "neomutt";
     repo = "neomutt";
     rev = finalAttrs.version;
-    hash = "sha256-QBqPFteoAm3AdQN0XTWpho8DEW2BFCCzBcHUZIiSxyQ=";
+    hash = "sha256-c8G0CGg4jrwq+HVR4O0AtaJNzr7pDYsie1410tisLEY=";
   };
 
   buildInputs = [
@@ -112,8 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
       "--zlib"
     ]
     ++ lib.optional enableZstd "--zstd"
-    ++ lib.optional enableLua "--lua"
-    ++ lib.optional enableMixmaster "--mixmaster";
+    ++ lib.optional enableLua "--lua";
 
   postInstall =
     ''

From c86a47bb5a4d59d5b80951f0103081392f77d075 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Wed, 2 Oct 2024 20:31:35 +0200
Subject: [PATCH 2/2] neomutt: format with nixfmt

---
 .../mailreaders/neomutt/default.nix           | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/neomutt/default.nix b/pkgs/applications/networking/mailreaders/neomutt/default.nix
index d5cfad3eae60..a34b8f8f6ca7 100644
--- a/pkgs/applications/networking/mailreaders/neomutt/default.nix
+++ b/pkgs/applications/networking/mailreaders/neomutt/default.nix
@@ -35,7 +35,9 @@
   withContrib ? true,
 }:
 
-assert lib.warnIf (enableMixmaster) "Support for mixmaster has been removed from neomutt since the 20241002 release" true;
+assert lib.warnIf (
+  enableMixmaster
+) "Support for mixmaster has been removed from neomutt since the 20241002 release" true;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "neomutt";
@@ -97,24 +99,21 @@ stdenv.mkDerivation (finalAttrs: {
       --replace /etc/mime.types ${mailcap}/etc/mime.types
   '';
 
-  configureFlags =
-    [
-      "--enable-autocrypt"
-      "--gpgme"
-      "--gss"
-      "--lmdb"
-      "--notmuch"
-      "--ssl"
-      "--sasl"
-      "--with-homespool=mailbox"
-      "--with-mailpath="
-      # To make it not reference .dev outputs. See:
-      # https://github.com/neomutt/neomutt/pull/2367
-      "--disable-include-path-in-cflags"
-      "--zlib"
-    ]
-    ++ lib.optional enableZstd "--zstd"
-    ++ lib.optional enableLua "--lua";
+  configureFlags = [
+    "--enable-autocrypt"
+    "--gpgme"
+    "--gss"
+    "--lmdb"
+    "--notmuch"
+    "--ssl"
+    "--sasl"
+    "--with-homespool=mailbox"
+    "--with-mailpath="
+    # To make it not reference .dev outputs. See:
+    # https://github.com/neomutt/neomutt/pull/2367
+    "--disable-include-path-in-cflags"
+    "--zlib"
+  ] ++ lib.optional enableZstd "--zstd" ++ lib.optional enableLua "--lua";
 
   postInstall =
     ''