b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

aerc: 0.14.0 -> 0.15.2

Browse source 
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.
This commit is contained in:
Hubert Jasudowicz 2023-05-17 00:34:20 +02:00
parent 2ce64f86a2
commit c4e7a4e715
3 changed files with 98 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
pkgs/applications/networking/mailreaders/aerc/default.nix
View file

@ -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; {

87
pkgs/applications/networking/mailreaders/aerc/runtime-libexec.patch Normal file
View file

@ -0,0 +1,87 @@
diff --git a/config/aerc.conf b/config/aerc.conf
index 7d33b43..4315f0e 100644
--- a/config/aerc.conf
+++ b/config/aerc.conf
@@ -202,8 +202,7 @@
#
# ${XDG_CONFIG_HOME:-~/.config}/aerc/stylesets
# ${XDG_DATA_HOME:-~/.local/share}/aerc/stylesets
-# /usr/local/share/aerc/stylesets
-# /usr/share/aerc/stylesets
+# @out@/share/aerc/stylesets
#
#stylesets-dirs=
@@ -547,8 +546,7 @@ message/rfc822=colorize
#
# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
-# /usr/local/share/aerc/templates
-# /usr/share/aerc/templates
+# @out@/share/aerc/templates
#
#template-dirs=
diff --git a/config/config.go b/config/config.go
index d70bcfe..c19e59a 100644
--- a/config/config.go
+++ b/config/config.go
@@ -54,10 +54,8 @@ func buildDefaultDirs() []string {
}
// Add fixed fallback locations
- defaultDirs = append(defaultDirs, "/usr/local/libexec/aerc")
- defaultDirs = append(defaultDirs, "/usr/local/share/aerc")
- defaultDirs = append(defaultDirs, "/usr/libexec/aerc")
- defaultDirs = append(defaultDirs, "/usr/share/aerc")
+ defaultDirs = append(defaultDirs, "@out@/libexec/aerc")
+ defaultDirs = append(defaultDirs, "@out@/share/aerc")
return defaultDirs
}
diff --git a/doc/aerc-config.5.scd b/doc/aerc-config.5.scd
index 9e1f8a3..694abbc 100644
--- a/doc/aerc-config.5.scd
+++ b/doc/aerc-config.5.scd
@@ -300,8 +300,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
- /usr/local/share/aerc/stylesets
- /usr/share/aerc/stylesets
+ @out@/share/aerc/stylesets
```
*styleset-name* = _<string>_
@@ -900,8 +899,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
- /usr/local/share/aerc/templates
- /usr/share/aerc/templates
+ @out@/share/aerc/templates
```
*new-message* = _<template_name>_
diff --git a/doc/aerc-templates.7.scd b/doc/aerc-templates.7.scd
index ae9bc6d..5f42b14 100644
--- a/doc/aerc-templates.7.scd
+++ b/doc/aerc-templates.7.scd
@@ -319,7 +319,7 @@ aerc provides the following additional functions:
Execute external command, provide the second argument to its stdin.
```
- {{exec `/usr/libexec/aerc/filters/html` .OriginalText}}
+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText}}
```
*.Local*
@@ -425,7 +425,7 @@ aerc provides the following additional functions:
```
{{if eq .OriginalMIMEType "text/html"}}
- {{exec `/usr/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}}
+ {{exec `@out@/libexec/aerc/filters/html` .OriginalText | wrap 72 | quote}}
{{else}}
{{wrap 72 .OriginalText | trimSignature | quote}}
{{end}}

84
pkgs/applications/networking/mailreaders/aerc/runtime-sharedir.patch
View file

@ -1,84 +0,0 @@
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
-# /usr/local/share/aerc/stylesets
-# /usr/share/aerc/stylesets
+# @out@/share/aerc/stylesets
#
#stylesets-dirs=
@@ -445,8 +444,7 @@ message/rfc822=colorize
#
# ${XDG_CONFIG_HOME:-~/.config}/aerc/templates
# ${XDG_DATA_HOME:-~/.local/share}/aerc/templates
-# /usr/local/share/aerc/templates
-# /usr/share/aerc/templates
+# @out@/share/aerc/templates
#
#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@/share/aerc")
return defaultDirs
}
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
- /usr/local/share/aerc/stylesets
- /usr/share/aerc/stylesets
+ @out@/share/aerc/stylesets
```
*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
- /usr/local/share/aerc/templates
- /usr/share/aerc/templates
+ @out@/share/aerc/templates
```
*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}}