Merge pull request #209069 from sikmir/aerc

aerc: 0.13.0 → 0.14.0

2 files changed, 48 insertions, 54 deletions

diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix
index ddc0f4b932ad..9ffdb1630107 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.13.0";
+  version = "0.14.0";
 
   src = fetchFromSourcehut {
     owner = "~rjarry";
     repo = "aerc";
     rev = version;
-    hash = "sha256-pUp/hW4Kk3pixGfbQvphLJM9Dc/w01T1KPRewOicPqM=";
+    hash = "sha256-qC7lNqjgljUqRUp+S7vBVLPyRB3+Ie5UOxuio+Q88hg=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-Nx+k0PLPIx7Ia0LobXUOw7oOFVz1FXV49haAkRAVOcM=";
+  vendorHash = "sha256-MVek3TQpE3AChGyQ4z01fLfkcGKJcckmFV21ww9zT7M=";
 
   doCheck = false;
 
diff --git a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
index d5e40edeb661..9dee3ed33d84 100644
--- a/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
+++ b/pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
@@ -1,8 +1,8 @@
-diff --git a/config/aerc.conf b/config/aerc.conf
-index fbbf587..ede1a03 100644
---- a/config/aerc.conf
-+++ b/config/aerc.conf
-@@ -107,8 +107,7 @@ next-message-on-delete=true
+diff --git i/config/aerc.conf w/config/aerc.conf
+index 05ebbf4..db6877b 100644
+--- i/config/aerc.conf
++++ w/config/aerc.conf
+@@ -152,8 +152,7 @@
  #
  #   ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
  #   ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
@@ -10,9 +10,9 @@ index fbbf587..ede1a03 100644
 -#   /usr/share/aerc/stylesets
 +#   @out@/share/aerc/stylesets
  #
- # default: ""
- stylesets-dirs=
-@@ -254,8 +253,7 @@ new-email=
+ #stylesets-dirs=
+ 
+@@ -445,8 +444,7 @@ message/rfc822=colorize
  #
  #   ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
  #   ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
@@ -20,37 +20,27 @@ index fbbf587..ede1a03 100644
 -#   /usr/share/aerc/templates
 +#   @out@/share/aerc/templates
  #
- # default: ""
- template-dirs=
-diff --git a/config/config.go b/config/config.go
-index 2120310..92b7655 100644
---- a/config/config.go
-+++ b/config/config.go
-@@ -331,8 +331,8 @@ func buildDefaultDirs() []string {
+ #template-dirs=
+ 
+diff --git i/config/config.go w/config/config.go
+index 09fb5ef..c73a7ee 100644
+--- i/config/config.go
++++ w/config/config.go
+@@ -60,8 +60,7 @@ func buildDefaultDirs() []string {
  	}
  
  	// Add fixed fallback locations
 -	defaultDirs = append(defaultDirs, "/usr/local/share/aerc")
 -	defaultDirs = append(defaultDirs, "/usr/share/aerc")
-+	defaultDirs = append(defaultDirs, "@out@/local/share/aerc")
 +	defaultDirs = append(defaultDirs, "@out@/share/aerc")
  
  	return defaultDirs
  }
-diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
-index 885c4f8..77a853e 100644
---- a/doc/aerc-config.5.scd
-+++ b/doc/aerc-config.5.scd
-@@ -12,7 +12,7 @@ account credentials. We look for these files in your XDG config home plus
- "aerc", which defaults to ~/.config/aerc.
- 
- Examples of these config files are typically included with your installation of
--aerc and are usually installed in /usr/share/aerc.
-+aerc and are usually installed in @out@/share/aerc.
- 
- Each file uses the _ini_ format, and consists of sections with keys and values.
- A line beginning with # is considered a comment and ignored, as are empty lines.
-@@ -221,8 +221,7 @@ These options are configured in the *[ui]* section of aerc.conf.
+diff --git i/doc/aerc-config.5.scd w/doc/aerc-config.5.scd
+index d48e38a..39784c4 100644
+--- i/doc/aerc-config.5.scd
++++ w/doc/aerc-config.5.scd
+@@ -279,8 +279,7 @@ These options are configured in the *[ui]* section of _aerc.conf_.
  	```
  	${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
  	${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
@@ -59,26 +49,8 @@ index 885c4f8..77a853e 100644
 +	@out@/share/aerc/stylesets
  	```
  
- 	Default: ""
-@@ -381,7 +380,7 @@ against (non-case-sensitive) and a comma, e.g. subject,text will match a
- subject which contains "text". Use header,~regex to match against a regex.
- 
- aerc ships with some default filters installed in the share directory (usually
--_/usr/share/aerc/filters_). Note that these may have additional dependencies
-+_@out@/share/aerc/filters_). Note that these may have additional dependencies
- that aerc does not have alone.
- 
- ## TRIGGERS
-@@ -407,7 +406,7 @@ and forward commands can be called with the -T flag with the name of the
- template name.
- 
- aerc ships with some default templates installed in the share directory (usually
--_/usr/share/aerc/templates_).
-+_@out@/share/aerc/templates_).
- 
- These options are configured in the *[templates]* section of aerc.conf.
- 
-@@ -419,8 +418,7 @@ These options are configured in the *[templates]* section of aerc.conf.
+ *styleset-name* = _<string>_
+@@ -822,8 +821,7 @@ These options are configured in the *[templates]* section of _aerc.conf_.
  	```
  	${XDG_CONFIG_HOME:-~/.config}/aerc/templates
  	${XDG_DATA_HOME:-~/.local/share}/aerc/templates
@@ -87,4 +59,26 @@ index 885c4f8..77a853e 100644
 +	@out@/share/aerc/templates
  	```
  
- 	Default: ""
+ *new-message* = _<template_name>_
+diff --git i/doc/aerc-templates.7.scd w/doc/aerc-templates.7.scd
+index 6c9e319..0ef97ce 100644
+--- i/doc/aerc-templates.7.scd
++++ w/doc/aerc-templates.7.scd
+@@ -111,7 +111,7 @@ aerc provides the following additional functions:
+ 	Execute external command, provide the second argument to its stdin.
+ 
+ 	```
+-	{{exec `/usr/local/share/aerc/filters/html` .OriginalText}}
++	{{exec `@out@/share/aerc/filters/html` .OriginalText}}
+ 	```
+ 
+ *toLocal*
+@@ -142,7 +142,7 @@ aerc provides the following additional functions:
+ 	Example: Automatic HTML parsing for text/html mime type messages
+ 	```
+ 	{{if eq .OriginalMIMEType "text/html"}}
+-	{{exec `/usr/local/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}
++	{{exec `@out@/share/aerc/filters/html` .OriginalText | wrap 72 | quote}}
+ 	{{else}}
+ 	{{wrap 72 .OriginalText | quote}}
+ 	{{end}}