From c4e7a4e71512a20fb5070d119d95a6a8149b86b7 Mon Sep 17 00:00:00 2001
From: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
Date: Wed, 17 May 2023 00:34:20 +0200
Subject: aerc: 0.14.0 -> 0.15.2

In aerc commit 04303172d4f9, filters were moved from $PREFIX/share to
$PREFIX/libexec. Adapt the patch to handle this.

Remove unused Python dependency - colorama. It was previously used by
hldiff and plaintext filters, however this dependency disappeared when
they were replaced with AWK-based ones.

Add new Python dependency - vobject required by the show-ics-details.py
filter.
---
 .../networking/mailreaders/aerc/default.nix           | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'pkgs/applications/networking/mailreaders/aerc/default.nix')

diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index 9ffdb16301075..0ee5228d12195 100644
--- a/pkgs/applications/networking/mailreaders/aerc/default.nix
+++ b/pkgs/applications/networking/mailreaders/aerc/default.nix
@@ -12,17 +12,17 @@
 
 buildGoModule rec {
   pname = "aerc";
-  version = "0.14.0";
+  version = "0.15.2";
 
   src = fetchFromSourcehut {
     owner = "~rjarry";
     repo = "aerc";
     rev = version;
-    hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg=";
+    hash = "sha256-OQDA4AHDcAdDzpwNSi8rW1FKjfYaFktOwiM0FEHPd70=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M=";
+  vendorHash = "sha256-NWOySC0czNgNOakpxFguZLtmEI7AvjJQKXDE2vFWeZg=";
 
   doCheck = false;
 
@@ -32,19 +32,22 @@ buildGoModule rec {
   ];
 
   patches = [
-    ./runtime-sharedir.patch
+    ./runtime-libexec.patch
   ];
 
   postPatch = ''
     substituteAllInPlace config/aerc.conf
     substituteAllInPlace config/config.go
     substituteAllInPlace doc/aerc-config.5.scd
+
+    # Prevent buildGoModule from trying to build this
+    rm contrib/linters.go
   '';
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   pythonPath = [
-    python3.pkgs.colorama
+    python3.pkgs.vobject
   ];
 
   buildInputs = [ python3 notmuch gawk ];
@@ -60,11 +63,11 @@ buildGoModule rec {
   postFixup = ''
     wrapProgram $out/bin/aerc \
       --prefix PATH ":" "${lib.makeBinPath [ ncurses ]}"
-    wrapProgram $out/share/aerc/filters/html \
+    wrapProgram $out/libexec/aerc/filters/html \
       --prefix PATH ":"  ${lib.makeBinPath [ w3m dante ]}
-    wrapProgram $out/share/aerc/filters/html-unsafe \
+    wrapProgram $out/libexec/aerc/filters/html-unsafe \
       --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]}
-    patchShebangs $out/share/aerc/filters
+    patchShebangs $out/libexec/aerc/filters
   '';
 
   meta = with lib; {
-- 
cgit 1.4.1