From 15d826c92aa98e9be90b6a0f08cadee8f7396c3a Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Wed, 3 Jul 2024 13:28:38 +1200
Subject: [PATCH 1/3] aerc: migrate to pkgs/by-name

---
 .../aerc/default.nix => by-name/ae/aerc/package.nix}            | 0
 .../mailreaders => by-name/ae}/aerc/runtime-libexec.patch       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 3 files changed, 2 deletions(-)
 rename pkgs/{applications/networking/mailreaders/aerc/default.nix => by-name/ae/aerc/package.nix} (100%)
 rename pkgs/{applications/networking/mailreaders => by-name/ae}/aerc/runtime-libexec.patch (100%)

diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/by-name/ae/aerc/package.nix
similarity index 100%
rename from pkgs/applications/networking/mailreaders/aerc/default.nix
rename to pkgs/by-name/ae/aerc/package.nix
diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch b/pkgs/by-name/ae/aerc/runtime-libexec.patch
similarity index 100%
rename from pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch
rename to pkgs/by-name/ae/aerc/runtime-libexec.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df60be4c35fe..b5928b2eec53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1546,8 +1546,6 @@ with pkgs;
     wxGTK = wxGTK32;
   } // (config.aegisub or {}));
 
-  aerc = callPackage ../applications/networking/mailreaders/aerc { };
-
   aerospike = callPackage ../servers/nosql/aerospike { };
 
   aespipe = callPackage ../tools/security/aespipe { };

From 91a7a817969535d98cbdd0d3b926412629c962a7 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Wed, 3 Jul 2024 13:36:11 +1200
Subject: [PATCH 2/3] aerc: python3.pkgs -> python3Packages

---
 pkgs/by-name/ae/aerc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index f2f1a009bbe4..c0d08c324ba2 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -4,7 +4,7 @@
 , ncurses
 , notmuch
 , scdoc
-, python3
+, python3Packages
 , w3m
 , dante
 , gawk
@@ -26,7 +26,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [
     scdoc
-    python3.pkgs.wrapPython
+    python3Packages.wrapPython
   ];
 
   patches = [
@@ -45,10 +45,10 @@ buildGoModule rec {
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   pythonPath = [
-    python3.pkgs.vobject
+    python3Packages.vobject
   ];
 
-  buildInputs = [ python3 notmuch gawk ];
+  buildInputs = [ python3Packages.python notmuch gawk ];
 
   installPhase = ''
     runHook preInstall

From bf2b979c7114f8df93b54e41cd3fe21389fe9938 Mon Sep 17 00:00:00 2001
From: Jeremy Baxter <jeremy@baxters.nz>
Date: Wed, 3 Jul 2024 13:36:14 +1200
Subject: [PATCH 3/3] aerc: 0.17.0 -> 0.18.0

---
 pkgs/by-name/ae/aerc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index c0d08c324ba2..8392c7590cf4 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -12,17 +12,17 @@
 
 buildGoModule rec {
   pname = "aerc";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromSourcehut {
     owner = "~rjarry";
     repo = "aerc";
     rev = version;
-    hash = "sha256-XpVUUAtm6o4DXIouTKRX/8mLERb/4nA+VUGeB21mfjE=";
+    hash = "sha256-azIgf9kv4Pg8BW1j56D2Ta1DIQNHC9Mql3tebp+MLSY=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-AHEhIWa6PP8f+hhIdY+0brLF2HYhvTal7qXfCwG9iyo=";
+  vendorHash = "sha256-BQ36LJFo9bQNQdwb/vygksk3ih/tVaMwfWT1f31bsbY=";
 
   nativeBuildInputs = [
     scdoc